Bumped version

Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php
Merge remote-tracking branch 'origin/develop'
2023-07-05 14:41:34 +01:00 · 2023-07-05 14:37:53 +01:00 · 2023-06-29 21:23:53 +01:00 · 2023-06-29 21:19:25 +01:00 · 2023-06-29 20:41:16 +01:00 · 2023-06-29 20:41:05 +01:00
2444 changed files with 13044 additions and 320990 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -2952,51 +2952,6 @@
      "contributions": [
        "code"
      ]
-    },
-    {
-      "login": "cram42",
-      "name": "Grant Le Roux",
-      "avatar_url": "https://avatars.githubusercontent.com/u/5396871?v=4",
-      "profile": "https://github.com/cram42",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Singrity",
-      "name": "Bogdan",
-      "avatar_url": "https://avatars.githubusercontent.com/u/58479551?v=4",
-      "profile": "http://@singrity",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "mmanjos",
-      "name": "mmanjos",
-      "avatar_url": "https://avatars.githubusercontent.com/u/3483684?v=4",
-      "profile": "https://github.com/mmanjos",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Azooz2014",
-      "name": "Abdelaziz Faki",
-      "avatar_url": "https://avatars.githubusercontent.com/u/7429229?v=4",
-      "profile": "https://azooz2014.github.io/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "bilias",
-      "name": "bilias",
-      "avatar_url": "https://avatars.githubusercontent.com/u/47315739?v=4",
-      "profile": "https://github.com/bilias",
-      "contributions": [
-        "code"
-      ]
    }
  ]
 }
--- a/.chipperci.yml
+++ b/.chipperci.yml
@@ -0,0 +1,63 @@
+version: 1
+
+environment:
+  php: 8.0
+  node: 12
+
+services:
+  - mysql: 5.7
+  - dusk:
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+
+  pull_request:
+    branches:
+      - master
+      - develop
+
+pipeline:
+  - name: Setup
+    cmd: |
+      cp -v .env.example .env
+      
+      composer install --no-interaction --prefer-dist --optimize-autoloader
+
+  - name: Generate Key
+    cmd: |
+      php artisan key:generate --force
+
+  - name: Passport Keys
+    cmd: |
+      php artisan passport:keys
+
+  - name: Run Migrations
+    cmd: |
+      # php artisan migrate --force
+
+  - name: PHPUnit Unit Tests
+    cmd: |
+      # php artisan test --testsuite Unit
+
+  - name: PHPUnit Feature Tests
+    cmd: |
+      # php artisan test --testsuite Feature
+
+#  - name: Browser Tests
+#    cmd: |
+#      cp -v .env.dusk.example .env.dusk.ci
+#      sed -i "s@APP_ENV=.*@APP_ENV=ci@g" .env.dusk.ci
+#      sed -i "s@APP_URL=.*@APP_URL=http://$BUILD_HOST:8000@g" .env.dusk.ci
+#      #sed -i "s@DB_HOST=.*@DB_HOST=mysql@g" .env.dusk.ci
+#      sed -i "s@DB_HOST=.*@DB_HOST=$DB_HOST@g" .env.dusk.ci
+#      sed -i "s@DB_USERNAME=.*@DB_USERNAME=chipperci@g" .env.dusk.ci
+#      sed -i "s@DB_DATABASE=.*@DB_DATABASE=chipperci@g" .env.dusk.ci
+#      sed -i "s@DB_PASSWORD=.*@DB_PASSWORD=secret@g" .env.dusk.ci
+#
+#      php -S [::0]:8000 -t public 2>server.log &
+#      sleep 2
+#      php artisan dusk:chrome-driver $CHROME_DRIVER
+#      php artisan dusk --env=ci
--- a/.env.docker
+++ b/.env.docker
@@ -159,7 +159,6 @@ LOG_CHANNEL=stderr
 LOG_MAX_DAYS=10
 APP_LOCKED=false
 APP_CIPHER=AES-256-CBC
-APP_FORCE_TLS=false
 GOOGLE_MAPS_API=
 LDAP_MEM_LIM=500M
 LDAP_TIME_LIM=600
--- a/.env.example
+++ b/.env.example
@@ -85,7 +85,6 @@ COOKIE_NAME=snipeit_session
 COOKIE_DOMAIN=null
 SECURE_COOKIES=false
 API_TOKEN_EXPIRATION_YEARS=15
-BS_TABLE_STORAGE=cookieStorage

 # --------------------------------------------
 # OPTIONAL: SECURITY HEADER SETTINGS
@@ -127,17 +126,6 @@ PUBLIC_AWS_BUCKET=null
 PUBLIC_AWS_URL=null
 PUBLIC_AWS_BUCKET_ROOT=null

-
-# --------------------------------------------
-# OPTIONAL: Digital Ocean Spaces File Settings
-# --------------------------------------------
-DIGITALOCEAN_SPACES_KEY=null
-DIGITALOCEAN_SPACES_SECRET=null
-DIGITALOCEAN_SPACES_ENDPOINT=https://region.digitaloceanspaces.com
-DIGITALOCEAN_SPACES_REGION=null
-DIGITALOCEAN_SPACES_BUCKET=null
-
-
 # --------------------------------------------
 # OPTIONAL: PRIVATE S3 Settings
 # --------------------------------------------
@@ -160,7 +148,6 @@ AWS_DEFAULT_REGION=null
 # --------------------------------------------
 LOGIN_MAX_ATTEMPTS=5
 LOGIN_LOCKOUT_DURATION=60
-LOGIN_AUTOCOMPLETE=false

 # --------------------------------------------
 # OPTIONAL: FORGOTTEN PASSWORD SETTINGS
--- a/.github/autolabeler.yml
+++ b/.github/autolabeler.yml
@@ -18,5 +18,5 @@ importer: ["/app/Importer/*","/app/Http/Livewire/Importer.php", "resources/views
 cli / artisan: ["/app/Console/*"]
 LDAP: ["*Ldap*", "/app/Console/Commands/Ldap*","/app/Models/Ldap.php"]
 docker: ["*docker/*", "Dockerfile", "Dockerfile.alpine", "Dockerfile.fpm-alpine", ".dockerignore", ".env.docker"]
-tests: ["/tests/*", "/database/factories/*", "/stubs"]
+tests: ["/tests/*", "/stubs"]
 config: .github
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -2,6 +2,5 @@ version: 2
 updates:
  - package-ecosystem: "github-actions"
    directory: "/"
-    target-branch: "develop"
    schedule:
      interval: "weekly"
--- a/.github/workflows/SA-codeql.yml
+++ b/.github/workflows/SA-codeql.yml
@@ -26,7 +26,7 @@ jobs:
        language: [ 'javascript' ]
    steps:
    - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3.3.0

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
--- a/.github/workflows/codacy-analysis.yml
+++ b/.github/workflows/codacy-analysis.yml
@@ -32,7 +32,7 @@ jobs:
    steps:
      # Checkout the repository to the GitHub Actions runner
      - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3.3.0

      # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
      - name: Run Codacy Analysis CLI
--- a/.github/workflows/crowdin-upload.yml
+++ b/.github/workflows/crowdin-upload.yml
@@ -9,7 +9,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

      - name: Crowdin push
        uses: crowdin/github-action@v1
--- a/.github/workflows/docker-alpine.yml
+++ b/.github/workflows/docker-alpine.yml
@@ -32,7 +32,6 @@ jobs:
        type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }},suffix=-alpine
        type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }},suffix=-alpine
        type=ref,event=tag,suffix=-alpine
-        type=semver,pattern=v{{major}}-latest-alpine 
      # Define default tag "flavor" for docker/metadata-action per
      # https://github.com/docker/metadata-action#flavor-input
      # We turn off 'latest' tag by default.
@@ -42,17 +41,17 @@ jobs:
    steps:
      # https://github.com/actions/checkout
      - name: Checkout codebase
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3.3.0

      # https://github.com/docker/setup-buildx-action
      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2

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

      # https://github.com/docker/setup-buildx-action
      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2

      # https://github.com/docker/login-action
      - name: Login to DockerHub
        # Only login if not a PR, as PRs only trigger a Docker build and not a push
        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
@@ -64,7 +63,7 @@ jobs:
      # Get Metadata for docker_build step below
      - name: Sync metadata (tags, labels) from GitHub to Docker for 'snipe-it' image
        id: meta_build
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v4
        with:
          images: snipe/snipe-it
          tags: ${{ env.IMAGE_TAGS }}
@@ -73,7 +72,7 @@ jobs:
      # https://github.com/docker/build-push-action
      - name: Build and push 'snipe-it' image
        id: docker_build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v4
        with:
          context: .
          file: ./Dockerfile
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,73 +0,0 @@
-name: Tests
-
-on:
-  push:
-    branches:
-      - master
-      - develop
-  pull_request:
-
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-
-    services:
-      mysql:
-        image: mysql:5.7
-        env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: yes
-          MYSQL_DATABASE: snipeit
-        ports:
-          - 33306:3306
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php-version:
-          - "7.4"
-          - "8.0"
-          - "8.1.1"
-
-    name: PHP ${{ matrix.php-version }}
-
-    steps:
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: "${{ matrix.php-version }}"
-          coverage: none
-
-      - uses: actions/checkout@v4
-
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-      - uses: actions/cache@v3
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
-
-      - name: Copy .env
-        run: |
-          cp -v .env.testing.example .env
-          cp -v .env.testing.example .env.testing
-
-      - name: Install Dependencies
-        run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
-
-      - name: Generate key
-        run: php artisan key:generate
-
-      - name: Directory Permissions
-        run: chmod -R 777 storage bootstrap/cache
-
-      - name: Execute tests (Unit and Feature tests) via PHPUnit
-        env:
-          DB_CONNECTION: mysql
-          DB_DATABASE: snipeit
-          DB_PORT: ${{ job.services.mysql.ports[3306] }}
-          DB_USERNAME: root
-        run: php artisan test --parallel
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 .couscous
 .DS_Store
 .env
+.env.dusk.*
+!.env.dusk.example
 .env.testing
 phpstan.neon
 .idea
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-330-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
+![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
+[![All Contributors](https://img.shields.io/badge/all_contributors-325-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)

 ## Snipe-IT - Open Source Asset Management System

@@ -145,8 +145,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/28321?v=4" width="110px;"/><br /><sub>Chris Hartjes</sub>](http://www.littlehart.net/atthekeyboard)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chartjes "Code") | [<img src="https://avatars.githubusercontent.com/u/2404584?v=4" width="110px;"/><br /><sub>geo-chen</sub>](https://github.com/geo-chen)<br />[💻](https://github.com/snipe/snipe-it/commits?author=geo-chen "Code") | [<img src="https://avatars.githubusercontent.com/u/6006620?v=4" width="110px;"/><br /><sub>Phan Nguyen</sub>](https://github.com/nh314)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nh314 "Code") | [<img src="https://avatars.githubusercontent.com/u/115993812?v=4" width="110px;"/><br /><sub>Iisakki Jaakkola</sub>](https://github.com/StarlessNights)<br />[💻](https://github.com/snipe/snipe-it/commits?author=StarlessNights "Code") | [<img src="https://avatars.githubusercontent.com/u/22633385?v=4" width="110px;"/><br /><sub>Ikko Ashimine</sub>](https://bandism.net/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=eltociear "Code") | [<img src="https://avatars.githubusercontent.com/u/56871540?v=4" width="110px;"/><br /><sub>Lukas Fehling</sub>](https://github.com/lukasfehling)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lukasfehling "Code") | [<img src="https://avatars.githubusercontent.com/u/1975990?v=4" width="110px;"/><br /><sub>Fernando Almeida</sub>](https://github.com/fernando-almeida)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fernando-almeida "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/116301219?v=4" width="110px;"/><br /><sub>akemidx</sub>](https://github.com/akemidx)<br />[💻](https://github.com/snipe/snipe-it/commits?author=akemidx "Code") | [<img src="https://avatars.githubusercontent.com/u/144778?v=4" width="110px;"/><br /><sub>Oguz Bilgic</sub>](http://oguz.site)<br />[💻](https://github.com/snipe/snipe-it/commits?author=oguzbilgic "Code") | [<img src="https://avatars.githubusercontent.com/u/9262438?v=4" width="110px;"/><br /><sub>Scooter Crawford</sub>](https://github.com/scoo73r)<br />[💻](https://github.com/snipe/snipe-it/commits?author=scoo73r "Code") | [<img src="https://avatars.githubusercontent.com/u/5957345?v=4" width="110px;"/><br /><sub>subdriven</sub>](https://github.com/subdriven)<br />[💻](https://github.com/snipe/snipe-it/commits?author=subdriven "Code") | [<img src="https://avatars.githubusercontent.com/u/658865?v=4" width="110px;"/><br /><sub>Andrew Savinykh</sub>](https://github.com/AndrewSav)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AndrewSav "Code") | [<img src="https://avatars.githubusercontent.com/u/1155067?v=4" width="110px;"/><br /><sub>Tadayuki Onishi</sub>](https://kenchan0130.github.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kenchan0130 "Code") | [<img src="https://avatars.githubusercontent.com/u/112496896?v=4" width="110px;"/><br /><sub>Florian</sub>](https://github.com/floschoepfer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=floschoepfer "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/7305753?v=4" width="110px;"/><br /><sub>Spencer Long</sub>](http://spencerlong.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=spencerrlongg "Code") | [<img src="https://avatars.githubusercontent.com/u/1141514?v=4" width="110px;"/><br /><sub>Marcus Moore</sub>](https://github.com/marcusmoore)<br />[💻](https://github.com/snipe/snipe-it/commits?author=marcusmoore "Code") | [<img src="https://avatars.githubusercontent.com/u/570639?v=4" width="110px;"/><br /><sub>Martin Meredith</sub>](https://github.com/Mezzle)<br /> | [<img src="https://avatars.githubusercontent.com/u/5731963?v=4" width="110px;"/><br /><sub>dboth</sub>](http://dboth.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dboth "Code") | [<img src="https://avatars.githubusercontent.com/u/87536651?v=4" width="110px;"/><br /><sub>Zachary Fleck</sub>](https://github.com/zacharyfleck)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zacharyfleck "Code") | [<img src="https://avatars.githubusercontent.com/u/74609912?v=4" width="110px;"/><br /><sub>VIKAAS-A</sub>](https://github.com/vikaas-cyper)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vikaas-cyper "Code") | [<img src="https://avatars.githubusercontent.com/u/88882041?v=4" width="110px;"/><br /><sub>Abdul Kareem</sub>](https://github.com/ak-piracha)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ak-piracha "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/111287779?v=4" width="110px;"/><br /><sub>NojoudAlshehri</sub>](https://github.com/NojoudAlshehri)<br />[💻](https://github.com/snipe/snipe-it/commits?author=NojoudAlshehri "Code") | [<img src="https://avatars.githubusercontent.com/u/54367449?v=4" width="110px;"/><br /><sub>Stefan Stidl</sub>](https://github.com/stefanstidlffg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=stefanstidlffg "Code") | [<img src="https://avatars.githubusercontent.com/u/87803479?v=4" width="110px;"/><br /><sub>Quentin Aymard</sub>](https://github.com/qay21)<br />[💻](https://github.com/snipe/snipe-it/commits?author=qay21 "Code") | [<img src="https://avatars.githubusercontent.com/u/5396871?v=4" width="110px;"/><br /><sub>Grant Le Roux</sub>](https://github.com/cram42)<br />[💻](https://github.com/snipe/snipe-it/commits?author=cram42 "Code") | [<img src="https://avatars.githubusercontent.com/u/58479551?v=4" width="110px;"/><br /><sub>Bogdan</sub>](http://@singrity)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Singrity "Code") | [<img src="https://avatars.githubusercontent.com/u/3483684?v=4" width="110px;"/><br /><sub>mmanjos</sub>](https://github.com/mmanjos)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mmanjos "Code") | [<img src="https://avatars.githubusercontent.com/u/7429229?v=4" width="110px;"/><br /><sub>Abdelaziz Faki</sub>](https://azooz2014.github.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Azooz2014 "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/47315739?v=4" width="110px;"/><br /><sub>bilias</sub>](https://github.com/bilias)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bilias "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/111287779?v=4" width="110px;"/><br /><sub>NojoudAlshehri</sub>](https://github.com/NojoudAlshehri)<br />[💻](https://github.com/snipe/snipe-it/commits?author=NojoudAlshehri "Code") | [<img src="https://avatars.githubusercontent.com/u/54367449?v=4" width="110px;"/><br /><sub>Stefan Stidl</sub>](https://github.com/stefanstidlffg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=stefanstidlffg "Code") | [<img src="https://avatars.githubusercontent.com/u/87803479?v=4" width="110px;"/><br /><sub>Quentin Aymard</sub>](https://github.com/qay21)<br />[💻](https://github.com/snipe/snipe-it/commits?author=qay21 "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->

 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
--- a/TESTING.md
+++ b/TESTING.md
@@ -9,39 +9,7 @@ Before starting, follow the [instructions](README.md#installation) for installin
 Before attempting to run the test suite copy the example environment file for tests and update the values to match your environment:

 `cp .env.testing.example .env.testing`
-
-The following should work for running tests in memory with sqlite:
-```
-# --------------------------------------------
-# REQUIRED: BASIC APP SETTINGS
-# --------------------------------------------
-APP_ENV=testing
-APP_DEBUG=true
-APP_KEY=base64:glJpcM7BYwWiBggp3SQ/+NlRkqsBQMaGEOjemXqJzOU=
-APP_URL=http://localhost:8000
-APP_TIMEZONE='UTC'
-APP_LOCALE=en
-
-# --------------------------------------------
-# REQUIRED: DATABASE SETTINGS
-# --------------------------------------------
-DB_CONNECTION=sqlite_testing
-#DB_HOST=127.0.0.1
-#DB_PORT=3306
-#DB_DATABASE=null
-#DB_USERNAME=null
-#DB_PASSWORD=null
-```
-
-To use MySQL you should update the `DB_` variables to match your local test database:
-```
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE={}
-DB_USERNAME={}
-DB_PASSWORD={}
-```
+> Since the data in the database is flushed after each test it is recommended you create a separate mysql database for specifically for tests

 Now you are ready to run the entire test suite from your terminal:

@@ -50,3 +18,34 @@ Now you are ready to run the entire test suite from your terminal:
 To run individual test files, you can pass the path to the test that you want to run:

 `php artisan test tests/Unit/AccessoryTest.php`
+
+## Browser Tests 
+
+Browser tests are run via [Laravel Dusk](https://laravel.com/docs/8.x/dusk) and require Google Chrome to be installed.
+
+Before attempting to run Dusk tests copy the example environment file for Dusk and update the values to match your environment:
+
+`cp .env.dusk.example .env.dusk.local`
+> `local` refers to the value of `APP_ENV` in your `.env` so if you have it set to `dev` then the file should be named `.env.dusk.dev`.
+
+**Important**: Dusk tests cannot be run using an in-memory SQLite database. Additionally, the Dusk test suite uses the `DatabaseMigrations` trait which will leave the database in a fresh state after running. Therefore, it is recommended that you create a test database and point `DB_DATABASE` in `.env.dusk.local` to it.  
+
+### Running Browser Tests
+
+Your application needs to be configured and up and running in order for the browser tests to actually run. When running the tests locally, you can start the application using the following command:
+
+`php artisan serve`
+
+Now you are ready to run the test suite. Use the following command from another terminal tab or window:
+
+`php artisan dusk`
+
+To run individual test files, you can pass the path to the test that you want to run:
+
+`php artisan dusk tests/Browser/LoginTest.php`
+
+If you get an error when attempting to run Dusk tests that says `Couldn't connect to server` run:
+
+`php artisan dusk:chrome-driver --detect`
+
+This command will install the specific ChromeDriver Dusk needs for your operating system and Chrome version.
--- a/app/Console/Commands/LdapSync.php
+++ b/app/Console/Commands/LdapSync.php
@@ -18,7 +18,7 @@ class LdapSync extends Command
     *
     * @var string
     */
-    protected $signature = 'snipeit:ldap-sync {--location=} {--location_id=*} {--base_dn=} {--filter=} {--summary} {--json_summary}';
+    protected $signature = 'snipeit:ldap-sync {--location=} {--location_id=} {--base_dn=} {--filter=} {--summary} {--json_summary}';

    /**
     * The console command description.
@@ -83,16 +83,7 @@ class LdapSync extends Command
        $summary = [];

        try {
-            if ( $this->option('location_id') != '') {
-
-                foreach($this->option('location_id') as $location_id){
-                    $location_ou= Location::where('id', '=', $location_id)->value('ldap_ou');
-                    $search_base = $location_ou;
-                    Log::debug('Importing users from specified location OU: \"'.$search_base.'\".');
-                 }
-            }
-
-            else if ($this->option('base_dn') != '') {
+            if ($this->option('base_dn') != '') {
                $search_base = $this->option('base_dn');
                Log::debug('Importing users from specified base DN: \"'.$search_base.'\".');
            } else {
@@ -115,21 +106,17 @@ class LdapSync extends Command

        /* Determine which location to assign users to by default. */
        $location = null; // TODO - this would be better called "$default_location", which is more explicit about its purpose
-            if ($this->option('location') != '') {
-                if ($location = Location::where('name', '=', $this->option('location'))->first()) {
-                    Log::debug('Location name ' . $this->option('location') . ' passed');
-                    Log::debug('Importing to ' . $location->name . ' (' . $location->id . ')');
-                }

-            } elseif ($this->option('location_id') != '') {
-                foreach($this->option('location_id') as $location_id) {
-                if ($location = Location::where('id', '=', $location_id)->first()) {
-                    Log::debug('Location ID ' . $location_id . ' passed');
-                    Log::debug('Importing to ' . $location->name . ' (' . $location->id . ')');
-                }
-
-            }
+        if ($this->option('location') != '') {
+            $location = Location::where('name', '=', $this->option('location'))->first();
+            Log::debug('Location name '.$this->option('location').' passed');
+            Log::debug('Importing to '.$location->name.' ('.$location->id.')');
+        } elseif ($this->option('location_id') != '') {
+            $location = Location::where('id', '=', $this->option('location_id'))->first();
+            Log::debug('Location ID '.$this->option('location_id').' passed');
+            Log::debug('Importing to '.$location->name.' ('.$location->id.')');
        }
+
        if (! isset($location)) {
            Log::debug('That location is invalid or a location was not provided, so no location will be assigned by default.');
        }
@@ -193,6 +180,10 @@ class LdapSync extends Command
            }
        }

+        /* Create user account entries in Snipe-IT */
+        $tmp_pass = substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'), 0, 20);
+        $pass = bcrypt($tmp_pass);
+
        $manager_cache = [];

        if($ldap_default_group != null) {
@@ -221,12 +212,9 @@ class LdapSync extends Command
                $item['manager'] = $results[$i][$ldap_result_manager][0] ?? '';
                $item['location'] = $results[$i][$ldap_result_location][0] ?? '';

-                // ONLY if you are using the "ldap_location" option *AND* you have an actual result
-                if ($ldap_result_location && $item['location']) {
-                        $location = Location::firstOrCreate([
-                                'name' => $item['location'],
-                        ]);
-                }
+                $location = Location::firstOrCreate([
+                    'name' => $item['location'],
+                ]);
                $department = Department::firstOrCreate([
                    'name' => $item['department'],
                ]);
@@ -238,44 +226,22 @@ class LdapSync extends Command
                } else {
                    // Creating a new user.
                    $user = new User;
-                    $user->password = $user->noPassword();
+                    $user->password = $pass;
                    $user->activated = 1; // newly created users can log in by default, unless AD's UAC is in use, or an active flag is set (below)
                    $item['createorupdate'] = 'created';
                }

-            //If a sync option is not filled in on the LDAP settings don't populate the user field
-            if($ldap_result_username  != null){
-                $user->username = $item['username'];
-            }
-            if($ldap_result_last_name != null){
-                $user->last_name = $item['lastname'];
-            }
-            if($ldap_result_first_name != null){
                $user->first_name = $item['firstname'];
-            }
-            if($ldap_result_emp_num  != null){
-                $user->employee_num = e($item['employee_number']);
-            }
-            if($ldap_result_email != null){
+                $user->last_name = $item['lastname'];
+                $user->username = $item['username'];
                $user->email = $item['email'];
-            }
-            if($ldap_result_phone != null){
+                $user->employee_num = e($item['employee_number']);
                $user->phone = $item['telephone'];
-            }
-            if($ldap_result_jobtitle != null){
                $user->jobtitle = $item['jobtitle'];
-            }
-            if($ldap_result_country != null){
                $user->country = $item['country'];
-            }
-            if($ldap_result_dept  != null){
                $user->department_id = $department->id;
-            }
-            if($ldap_result_location != null){
-                $user->location_id = $location ? $location->id : null;
-            }
+                $user->location_id = $location->id;

-            if($ldap_result_manager != null){
                if($item['manager'] != null) {
                    // Check Cache first
                    if (isset($manager_cache[$item['manager']])) {
@@ -315,7 +281,6 @@ class LdapSync extends Command

                    }
                }
-            }

                // Sync activated state for Active Directory.
                if ( !empty($ldap_result_active_flag)) { // IF we have an 'active' flag set....
--- a/app/Console/Commands/RotateAppKey.php
+++ b/app/Console/Commands/RotateAppKey.php
@@ -7,7 +7,6 @@ use App\Models\CustomField;
 use App\Models\Setting;
 use Artisan;
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Encryption\Encrypter;

 class RotateAppKey extends Command
@@ -17,17 +16,14 @@ class RotateAppKey extends Command
     *
     * @var string
     */
-    protected $signature = 'snipeit:rotate-key
-                            {previous_key? : The previous key to rotate from} 
-                            {--emergency : Emergency mode - rotate from .env APP_KEY to newly-generated one, modifying .env} 
-                            {--force : Skip interactive confirmation}';
+    protected $signature = 'snipeit:rotate-key';

    /**
     * The console command description.
     *
     * @var string
     */
-    protected $description = 'Rotates APP_KEY to a new value, optionally taking the previous key as an argument';
+    protected $description = 'Command description';

    /**
     * Create a new command instance.
@@ -46,42 +42,26 @@ class RotateAppKey extends Command
     */
    public function handle()
    {
-        //make sure they specify only exactly one of --emergency, or a filename. Not neither, and not both.
-        if ( (!$this->option('emergency') && !$this->argument('previous_key')) || ( $this->option('emergency') && $this->argument('previous_key'))) {
-            $this->error("Specify only one of --emergency, or an app key value, in order to rotate keys");
-            return 1;
-        }
-        if ( $this->option('emergency') ) {
-            $msg = "\n****************************************************\nTHIS WILL MODIFY YOUR APP_KEY AND DE-CRYPT YOUR ENCRYPTED CUSTOM FIELDS AND \nRE-ENCRYPT THEM WITH A NEWLY GENERATED KEY. \n\nThere is NO undo. \n\nMake SURE you have a database backup and a backup of your .env generated BEFORE running this command. \n\nIf you do not save the newly generated APP_KEY to your .env in this process, \nyour encrypted data will no longer be decryptable. \n\nAre you SURE you wish to continue, and have confirmed you have a database backup and an .env backup? ";
-        } else {
-            $msg = "\n****************************************************\nTHIS WILL DE-CRYPT YOUR ENCRYPTED CUSTOM FIELDS AND RE-ENCRYPT THEM WITH YOUR\nAPP_KEY.\n\nThere is NO undo. \n\nMake SURE you have a database backup BEFORE running this command. \n\nAre you SURE you wish to continue, and have confirmed you have a database backup? ";
-        }
-        if ($this->option('force') || $this->confirm($msg)) {
+        if ($this->confirm("\n****************************************************\nTHIS WILL MODIFY YOUR APP_KEY AND DE-CRYPT YOUR ENCRYPTED CUSTOM FIELDS AND \nRE-ENCRYPT THEM WITH A NEWLY GENERATED KEY. \n\nThere is NO undo. \n\nMake SURE you have a database backup and a backup of your .env generated BEFORE running this command. \n\nIf you do not save the newly generated APP_KEY to your .env in this process, \nyour encrypted data will no longer be decryptable. \n\nAre you SURE you wish to continue, and have confirmed you have a database backup and an .env backup? ")) {

            // Get the existing app_key and ciphers
            // We put them in a variable since we clear the cache partway through here.
-            if ($this->option('emergency')) {
-                $old_app_key = config('app.key');
-                $cipher = config('app.cipher');
+            $old_app_key = config('app.key');
+            $cipher = config('app.cipher');

-                // Generate a new one
-                Artisan::call('key:generate', ['--show' => true]);
-                $new_app_key = trim(Artisan::output());
+            // Generate a new one
+            Artisan::call('key:generate', ['--show' => true]);
+            $new_app_key = Artisan::output();

-                // Clear the config cache
-                Artisan::call('config:clear');
+            // Clear the config cache
+            Artisan::call('config:clear');

-                // Write the new app key to the .env file
-                $this->writeNewEnvironmentFileWith($new_app_key);
-            } elseif ($this->argument('previous_key')) {
-                $old_app_key = $this->argument('previous_key');
-                $cipher = config('app.cipher'); // just a guess?
-                $new_app_key = config('app.key');
-            }
+            $this->warn('Your app cipher is: '.$cipher);
+            $this->warn('Your old APP_KEY is: '.$old_app_key);
+            $this->warn('Your new APP_KEY is: '.$new_app_key);

-            $this->warn('Your app cipher is: ' . $cipher);
-            $this->warn('Your old APP_KEY is: ' . $old_app_key);
-            $this->warn('Your new APP_KEY is: ' . $new_app_key);
+            // Write the new app key to the .env file
+            $this->writeNewEnvironmentFileWith($new_app_key);

            // Manually create an old encrypter instance using the old app key
            // and also create a new encrypter instance so we can re-crypt the field
@@ -95,16 +75,8 @@ class RotateAppKey extends Command
                $assets = Asset::whereNotNull($field->db_column)->get();

                foreach ($assets as $asset) {
-                    try {
-                        $asset->{$field->db_column} = $oldEncrypter->decrypt($asset->{$field->db_column});
-                        $this->line('DECRYPTED: ' . $field->db_column);
-                    } catch (DecryptException $e) {
-                        $this->line('Could not decrypt '. $field->db_column.' using "old key" - skipping...');
-                        continue;
-                    } catch (\Exception $e) {
-                        $this->error("Error decrypting ".$field->db_column.", reason: ".$e->getMessage().". Aborting key rotation");
-                        throw $e;
-                    }
+                    $asset->{$field->db_column} = $oldEncrypter->decrypt($asset->{$field->db_column});
+                    $this->line('DECRYPTED: '.$field->db_column);
                    $asset->{$field->db_column} = $newEncrypter->encrypt($asset->{$field->db_column});
                    $this->line('ENCRYPTED: '.$field->db_column);
                    $asset->save();
@@ -114,14 +86,10 @@ class RotateAppKey extends Command
            // Handle the LDAP password if one is provided
            $setting = Setting::first();
            if ($setting->ldap_pword != '') {
-                try {
-                    $setting->ldap_pword = $oldEncrypter->decrypt($setting->ldap_pword);
-                    $setting->ldap_pword = $newEncrypter->encrypt($setting->ldap_pword);
-                    $setting->save();
-                    $this->warn('LDAP password has been re-encrypted.');
-                } catch(DecryptException $e) {
-                    $this->warn("Unable to decrypt old LDAP password; skipping");
-                }
+                $setting->ldap_pword = $oldEncrypter->decrypt($setting->ldap_pword);
+                $setting->ldap_pword = $newEncrypter->encrypt($setting->ldap_pword);
+                $setting->save();
+                $this->warn('LDAP password has been re-encrypted.');
            }
        } else {
            $this->info('This operation has been canceled. No changes have been made.');
@@ -138,7 +106,7 @@ class RotateAppKey extends Command
    {
        file_put_contents($this->laravel->environmentFilePath(), preg_replace(
            $this->keyReplacementPattern(),
-            'APP_KEY="'.$key.'"',
+            'APP_KEY='.$key,
            file_get_contents($this->laravel->environmentFilePath())
        ));
    }
@@ -150,7 +118,7 @@ class RotateAppKey extends Command
     */
    protected function keyReplacementPattern()
    {
-        $escaped = '="?'.preg_quote($this->laravel['config']['app.key'], '/').'"?';
+        $escaped = preg_quote('='.$this->laravel['config']['app.key'], '/');

        return "/^APP_KEY{$escaped}/m";
    }
--- a/app/Events/CheckoutableCheckedIn.php
+++ b/app/Events/CheckoutableCheckedIn.php
@@ -15,20 +15,18 @@ class CheckoutableCheckedIn
    public $checkedInBy;
    public $note;
    public $action_date; // Date setted in the hardware.checkin view at the checkin_at input, for the action log
-    public $originalValues;

    /**
     * Create a new event instance.
     *
     * @return void
     */
-    public function __construct($checkoutable, $checkedOutTo, User $checkedInBy, $note, $action_date = null, $originalValues = [])
+    public function __construct($checkoutable, $checkedOutTo, User $checkedInBy, $note, $action_date = null)
    {
        $this->checkoutable = $checkoutable;
        $this->checkedOutTo = $checkedOutTo;
        $this->checkedInBy = $checkedInBy;
        $this->note = $note;
        $this->action_date = $action_date ?? date('Y-m-d');
-        $this->originalValues = $originalValues;
    }
 }
--- a/app/Events/CheckoutableCheckedOut.php
+++ b/app/Events/CheckoutableCheckedOut.php
@@ -14,19 +14,17 @@ class CheckoutableCheckedOut
    public $checkedOutTo;
    public $checkedOutBy;
    public $note;
-    public $originalValues;

    /**
     * Create a new event instance.
     *
     * @return void
     */
-    public function __construct($checkoutable, $checkedOutTo, User $checkedOutBy, $note, $originalValues = [])
+    public function __construct($checkoutable, $checkedOutTo, User $checkedOutBy, $note)
    {
        $this->checkoutable = $checkoutable;
        $this->checkedOutTo = $checkedOutTo;
        $this->checkedOutBy = $checkedOutBy;
        $this->note = $note;
-        $this->originalValues = $originalValues;
    }
 }
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -150,11 +150,6 @@ class Handler extends ExceptionHandler
        return redirect()->guest('login');
    }

-    protected function invalidJson($request, ValidationException $exception)
-    {
-        return response()->json(Helper::formatStandardApiResponse('error', null, $exception->errors()), 200);
-    }
-

    /** 
     * A list of the inputs that are never flashed for validation exceptions.
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -2,8 +2,6 @@

 namespace App\Helpers;
 use App\Models\Accessory;
-use App\Models\Asset;
-use App\Models\AssetModel;
 use App\Models\Component;
 use App\Models\Consumable;
 use App\Models\CustomField;
@@ -35,16 +33,6 @@ class Helper
        }
    }

-    public static function parseEscapedMarkedownInline($str = null)
-    {
-        $Parsedown = new \Parsedown();
-        $Parsedown->setSafeMode(true);
-
-        if ($str) {
-            return $Parsedown->line($str);
-        }
-    }
-
    /**
     * The importer has formatted number strings since v3,
     * so the value might be a string, or an integer.
@@ -73,14 +61,10 @@ class Helper
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v3.3]
-     * @return string
+     * @return array
     */
-    public static function defaultChartColors(int $index = 0)
+    public static function defaultChartColors($index = 0)
    {
-        if ($index < 0) {
-            $index = 0;
-        }
-
        $colors = [
            '#008941',
            '#FF4A46',
@@ -353,19 +337,7 @@ class Helper
        $total_colors = count($colors);

        if ($index >= $total_colors) {
-
-            \Log::error('Status label count is '.$index.' and exceeds the allowed count of 266.');
-            //patch fix for array key overflow (color count starts at 1, array starts at 0)
-            $index = $index - $total_colors - 1;
-
-            //constraints to keep result in 0-265 range. This should never be needed, but if something happens
-            //to create this many status labels and it DOES happen, this will keep it from failing at least.
-            if($index < 0) {
-                $index = 0;
-            }
-            elseif($index >($total_colors - 1)) {
-                $index = $total_colors - 1;
-            }
+            $index = $index - $total_colors;
        }

        return $colors[$index];
@@ -571,8 +543,8 @@ class Helper
            'license' => trans('general.license'),
        ];

-        if ($selection != null){
-            return $category_types[strtolower($selection)];
+        if($selection != null){
+            return $category_types[$selection];
        }
        else
        return $category_types;
@@ -661,7 +633,6 @@ class Helper
        $consumables = Consumable::withCount('consumableAssignments as consumable_assignments_count')->whereNotNull('min_amt')->get();
        $accessories = Accessory::withCount('users as users_count')->whereNotNull('min_amt')->get();
        $components = Component::whereNotNull('min_amt')->get();
-        $asset_models = AssetModel::where('min_amt', '>', 0)->get();

        $avail_consumables = 0;
        $items_array = [];
@@ -724,28 +695,6 @@ class Helper
            }
        }

-        foreach ($asset_models as $asset_model){
-
-            $asset = new Asset();
-            $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)+ \App\Models\Setting::getSettings()->alert_threshold) {
-                if ($avail > 0) {
-                    $percent = number_format((($avail / $total_owned) * 100), 0);
-                } else {
-                    $percent = 100;
-                }
-                $items_array[$all_count]['id'] = $asset_model->id;
-                $items_array[$all_count]['name'] = $asset_model->name;
-                $items_array[$all_count]['type'] = 'models';
-                $items_array[$all_count]['percent'] = $percent;
-                $items_array[$all_count]['remaining'] = $avail;
-                $items_array[$all_count]['min_amt'] = $asset_model->min_amt;
-                $all_count++;
-            }
-        }
-
        return $items_array;
    }

@@ -1261,60 +1210,10 @@ class Helper
            return true;
            \Log::debug('app locked!');
        }
-        
+
        return false;
    }

-  
-    /**
-     * Conversion between units of measurement
-     *
-     * @author Grant Le Roux <grant.leroux+snipe-it@gmail.com>
-     * @since 5.0
-     * @param float  $value    Measurement value to convert
-     * @param string $srcUnit  Source unit of measurement
-     * @param string $dstUnit  Destination unit of measurement
-     * @param int    $round    Round the result to decimals (Default false - No rounding)
-     * @return float
-     */
-    public static function convertUnit($value, $srcUnit, $dstUnit, $round=false) {
-        $srcFactor = static::getUnitConversionFactor($srcUnit);
-        $dstFactor = static::getUnitConversionFactor($dstUnit);
-        $output = $value * $srcFactor / $dstFactor;
-        return ($round !== false) ? round($output, $round) : $output;
-    }
-  
-    /**
-     * Get conversion factor from unit of measurement to mm
-     *
-     * @author Grant Le Roux <grant.leroux+snipe-it@gmail.com>
-     * @since 5.0
-     * @param string $unit  Unit of measurement
-     * @return float
-     */
-    public static function getUnitConversionFactor($unit) {
-        switch (strtolower($unit)) {
-            case 'mm':
-                return 1.0;
-            case 'cm':
-                return 10.0;
-            case 'm':
-                return 1000.0;
-            case 'in':
-                return 25.4;
-            case 'ft':
-                return 12 * static::getUnitConversionFactor('in');
-            case 'yd':
-                return 3 * static::getUnitConversionFactor('ft');
-            case 'pt':
-                return (1 / 72) * static::getUnitConversionFactor('in');
-            default:
-                throw new \InvalidArgumentException('Unit: \'' . $unit . '\' is not supported');
-
-                return false;
-        }
-    }
-

    /*
     * I know it's gauche  to return a shitty HTML string, but this is just a helper and since it will be the same every single time,
--- a/app/Http/Controllers/Accessories/AccessoriesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesController.php
@@ -126,13 +126,12 @@ class AccessoriesController extends Controller
    public function getClone($accessoryId = null)
    {

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

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

        $accessory = clone $accessory_to_clone;
--- a/app/Http/Controllers/Accessories/AccessoriesFilesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesFilesController.php
@@ -146,8 +146,9 @@ class AccessoriesFilesController extends Controller
            $this->authorize('view', $accessory);
            $this->authorize('accessories.files', $accessory);

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

            $file = 'private_uploads/accessories/'.$log->filename;
@@ -160,19 +161,22 @@ class AccessoriesFilesController extends Controller
                    ->header('Content-Type', 'text/plain');
            } else {

-                // Display the file inline
-                if (request('inline') == 'true') {
-                    $headers = [
-                        'Content-Disposition' => 'inline',
-                    ];
-                    return Storage::download($file, $log->filename, $headers);
-                }
-
-
                // We have to override the URL stuff here, since local defaults in Laravel's Flysystem
                // won't work, as they're not accessible via the web
                if (config('filesystems.default') == 'local') { // TODO - is there any way to fix this at the StorageHelper layer?
                    return StorageHelper::downloader($file);
+                } else {
+                    if ($download != 'true') {
+                        \Log::debug('display the file');
+                        if ($contents = file_get_contents(Storage::url($file))) { // TODO - this will fail on private S3 files or large public ones
+                            return Response::make(Storage::url($file)->header('Content-Type', mime_content_type($file)));
+                        }
+
+                        return JsonResponse::create(['error' => 'Failed validation: '], 500);
+                    }
+
+                    return StorageHelper::downloader($file);
+
                }
            }
        }
--- a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
+++ b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
@@ -18,36 +18,31 @@ class AccessoryCheckoutController extends Controller
     * Return the form to checkout an Accessory to a user.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @param  int $id
+     * @param  int $accessoryId
     * @return View
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create($id)
+    public function create($accessoryId)
    {
-
-        if ($accessory = Accessory::withCount('users as users_count')->find($id)) {
-
-            $this->authorize('checkout', $accessory);
-
-            if ($accessory->category) {
-                // Make sure there is at least one available to checkout
-                if ($accessory->numRemaining() <= 0){
-                    return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.checkout.unavailable'));
-                }
-
-                // Return the checkout view
-                return view('accessories/checkout', compact('accessory'));
-            }
-
-            // Invalid category
-            return redirect()->route('accessories.edit', ['accessory' => $accessory->id])
-                ->with('error', trans('general.invalid_item_category_single', ['type' => trans('general.accessory')]));
-
+        // Check if the accessory exists
+        if (is_null($accessory = Accessory::withCount('users as users_count')->find($accessoryId))) {
+            // Redirect to the accessory management page with error
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
        }

-        // Not found
-        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
+        // Make sure there is at least one available to checkout
+        if ($accessory->numRemaining() <= 0){
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.checkout.unavailable'));
+        }
+        
+        if ($accessory->category) {
+            $this->authorize('checkout', $accessory);

+            // Get the dropdown of users and then pass it to the checkout view
+            return view('accessories/checkout', compact('accessory'));
+        }
+
+        return redirect()->back()->with('error', 'The category type for this accessory is not valid. Edit the accessory and select a valid accessory category.');
    }

    /**
--- a/app/Http/Controllers/Account/AcceptanceController.php
+++ b/app/Http/Controllers/Account/AcceptanceController.php
@@ -69,7 +69,7 @@ class AcceptanceController extends Controller
        }

        if (! Company::isCurrentUserHasAccess($acceptance->checkoutable)) {
-            return redirect()->route('account.accept')->with('error', trans('general.error_user_company'));
+            return redirect()->route('account.accept')->with('error', trans('general.insufficient_permissions'));
        }

        return view('account/accept.create', compact('acceptance'));
@@ -245,36 +245,6 @@ class AcceptanceController extends Controller
            $return_msg = trans('admin/users/message.accepted');

        } else {
-
-            /**
-             * Check for the eula-pdfs directory
-             */
-            if (! Storage::exists('private_uploads/eula-pdfs')) {
-                Storage::makeDirectory('private_uploads/eula-pdfs', 775);
-            }
-
-            if (Setting::getSettings()->require_accept_signature == '1') {
-                
-                // Check if the signature directory exists, if not create it
-                if (!Storage::exists('private_uploads/signatures')) {
-                    Storage::makeDirectory('private_uploads/signatures', 775);
-                }
-
-                // The item was accepted, check for a signature
-                if ($request->filled('signature_output')) {
-                    $sig_filename = 'siglog-' . Str::uuid() . '-' . date('Y-m-d-his') . '.png';
-                    $data_uri = $request->input('signature_output');
-                    $encoded_image = explode(',', $data_uri);
-                    $decoded_image = base64_decode($encoded_image[1]);
-                    Storage::put('private_uploads/signatures/' . $sig_filename, (string)$decoded_image);
-
-                    // No image data is present, kick them back.
-                    // This mostly only applies to users on super-duper crapola browsers *cough* IE *cough*
-                } else {
-                    return redirect()->back()->with('error', trans('general.shitty_browser'));
-                }
-            }
-            
            // Format the data to send the declined notification
            $branding_settings = SettingsController::getPDFBranding();

@@ -311,18 +281,11 @@ class AcceptanceController extends Controller
                'item_model' => $display_model,
                'item_serial' => $item->serial,
                'declined_date' => Carbon::parse($acceptance->declined_at)->format('Y-m-d'),
-                'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null,
                'assigned_to' => $assigned_to,
                'company_name' => $branding_settings->site_name,
                'date_settings' => $branding_settings->date_display_format,
            ];

-            if ($pdf_view_route!='') {
-                \Log::debug($pdf_filename.' is the filename, and the route was specified.');
-                $pdf = Pdf::loadView($pdf_view_route, $data);
-                Storage::put('private_uploads/eula-pdfs/' .$pdf_filename, $pdf->output());
-            }
-
            $acceptance->decline($sig_filename);
            $acceptance->notify(new AcceptanceAssetDeclinedNotification($data));
            event(new CheckoutDeclined($acceptance));
--- a/app/Http/Controllers/Api/AccessoriesController.php
+++ b/app/Http/Controllers/Api/AccessoriesController.php
@@ -331,7 +331,7 @@ class AccessoriesController extends Controller
        $accessory = Accessory::find($accessory_user->accessory_id);
        $this->authorize('checkin', $accessory);

-        $logaction = $accessory->logCheckin(User::find($accessory_user->assigned_to), $request->input('note'));
+        $logaction = $accessory->logCheckin(User::find($accessory_user->user_id), $request->input('note'));

        // Was the accessory updated?
        if (DB::table('accessories_users')->where('id', '=', $accessory_user->id)->delete()) {
--- a/app/Http/Controllers/Api/AssetModelsController.php
+++ b/app/Http/Controllers/Api/AssetModelsController.php
@@ -38,7 +38,6 @@ class AssetModelsController extends Controller
                'image',
                'name',
                'model_number',
-                'min_amt',
                'eol',
                'notes',
                'created_at',
@@ -46,7 +45,6 @@ class AssetModelsController extends Controller
                'requestable',
                'assets_count',
                'category',
-                'fieldset',
            ];

        $assetmodels = AssetModel::select([
@@ -54,7 +52,6 @@ class AssetModelsController extends Controller
            'models.image',
            'models.name',
            'model_number',
-            'min_amt',
            'eol',
            'requestable',
            'models.notes',
@@ -95,9 +92,6 @@ class AssetModelsController extends Controller
            case 'category':
                $assetmodels->OrderCategory($order);
                break;
-            case 'fieldset':
-                $assetmodels->OrderFieldset($order);
-                break;
            default:
                $assetmodels->orderBy($sort, $order);
                break;
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -33,7 +33,6 @@ use TCPDF;
 use Validator;
 use Route;

-
 /**
 * This class controls all actions related to assets for
 * the Snipe-IT Asset Management application.
@@ -49,7 +48,7 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
     * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
     */
    public function index(Request $request, $audit = null) 
    {
@@ -296,7 +295,7 @@ class AssetsController extends Controller
        }

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

        // This is kinda gross, but we need to do this because the Bootstrap Tables
@@ -347,7 +346,7 @@ class AssetsController extends Controller


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

        $total = $assets->count();
@@ -444,7 +443,7 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
     * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
     */
    public function show(Request $request, $id)
    {
@@ -475,7 +474,7 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v4.0.16]
     * @see \App\Http\Transformers\SelectlistTransformer
-     * @return \Illuminate\Http\JsonResponse
+     *
     */
    public function selectlist(Request $request)
    {
@@ -531,12 +530,12 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param \App\Http\Requests\ImageUploadRequest $request
     * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
     */
    public function store(ImageUploadRequest $request)
    {
        $this->authorize('create', Asset::class);
-        
+
        $asset = new Asset();
        $asset->model()->associate(AssetModel::find((int) $request->get('model_id')));

@@ -639,7 +638,7 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param \App\Http\Requests\ImageUploadRequest $request
     * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
     */
    public function update(ImageUploadRequest $request, $id)
    {
@@ -666,11 +665,10 @@ class AssetsController extends Controller
                $request->offsetSet('image', $request->offsetGet('image_source'));
            }     

-            $asset = $request->handleImages($asset);
-            $model = AssetModel::find($asset->model_id);
+            $asset = $request->handleImages($asset); 
            
            // Update custom fields
-            if (($model) && (isset($model->fieldset))) {
+            if (($model = AssetModel::find($asset->model_id)) && (isset($model->fieldset))) {
                foreach ($model->fieldset->fields as $field) {
                    if ($request->has($field->db_column)) {
                        if ($field->field_encrypted == '1') {
@@ -721,7 +719,7 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
     * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
     */
    public function destroy($id)
    {
@@ -750,28 +748,38 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
     * @since [v5.1.18]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
     */
    public function restore(Request $request, $assetId = null)
    {
+        // Get asset information
+        $asset = Asset::withTrashed()->find($assetId);
+        $this->authorize('delete', $asset);

-        if ($asset = Asset::withTrashed()->find($assetId)) {
-            $this->authorize('delete', $asset);
+        if (isset($asset->id)) {

-            if ($asset->deleted_at == '') {
-                return response()->json(Helper::formatStandardApiResponse('error', trans('general.not_deleted', ['item_type' => trans('general.asset')])), 200);
+            if ($asset->deleted_at=='') {
+               $message = 'Asset was not deleted. No data was changed.';
+
+            } else {
+
+                $message = trans('admin/hardware/message.restore.success');
+                // Restore the asset
+                Asset::withTrashed()->where('id', $assetId)->restore();
+
+                $logaction = new Actionlog();
+                $logaction->item_type = Asset::class;
+                $logaction->item_id = $asset->id;
+                $logaction->created_at =  date("Y-m-d H:i:s");
+                $logaction->user_id = Auth::user()->id;
+                $logaction->logaction('restored');
            }

-            if ($asset->restore()) {
-                return response()->json(Helper::formatStandardApiResponse('success', trans('admin/hardware/message.restore.success')), 200);
-            }
+            return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset, $request), $message));
+        

-            // Check validation to make sure we're not restoring an asset with the same asset tag (or unique attribute) as an existing asset
-            return response()->json(Helper::formatStandardApiResponse('error', trans('general.could_not_restore', ['item_type' => trans('general.asset'), 'error' => $asset->getErrors()->first()])), 200);
        }
-
        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200);
-
    }

    /**
@@ -780,7 +788,7 @@ class AssetsController extends Controller
     * @author [N. Butler]
     * @param string $tag
     * @since [v6.0.5]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
     */
    public function checkoutByTag(AssetCheckoutRequest $request, $tag)
    {
@@ -796,7 +804,7 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
     * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
     */
    public function checkout(AssetCheckoutRequest $request, $asset_id)
    {
@@ -880,7 +888,7 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
     * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
     */
    public function checkin(Request $request, $asset_id)
    {
@@ -896,7 +904,6 @@ class AssetsController extends Controller

        $asset->expected_checkin = null;
        $asset->last_checkout = null;
-        $asset->last_checkin = now();
        $asset->assigned_to = null;
        $asset->assignedTo()->disassociate($asset);
        $asset->accepted = null;
@@ -916,14 +923,10 @@ 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->get('checkin_at') != date('Y-m-d'))) {
-            $originalValues['action_date'] = $checkin_at;
-        }

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

            return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.success')));
        }
@@ -936,7 +939,7 @@ class AssetsController extends Controller
     *
     * @author [A. Janes] [<ajanes@adagiohealth.org>]
     * @since [v6.0]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
     */
    public function checkinByTag(Request $request, $tag = null)
    {
@@ -962,7 +965,7 @@ class AssetsController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $id
     * @since [v4.0]
-     * @return \Illuminate\Http\JsonResponse
+     * @return JsonResponse
     */
    public function audit(Request $request)

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

-        $allowed_columns = [
-            'name',
-            'asset_tag',
-            'serial',
-            'model_number',
-            'image',
-            'purchase_cost',
-            'expected_checkin',
-        ];
-
-        $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load
-
-        foreach ($all_custom_fields as $field) {
-            $allowed_columns[] = $field->db_column_name();
-        }
-
        $assets = Asset::select('assets.*')
-            ->with('location', 'assetstatus', 'assetlog', 'company','assignedTo',
-                'model.category', 'model.manufacturer', 'model.fieldset', 'supplier', 'requests')
+            ->with('location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo',
+                'model.category', 'model.manufacturer', 'model.fieldset', 'supplier')
            ->requestableAssets();

-
-
-
+        $offset = request('offset', 0);
+        $limit = $request->input('limit', 50);
+        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        if ($request->filled('search')) {
            $assets->TextSearch($request->input('search'));
        }

-        // Search custom fields by column name
-        foreach ($all_custom_fields as $field) {
-            if ($request->filled($field->db_column_name())) {
-                $assets->where($field->db_column_name(), '=', $request->input($field->db_column_name()));
-            }
-        }
-
-        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $sort_override = str_replace('custom_fields.', '', $request->input('sort'));
-
-        // This handles all the pivot sorting (versus the assets.* fields
-        // in the allowed_columns array)
-        $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'assets.created_at';
-
        switch ($request->input('sort')) {
            case 'model':
                $assets->OrderModels($order);
@@ -1078,19 +1051,17 @@ class AssetsController extends Controller
            case 'model_number':
                $assets->OrderModelNumber($order);
                break;
-            case 'location':
-                $assets->OrderLocation($order);
+            case 'category':
+                $assets->OrderCategory($order);
+                break;
+            case 'manufacturer':
+                $assets->OrderManufacturer($order);
                break;
            default:
-                $assets->orderBy($column_sort, $order);
+                $assets->orderBy('assets.created_at', $order);
                break;
        }

-
-        // Make sure the offset and limit are actually integers and do not exceed system limits
-        $offset = ($request->input('offset') > $assets->count()) ? $assets->count() : app('api_offset_value');
-        $limit = app('api_limit_value');
-
        $total = $assets->count();
        $assets = $assets->skip($offset)->take($limit)->get();

--- a/app/Http/Controllers/Api/CategoriesController.php
+++ b/app/Http/Controllers/Api/CategoriesController.php
@@ -92,7 +92,7 @@ class CategoriesController extends Controller
        }

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

        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
--- a/app/Http/Controllers/Api/CompaniesController.php
+++ b/app/Http/Controllers/Api/CompaniesController.php
@@ -27,9 +27,6 @@ class CompaniesController extends Controller
        $allowed_columns = [
            'id',
            'name',
-            'phone',
-            'fax',
-            'email',
            'created_at',
            'updated_at',
            'users_count',
@@ -50,13 +47,9 @@ class CompaniesController extends Controller
            $companies->where('name', '=', $request->input('name'));
        }

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

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


@@ -173,7 +166,6 @@ class CompaniesController extends Controller
        $companies = Company::select([
            'companies.id',
            'companies.name',
-            'companies.email',
            'companies.image',
        ]);

--- a/app/Http/Controllers/Api/ComponentsController.php
+++ b/app/Http/Controllers/Api/ComponentsController.php
@@ -13,7 +13,6 @@ use App\Events\CheckoutableCheckedIn;
 use App\Events\ComponentCheckedIn;
 use App\Models\Asset;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Database\Query\Builder;

 class ComponentsController extends Controller
 {
@@ -77,7 +76,7 @@ class ComponentsController extends Controller
        }

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

        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
@@ -204,29 +203,12 @@ class ComponentsController extends Controller
        $this->authorize('view', \App\Models\Asset::class);
        
        $component = Component::findOrFail($id);
-        
+        $assets = $component->assets();
+
        $offset = request('offset', 0);
        $limit = $request->input('limit', 50);
-        
-        if ($request->filled('search')) {
-            $assets = $component->assets()
-                                ->where(function ($query) use ($request) {
-                                    $search_str = '%' . $request->input('search') . '%';
-                                    $query->where('name', 'like', $search_str)
-                                            ->orWhereIn('model_id', function (Builder $query) use ($request) {
-                                                $search_str = '%' . $request->input('search') . '%';
-                                                $query->selectRaw('id')->from('models')->where('name', 'like', $search_str);
-                                            })
-                                            ->orWhere('asset_tag', 'like', $search_str);
-                                         })
-                                         ->get();
-            $total = $assets->count();
-        } else {
-            $assets = $component->assets();
-            
-            $total = $assets->count();
-            $assets = $assets->skip($offset)->take($limit)->get();
-        }
+        $total = $assets->count();
+        $assets = $assets->skip($offset)->take($limit)->get();

        return (new ComponentsTransformer)->transformCheckedoutComponents($assets, $total);
    }
@@ -253,7 +235,7 @@ class ComponentsController extends Controller
        $this->authorize('checkout', $component);

        $validator = Validator::make($request->all(), [
-            'assigned_to'          => 'required|exists:assets,id',
+            'asset_id'          => 'required|exists:assets,id',
            'assigned_qty'      => "required|numeric|min:1|digits_between:1,".$component->numRemaining(),
        ]);

@@ -263,7 +245,7 @@ class ComponentsController extends Controller
        }

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

--- a/app/Http/Controllers/Api/ConsumablesController.php
+++ b/app/Http/Controllers/Api/ConsumablesController.php
@@ -86,7 +86,7 @@ class ConsumablesController extends Controller


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

        $allowed_columns = ['id', 'name', 'order_number', 'min_amt', 'purchase_date', 'purchase_cost', 'company', 'category', 'model_number', 'item_no', 'manufacturer', 'location', 'qty', 'image'];
@@ -263,14 +263,9 @@ class ConsumablesController extends Controller
        // Make sure there is at least one available to checkout
        if ($consumable->numRemaining() <= 0) {
            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/consumables/message.checkout.unavailable')));
+            \Log::debug('No enough remaining');
        }

-        // Make sure there is a valid category
-        if (!$consumable->category){
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.invalid_item_category_single', ['type' => trans('general.consumable')])));
-        }
-
-
        // Check if the user exists - @TODO:  this should probably be handled via validation, not here??
        if (!$user = User::find($request->input('assigned_to'))) {
            // Return error message
--- a/app/Http/Controllers/Api/DepartmentsController.php
+++ b/app/Http/Controllers/Api/DepartmentsController.php
@@ -27,18 +27,16 @@ class DepartmentsController extends Controller
        $this->authorize('view', Department::class);
        $allowed_columns = ['id', 'name', 'image', 'users_count'];

-        $departments = Department::select(
+        $departments = Company::scopeCompanyables(Department::select(
            'departments.id',
            'departments.name',
-            'departments.phone',
-            'departments.fax',
            'departments.location_id',
            'departments.company_id',
            'departments.manager_id',
            'departments.created_at',
            'departments.updated_at',
-            'departments.image'
-        )->with('users')->with('location')->with('manager')->with('company')->withCount('users as users_count');
+            'departments.image'),
+             "company_id", "departments")->with('users')->with('location')->with('manager')->with('company')->withCount('users as users_count');

        if ($request->filled('search')) {
            $departments = $departments->TextSearch($request->input('search'));
@@ -61,7 +59,7 @@ class DepartmentsController extends Controller
        }

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

        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
--- a/app/Http/Controllers/Api/DepreciationsController.php
+++ b/app/Http/Controllers/Api/DepreciationsController.php
@@ -29,7 +29,7 @@ class DepreciationsController extends Controller
        }

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

        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
--- a/app/Http/Controllers/Api/GroupsController.php
+++ b/app/Http/Controllers/Api/GroupsController.php
@@ -36,7 +36,7 @@ class GroupsController extends Controller
        }

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

        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
@@ -63,7 +63,7 @@ class GroupsController extends Controller
        $group = new Group;

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

        if ($group->save()) {
            return response()->json(Helper::formatStandardApiResponse('success', $group, trans('admin/groups/message.create.success')));
--- a/app/Http/Controllers/Api/LabelsController.php
+++ b/app/Http/Controllers/Api/LabelsController.php
@@ -1,71 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
-use App\Http\Transformers\LabelsTransformer;
-use App\Models\Labels\Label;
-use Illuminate\Http\Request;
-use Illuminate\Support\ItemNotFoundException;
-use Auth;
-
-class LabelsController extends Controller
-{
-    /**
-     * Returns JSON listing of all labels.
-     *
-     * @author Grant Le Roux <grant.leroux+snipe-it@gmail.com>
-     * @return JsonResponse
-     */
-    public function index(Request $request)
-    {
-        $this->authorize('view', Label::class);
-
-        $labels = Label::find();
-
-        if ($request->filled('search')) {
-            $search = $request->get('search');
-            $labels = $labels->filter(function ($label, $index) use ($search) {
-                return stripos($label->getName(), $search) !== false;
-            });
-        }
-
-        $total = $labels->count();
-
-        $offset = $request->get('offset', 0);
-        $offset = ($offset > $total) ? $total : $offset;
-
-        $maxLimit = config('app.max_results');
-        $limit = $request->get('limit', $maxLimit);
-        $limit = ($limit > $maxLimit) ? $maxLimit : $limit;
-        
-        $labels = $labels->skip($offset)->take($limit);
-
-        return (new LabelsTransformer)->transformLabels($labels, $total, $request);
-    }
-
-    /**
-     * Returns JSON with information about a label for detail view.
-     *
-     * @author Grant Le Roux <grant.leroux+snipe-it@gmail.com>
-     * @param  string  $labelName
-     * @return JsonResponse
-     */
-    public function show(string $labelName)
-    {
-        $labelName = str_replace('/', '\\', $labelName);
-        try {
-            $label = Label::find($labelName);
-        } catch(ItemNotFoundException $e) {
-            return response()
-                ->json(
-                    Helper::formatStandardApiResponse('error', null, trans('admin/labels/message.does_not_exist')), 
-                    404
-                );
-        }
-        $this->authorize('view', $label);
-        return (new LabelsTransformer)->transformLabel($label);
-    }
-
-}
--- a/app/Http/Controllers/Api/LicenseSeatsController.php
+++ b/app/Http/Controllers/Api/LicenseSeatsController.php
@@ -41,12 +41,7 @@ class LicenseSeatsController extends Controller
            $total = $seats->count();

            // Make sure the offset and limit are actually integers and do not exceed system limits
-            $offset = ($request->input('offset') > $seats->count()) ? $seats->count() : app('api_offset_value');
-
-            if ($offset >= $total ){
-                $offset = 0;
-            }
-
+            $offset = ($request->input('offset') > $seats->count()) ? $seats->count() : abs($request->input('offset'));
            $limit = app('api_limit_value');

            $seats = $seats->skip($offset)->take($limit)->get();
--- a/app/Http/Controllers/Api/LicensesController.php
+++ b/app/Http/Controllers/Api/LicensesController.php
@@ -95,7 +95,7 @@ class LicensesController extends Controller
        }

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

        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
--- a/app/Http/Controllers/Api/LocationsController.php
+++ b/app/Http/Controllers/Api/LocationsController.php
@@ -37,8 +37,6 @@ class LocationsController extends Controller
            'locations.city',
            'locations.state',
            'locations.zip',
-            'locations.phone',
-            'locations.fax',
            'locations.country',
            'locations.parent_id',
            'locations.manager_id',
@@ -81,7 +79,7 @@ class LocationsController extends Controller
        }

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

        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
@@ -253,12 +251,8 @@ class LocationsController extends Controller
     */
    public function selectlist(Request $request)
    {
-        // If a user is in the process of editing their profile, as determined by the referrer,
-        // then we check that they have permission to edit their own location.
-        // Otherwise, we do our normal check that they can view select lists.
-        $request->headers->get('referer') === route('profile')
-            ? $this->authorize('self.edit_location')
-            : $this->authorize('view.selectlists');
+
+        $this->authorize('view.selectlists');

        $locations = Location::select([
            'locations.id',
--- a/app/Http/Controllers/Api/ManufacturersController.php
+++ b/app/Http/Controllers/Api/ManufacturersController.php
@@ -6,11 +6,9 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\ManufacturersTransformer;
 use App\Http\Transformers\SelectlistTransformer;
-use App\Models\Actionlog;
 use App\Models\Manufacturer;
 use Illuminate\Http\Request;
 use App\Http\Requests\ImageUploadRequest;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;

 class ManufacturersController extends Controller
@@ -64,7 +62,7 @@ class ManufacturersController extends Controller
        }

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

        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
@@ -161,44 +159,6 @@ class ManufacturersController extends Controller

    }

-    /**
-     * Restore a given Manufacturer (mark as un-deleted)
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v6.3.4]
-     * @param int $id
-     * @return \Illuminate\Http\JsonResponse
-     * @throws \Illuminate\Auth\Access\AuthorizationException
-     */
-    public function restore($id)
-    {
-        $this->authorize('delete', Manufacturer::class);
-
-        if ($manufacturer = Manufacturer::withTrashed()->find($id)) {
-
-            if ($manufacturer->deleted_at == '') {
-                return response()->json(Helper::formatStandardApiResponse('error', trans('general.not_deleted', ['item_type' => trans('general.manufacturer')])), 200);
-            }
-
-            if ($manufacturer->restore()) {
-
-                $logaction = new Actionlog();
-                $logaction->item_type = Manufacturer::class;
-                $logaction->item_id = $manufacturer->id;
-                $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = Auth::user()->id;
-                $logaction->logaction('restore');
-
-                return response()->json(Helper::formatStandardApiResponse('success', trans('admin/manufacturers/message.restore.success')), 200);
-            }
-
-            // Check validation to make sure we're not restoring an item with the same unique attributes as a non-deleted one
-            return response()->json(Helper::formatStandardApiResponse('error', trans('general.could_not_restore', ['item_type' => trans('general.manufacturer'), 'error' => $manufacturer->getErrors()->first()])), 200);
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null,  trans('admin/manufacturers/message.does_not_exist')));
-    }
-
    /**
     * Gets a paginated collection for the select2 menus
     *
--- a/app/Http/Controllers/Api/PredefinedKitsController.php
+++ b/app/Http/Controllers/Api/PredefinedKitsController.php
@@ -30,7 +30,7 @@ class PredefinedKitsController extends Controller
        }

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

        $order = $request->input('order') === 'desc' ? 'desc' : 'asc';
--- a/app/Http/Controllers/Api/ProfileController.php
+++ b/app/Http/Controllers/Api/ProfileController.php
@@ -11,7 +11,6 @@ use Illuminate\Http\Request;
 use Laravel\Passport\TokenRepository;
 use Illuminate\Contracts\Validation\Factory as ValidationFactory;
 use Illuminate\Support\Facades\Gate;
-use App\Models\CustomField;
 use DB;

 class ProfileController extends Controller
@@ -49,23 +48,14 @@ class ProfileController extends Controller
    {
        $checkoutRequests = CheckoutRequest::where('user_id', '=', Auth::user()->id)->get();

-        $results = array();
-        $show_field = array();
-        $showable_fields = array();
+        $results = [];
        $results['total'] = $checkoutRequests->count();

-        $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load
-        foreach ($all_custom_fields as $field) {
-            if (($field->field_encrypted=='0') && ($field->show_in_requestable_list=='1')) {
-                $showable_fields[] = $field->db_column_name();
-            }
-        }
-
        foreach ($checkoutRequests as $checkoutRequest) {

            // Make sure the asset and request still exist
            if ($checkoutRequest && $checkoutRequest->itemRequested()) {
-                $assets = [
+                $results['rows'][] = [
                    'image' => e($checkoutRequest->itemRequested()->present()->getImageUrl()),
                    'name' => e($checkoutRequest->itemRequested()->present()->name()),
                    'type' => e($checkoutRequest->itemType()),
@@ -74,16 +64,7 @@ class ProfileController extends Controller
                    'expected_checkin' => Helper::getFormattedDateObject($checkoutRequest->itemRequested()->expected_checkin, 'datetime'),
                    'request_date' => Helper::getFormattedDateObject($checkoutRequest->created_at, 'datetime'),
                ];
-
-                foreach ($showable_fields as $showable_field_name) {
-                    $show_field['custom_fields.'.$showable_field_name] =  $checkoutRequest->itemRequested()->{$showable_field_name};
-                }
-
-                // Merge the plain asset data and the custom fields data
-                $results['rows'][] = array_merge($assets, $show_field);
            }
-
-
        }

        return $results;
--- a/app/Http/Controllers/Api/ReportsController.php
+++ b/app/Http/Controllers/Api/ReportsController.php
@@ -56,7 +56,7 @@ class ReportsController extends Controller


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

        $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
--- a/app/Http/Controllers/Api/StatuslabelsController.php
+++ b/app/Http/Controllers/Api/StatuslabelsController.php
@@ -52,7 +52,7 @@ class StatuslabelsController extends Controller
        }

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

        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
--- a/app/Http/Controllers/Api/SuppliersController.php
+++ b/app/Http/Controllers/Api/SuppliersController.php
@@ -41,7 +41,7 @@ class SuppliersController extends Controller
        ];
        
        $suppliers = Supplier::select(
-                ['id', 'name', 'address', 'address2', 'city', 'state', 'country', 'fax', 'phone', 'email', 'contact', 'created_at', 'updated_at', 'deleted_at', 'image', 'notes', 'url'])
+                ['id', 'name', 'address', 'address2', 'city', 'state', 'country', 'fax', 'phone', 'email', 'contact', 'created_at', 'updated_at', 'deleted_at', 'image', 'notes'])
                    ->withCount('assets as assets_count')
                    ->withCount('licenses as licenses_count')
                    ->withCount('accessories as accessories_count')
@@ -94,7 +94,7 @@ class SuppliersController extends Controller
        }

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

        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -11,7 +11,6 @@ use App\Http\Transformers\ConsumablesTransformer;
 use App\Http\Transformers\LicensesTransformer;
 use App\Http\Transformers\SelectlistTransformer;
 use App\Http\Transformers\UsersTransformer;
-use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\Company;
 use App\Models\License;
@@ -76,8 +75,15 @@ class UsersController extends Controller

        ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy',)
            ->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count');
+        $users = Company::scopeCompanyables($users);


+        if (($request->filled('deleted')) && ($request->input('deleted') == 'true')) {
+            $users = $users->onlyTrashed();
+        } elseif (($request->filled('all')) && ($request->input('all') == 'true')) {
+            $users = $users->withTrashed();
+        }
+
        if ($request->filled('activated')) {
            $users = $users->where('users.activated', '=', $request->input('activated'));
        }
@@ -193,7 +199,7 @@ class UsersController extends Controller
        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';

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


@@ -266,14 +272,6 @@ class UsersController extends Controller
                break;
        }

-        if (($request->filled('deleted')) && ($request->input('deleted') == 'true')) {
-            $users = $users->onlyTrashed();
-        } elseif (($request->filled('all')) && ($request->input('all') == 'true')) {
-            $users = $users->withTrashed();
-        }
-
-        $users = Company::scopeCompanyables($users);
-        
        $total = $users->count();
        $users = $users->skip($offset)->take($limit)->get();

@@ -364,12 +362,8 @@ class UsersController extends Controller
            $user->permissions = $permissions_array;
        }

-        // 
-        if ($request->filled('password')) {
-            $user->password = bcrypt($request->get('password'));
-        } else {
-            $user->password = $user->noPassword();
-        }
+        $tmp_pass = substr(str_shuffle('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'), 0, 40);
+        $user->password = bcrypt($request->get('password', $tmp_pass));

        app('App\Http\Requests\ImageUploadRequest')->handleImages($user, 600, 'image', 'avatars', 'avatar');
        
@@ -689,31 +683,17 @@ class UsersController extends Controller
     */
    public function restore($userId = null)
    {
+        // Get asset information
+        $user = User::withTrashed()->find($userId);
+        $this->authorize('delete', $user);
+        if (isset($user->id)) {
+            // Restore the user
+            User::withTrashed()->where('id', $userId)->restore();

-        if ($user = User::withTrashed()->find($userId)) {
-            $this->authorize('delete', $user);
-
-            if ($user->deleted_at == '') {
-                return response()->json(Helper::formatStandardApiResponse('error', trans('general.not_deleted', ['item_type' => trans('general.user')])), 200);
-            }
-
-            if ($user->restore()) {
-
-                $logaction = new Actionlog();
-                $logaction->item_type = User::class;
-                $logaction->item_id = $user->id;
-                $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = Auth::user()->id;
-                $logaction->logaction('restore');
-
-                return response()->json(Helper::formatStandardApiResponse('success', trans('admin/users/message.restore.success')), 200);
-            }
-
-            // Check validation to make sure we're not restoring a user with the same username as an existing user
-            return response()->json(Helper::formatStandardApiResponse('error', trans('general.could_not_restore', ['item_type' => trans('general.user'), 'error' => $user->getErrors()->first()])), 200);
+            return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/users/message.success.restored')));
        }
-
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.user_not_found')), 200);
-
+        
+        $id = $userId;
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.user_not_found', compact('id'))), 200);
    }
 }
--- a/app/Http/Controllers/AssetModelsController.php
+++ b/app/Http/Controllers/AssetModelsController.php
@@ -4,12 +4,8 @@ namespace App\Http\Controllers;

 use App\Helpers\Helper;
 use App\Http\Requests\ImageUploadRequest;
-use App\Models\Actionlog;
-use App\Models\Asset;
 use App\Models\AssetModel;
-use App\Models\User;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Validator;
@@ -80,7 +76,6 @@ class AssetModelsController extends Controller
        $model->depreciation_id = $request->input('depreciation_id');
        $model->name = $request->input('name');
        $model->model_number = $request->input('model_number');
-        $model->min_amt = $request->input('min_amt');
        $model->manufacturer_id = $request->input('manufacturer_id');
        $model->category_id = $request->input('category_id');
        $model->notes = $request->input('notes');
@@ -158,7 +153,6 @@ class AssetModelsController extends Controller
        $model->eol = $request->input('eol');
        $model->name = $request->input('name');
        $model->model_number = $request->input('model_number');
-        $model->min_amt = $request->input('min_amt');
        $model->manufacturer_id = $request->input('manufacturer_id');
        $model->category_id = $request->input('category_id');
        $model->notes = $request->input('notes');
@@ -177,20 +171,8 @@ class AssetModelsController extends Controller
                }
            }
        }
-       
-      
-       
+
        if ($model->save()) {
-            if ($model->wasChanged('eol')) {
-                    if ($model->eol > 0) {
-                        $newEol = $model->eol; 
-                        $model->assets()->whereNotNull('purchase_date')->where('eol_explicit', false)
-                            ->update(['asset_eol_date' => DB::raw('DATE_ADD(purchase_date, INTERVAL ' . $newEol . ' MONTH)')]);
-                        } elseif ($model->eol == 0) {
-    						$model->assets()->whereNotNull('purchase_date')->where('eol_explicit', false)
-    							->update(['asset_eol_date' => DB::raw('null')]);
-					}
-                }
            return redirect()->route('models.index')->with('success', trans('admin/models/message.update.success'));
        }

@@ -212,7 +194,7 @@ class AssetModelsController extends Controller
        $this->authorize('delete', AssetModel::class);
        // Check if the model exists
        if (is_null($model = AssetModel::find($modelId))) {
-            return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));
+            return redirect()->route('models.index')->with('error', trans('admin/models/message.not_found'));
        }

        if ($model->assets()->count() > 0) {
@@ -240,42 +222,22 @@ class AssetModelsController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
-     * @param int $id
+     * @param int $modelId
     * @return Redirect
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function getRestore($id)
+    public function getRestore($modelId = null)
    {
        $this->authorize('create', AssetModel::class);
+        // Get user information
+        $model = AssetModel::withTrashed()->find($modelId);

-        if ($model = AssetModel::withTrashed()->find($id)) {
+        if (isset($model->id)) {
+            $model->restore();

-            if ($model->deleted_at == '') {
-                return redirect()->back()->with('error', trans('general.not_deleted', ['item_type' => trans('general.asset_model')]));
-            }
-
-            if ($model->restore()) {
-                $logaction = new Actionlog();
-                $logaction->item_type = User::class;
-                $logaction->item_id = $model->id;
-                $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = Auth::user()->id;
-                $logaction->logaction('restore');
-
-
-                // Redirect them to the deleted page if there are more, otherwise the section index
-                $deleted_models = AssetModel::onlyTrashed()->count();
-                if ($deleted_models > 0) {
-                    return redirect()->back()->with('success', trans('admin/models/message.restore.success'));
-                }
-                return redirect()->route('models.index')->with('success', trans('admin/models/message.restore.success'));
-            }
-
-            // Check validation
-            return redirect()->back()->with('error', trans('general.could_not_restore', ['item_type' => trans('general.asset_model'), 'error' => $model->getErrors()->first()]));
+            return redirect()->route('models.index')->with('success', trans('admin/models/message.restore.success'));
        }
-
-        return redirect()->back()->with('error', trans('admin/models/message.does_not_exist'));
+        return redirect()->back()->with('error', trans('admin/models/message.not_found'));

    }

@@ -324,7 +286,6 @@ class AssetModelsController extends Controller
        return view('models/edit')
            ->with('depreciation_list', Helper::depreciationList())
            ->with('item', $model)
-            ->with('model_id', $model_to_clone->id)
            ->with('clone_model', $model_to_clone);
    }

--- a/app/Http/Controllers/AssetModelsFilesController.php
+++ b/app/Http/Controllers/AssetModelsFilesController.php
@@ -78,7 +78,7 @@ class AssetModelsFilesController extends Controller
     * @return View
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function show($modelId = null, $fileId = null)
+    public function show($modelId = null, $fileId = null, $download = true)
    {
        $model = AssetModel::find($modelId);
        // the asset is valid
@@ -99,13 +99,12 @@ class AssetModelsFilesController extends Controller
                    ->header('Content-Type', 'text/plain');
            }

-            if (request('inline') == 'true') {
+            if ($download != 'true') {
+                if ($contents = file_get_contents(Storage::url($file))) {
+                    return Response::make(Storage::url($file)->header('Content-Type', mime_content_type($file)));
+                }

-                $headers = [
-                    'Content-Disposition' => 'inline',
-                ];
-
-                return Storage::download($file, $log->filename, $headers);
+                return JsonResponse::create(['error' => 'Failed validation: '], 500);
            }

            return StorageHelper::downloader($file);
--- a/app/Http/Controllers/Assets/AssetCheckinController.php
+++ b/app/Http/Controllers/Assets/AssetCheckinController.php
@@ -68,7 +68,6 @@ class AssetCheckinController extends Controller

        $asset->expected_checkin = null;
        $asset->last_checkout = null;
-        $asset->last_checkin = now();
        $asset->assigned_to = null;
        $asset->assignedTo()->disassociate($asset);
        $asset->assigned_type = null;
@@ -95,25 +94,18 @@ class AssetCheckinController extends Controller
            \Log::debug('Manually override the location IDs');
            \Log::debug('Original Location ID: '.$asset->location_id);
            $asset->location_id = '';
-            \Log::debug('New Location ID: '.$asset->location_id);
+            \Log::debug('New RTD Location ID: '.$asset->location_id);
        }

        $asset->location_id = $asset->rtd_location_id;

        if ($request->filled('location_id')) {
            \Log::debug('NEW Location ID: '.$request->get('location_id'));
-            $asset->location_id = $request->get('location_id');
-
-            if ($request->get('update_default_location') == 0){
-                $asset->rtd_location_id = $request->get('location_id');
-            }
+            $asset->location_id = e($request->get('location_id'));
        }

-        $originalValues = $asset->getRawOriginal();
-
        $checkin_at = date('Y-m-d H:i:s');
        if (($request->filled('checkin_at')) && ($request->get('checkin_at') != date('Y-m-d'))) {
-            $originalValues['action_date'] = $checkin_at;
            $checkin_at = $request->get('checkin_at');
        }

@@ -136,7 +128,7 @@ class AssetCheckinController extends Controller

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

            if ((isset($user)) && ($backto == 'user')) {
                return redirect()->route('users.show', $user->id)->with('success', trans('admin/hardware/message.checkin.success'));
--- a/app/Http/Controllers/Assets/AssetCheckoutController.php
+++ b/app/Http/Controllers/Assets/AssetCheckoutController.php
@@ -89,15 +89,6 @@ class AssetCheckoutController extends Controller
                }
            }

-            $settings = \App\Models\Setting::getSettings();
-
-            // We have to check whether $target->company_id is null here since locations don't have a company yet
-            if (($settings->full_multiple_companies_support) && ((!is_null($target->company_id)) &&  (!is_null($asset->company_id)))) {
-                if ($target->company_id != $asset->company_id){
-                    return redirect()->to("hardware/$assetId/checkout")->with('error', trans('general.error_user_company'));
-                }
-            }
-            
            if ($asset->checkOut($target, $admin, $checkout_at, $expected_checkin, e($request->get('note')), $request->get('name'))) {
                return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.checkout.success'));
            }
--- a/app/Http/Controllers/Assets/AssetFilesController.php
+++ b/app/Http/Controllers/Assets/AssetFilesController.php
@@ -79,14 +79,14 @@ class AssetFilesController extends Controller
     * @return View
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function show($assetId = null, $fileId = null)
+    public function show($assetId = null, $fileId = null, $download = true)
    {
        $asset = Asset::find($assetId);
        // the asset is valid
        if (isset($asset->id)) {
            $this->authorize('view', $asset);

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

-            if (request('inline') == 'true') {
+            if ($download != 'true') {
+                if ($contents = file_get_contents(Storage::url($file))) {
+                    return Response::make(Storage::url($file)->header('Content-Type', mime_content_type($file)));
+                }

-                $headers = [
-                    'Content-Disposition' => 'inline',
-                ];
-
-                return Storage::download($file, $log->filename, $headers);
+                return JsonResponse::create(['error' => 'Failed validation: '], 500);
            }

            return StorageHelper::downloader($file);
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -6,8 +6,6 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Actionlog;
-use App\Models\Manufacturer;
-use Illuminate\Support\Facades\Log;
 use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\CheckoutRequest;
@@ -16,18 +14,25 @@ use App\Models\Location;
 use App\Models\Setting;
 use App\Models\Statuslabel;
 use App\Models\User;
-use Illuminate\Support\Facades\Auth;
-use App\View\Label;
+use Auth;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\View;
+use DB;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Facades\Cookie;
+use Input;
+use Intervention\Image\Facades\Image;
 use League\Csv\Reader;
-use Illuminate\Support\Facades\Redirect;
+use League\Csv\Statement;
+use Paginator;
+use Redirect;
+use Response;
+use Slack;
+use Str;
+use TCPDF;
+use View;

 /**
 * This class controls all actions related to assets for
@@ -138,7 +143,7 @@ class AssetsController extends Controller
            $asset->warranty_months         = request('warranty_months', null);
            $asset->purchase_cost           = request('purchase_cost');
            $asset->purchase_date           = request('purchase_date', null);
-            $asset->asset_eol_date          = request('asset_eol_date', null);
+            $asset->asset_eol_date          = request('asset_eol_date', $asset->present()->eol_date());
            $asset->assigned_to             = request('assigned_to', null);
            $asset->supplier_id             = request('supplier_id', null);
            $asset->requestable             = request('requestable', 0);
@@ -167,9 +172,9 @@ class AssetsController extends Controller
                    if ($field->field_encrypted == '1') {
                        if (Gate::allows('admin')) {
                            if (is_array($request->input($field->db_column))) {
-                                $asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
+                                $asset->{$field->db_column} = \Crypt::encrypt(implode(', ', $request->input($field->db_column)));
                            } else {
-                                $asset->{$field->db_column} = Crypt::encrypt($request->input($field->db_column));
+                                $asset->{$field->db_column} = \Crypt::encrypt($request->input($field->db_column));
                            }
                        }
                    } else {
@@ -205,9 +210,12 @@ class AssetsController extends Controller
        }

        if ($success) {
-            \Log::debug(e($asset->asset_tag));
+            // Redirect to the asset listing page
+            $minutes = 518400;
+            // dd( $_POST['options']);
+            // Cookie::queue(Cookie::make('optional_info', json_decode($_POST['options']), $minutes));
            return redirect()->route('hardware.index')
-                ->with('success-unescaped', trans('admin/hardware/message.create.success_linked', ['link' => route('hardware.show', $asset->id), 'id', 'tag' => e($asset->asset_tag)]));
+                ->with('success', trans('admin/hardware/message.create.success'));
               
      
        }
@@ -289,10 +297,10 @@ class AssetsController extends Controller
    /**
     * Validate and process asset edit form.
     *
-     * @param int $assetId
-     * @return \Illuminate\Http\RedirectResponse|Redirect
-     *@since [v1.0]
     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param int $assetId
+     * @since [v1.0]
+     * @return Redirect
     */
    public function update(ImageUploadRequest $request, $assetId = null)
    {
@@ -306,27 +314,9 @@ class AssetsController extends Controller
        $asset->status_id = $request->input('status_id', null);
        $asset->warranty_months = $request->input('warranty_months', null);
        $asset->purchase_cost = $request->input('purchase_cost', null);
-        $asset->purchase_date = $request->input('purchase_date', null); 
-        if ($request->filled('purchase_date') && !$request->filled('asset_eol_date') && ($asset->model->eol > 0)) {
-            $asset->purchase_date = $request->input('purchase_date', null); 
-            $asset->asset_eol_date = Carbon::parse($request->input('purchase_date'))->addMonths($asset->model->eol)->format('Y-m-d');
-            $asset->eol_explicit = false;
-        } elseif ($request->filled('asset_eol_date')) {
-           $asset->asset_eol_date = $request->input('asset_eol_date', null);
-           $months = Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date);
-           if($asset->model->eol) {
-               if($months != $asset->model->eol > 0) {
-                   $asset->eol_explicit = true;
-               } else {
-                   $asset->eol_explicit = false;
-               }
-           } else {
-               $asset->eol_explicit = true;
-           }
-        } elseif (!$request->filled('asset_eol_date') && (($asset->model->eol) == 0)) {
-           $asset->asset_eol_date = null;
-		   $asset->eol_explicit = false;
-        }
+        $asset->asset_eol_date  = request('asset_eol_date', null);
+
+        $asset->purchase_date = $request->input('purchase_date', null);
        $asset->supplier_id = $request->input('supplier_id', null);
        $asset->expected_checkin = $request->input('expected_checkin', null);

@@ -351,7 +341,7 @@ class AssetsController extends Controller
                unlink(public_path().'/uploads/assets/'.$asset->image);
                $asset->image = '';
            } catch (\Exception $e) {
-                Log::info($e);
+                \Log::info($e);
            }
        }

@@ -379,9 +369,9 @@ class AssetsController extends Controller
                if ($field->field_encrypted == '1') {
                    if (Gate::allows('admin')) {
                        if (is_array($request->input($field->db_column))) {
-                            $asset->{$field->db_column} = Crypt::encrypt(implode(', ', $request->input($field->db_column)));
+                            $asset->{$field->db_column} = \Crypt::encrypt(implode(', ', $request->input($field->db_column)));
                        } else {
-                            $asset->{$field->db_column} = Crypt::encrypt($request->input($field->db_column));
+                            $asset->{$field->db_column} = \Crypt::encrypt($request->input($field->db_column));
                        }
                    }
                } else {
@@ -429,7 +419,7 @@ class AssetsController extends Controller
            try {
                Storage::disk('public')->delete('assets'.'/'.$asset->image);
            } catch (\Exception $e) {
-                Log::debug($e);
+                \Log::debug($e);
            }
        }

@@ -463,12 +453,11 @@ class AssetsController extends Controller
     * @since [v3.0]
     * @return Redirect
     */
-    public function getAssetByTag(Request $request, $tag=null)
+    public function getAssetByTag(Request $request)
    {
-        $tag = $tag ? $tag : $request->get('assetTag');
        $topsearch = ($request->get('topsearch') == 'true');

-        if (! $asset = Asset::where('asset_tag', '=', $tag)->first()) {
+        if (! $asset = Asset::where('asset_tag', '=', $request->get('assetTag'))->first()) {
            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
        }
        $this->authorize('view', $asset);
@@ -544,7 +533,7 @@ class AssetsController extends Controller

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

                    return response(file_get_contents(public_path('uploads/barcodes/invalid_barcode.gif')))->header('Content-type', 'image/gif');
                }
@@ -565,11 +554,9 @@ class AssetsController extends Controller
            $asset = Asset::find($assetId);
            $this->authorize('view', $asset);

-            return (new Label())
-                ->with('assets', collect([ $asset ]))
+            return view('hardware/labels')
+                ->with('assets', Asset::find($asset))
                ->with('settings', Setting::getSettings())
-                ->with('template', request()->get('template'))
-                ->with('offset', request()->get('offset'))
                ->with('bulkedit', false)
                ->with('count', 0);
        }
@@ -787,7 +774,7 @@ class AssetsController extends Controller
    }

    /**
-     * Restore a deleted asset.
+     * Retore a deleted asset.
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @param int $assetId
@@ -796,24 +783,21 @@ class AssetsController extends Controller
     */
    public function getRestore($assetId = null)
    {
-        if ($asset = Asset::withTrashed()->find($assetId)) {
-            $this->authorize('delete', $asset);
+        // Get asset information
+        $asset = Asset::withTrashed()->find($assetId);
+        $this->authorize('delete', $asset);
+        if (isset($asset->id)) {
+            // Restore the asset
+            Asset::withTrashed()->where('id', $assetId)->restore();

-            if ($asset->deleted_at == '') {
-                return redirect()->back()->with('error', trans('general.not_deleted', ['item_type' => trans('general.asset')]));
-            }
+            $logaction = new Actionlog();
+            $logaction->item_type = Asset::class;
+            $logaction->item_id = $asset->id;
+            $logaction->created_at = date('Y-m-d H:i:s');
+            $logaction->user_id = Auth::user()->id;
+            $logaction->logaction('restored');

-            if ($asset->restore()) {
-                // Redirect them to the deleted page if there are more, otherwise the section index
-                $deleted_assets = Asset::onlyTrashed()->count();
-                if ($deleted_assets > 0) {
-                    return redirect()->back()->with('success', trans('admin/hardware/message.restore.success'));
-                }
-                return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.restore.success'));
-            }
-
-            // Check validation to make sure we're not restoring an asset with the same asset tag (or unique attribute) as an existing asset
-            return redirect()->back()->with('error', trans('general.could_not_restore', ['item_type' => trans('general.asset'), 'error' => $asset->getErrors()->first()]));
+            return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.restore.success'));
        }

        return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
@@ -868,7 +852,7 @@ class AssetsController extends Controller
            'next_audit_date' => 'date|nullable',
        ];

-        $validator = Validator::make($request->all(), $rules);
+        $validator = \Validator::make($request->all(), $rules);

        if ($validator->fails()) {
            return response()->json(Helper::formatStandardApiResponse('error', null, $validator->errors()->all()));
@@ -885,7 +869,7 @@ class AssetsController extends Controller
        // Check to see if they checked the box to update the physical location,
        // not just note it in the audit notes
        if ($request->input('update_location') == '1') {
-            Log::debug('update location in audit');
+            \Log::debug('update location in audit');
            $asset->location_id = $request->input('location_id');
        }

--- a/app/Http/Controllers/Assets/BulkAssetsController.php
+++ b/app/Http/Controllers/Assets/BulkAssetsController.php
@@ -7,16 +7,12 @@ use App\Helpers\Helper;
 use App\Http\Controllers\CheckInOutRequest;
 use App\Http\Controllers\Controller;
 use App\Models\Asset;
-use App\Models\AssetModel;
-use App\Models\Statuslabel;
 use App\Models\Setting;
-use App\View\Label;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Session;
 use App\Http\Requests\AssetCheckoutRequest;
-use App\Models\CustomField;

 class BulkAssetsController extends Controller
 {
@@ -25,13 +21,6 @@ class BulkAssetsController extends Controller
    /**
     * Display the bulk edit page.
     *
-     * This method is super weird because it's kinda of like a controller within a controller.
-     * It's main function is to determine what the bulk action in, and then return a view with
-     * the information that view needs, be it bulk delete, bulk edit, restore, etc.
-     *
-     * This is something that made sense at the time, but sort of doesn't make sense now. A JS front-end to determine form
-     * action would make a lot more sense here and make things a lot more clear.
-     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @return View
     * @internal param int $assetId
@@ -42,9 +31,6 @@ class BulkAssetsController extends Controller
    {
        $this->authorize('view', Asset::class);

-        /**
-         * No asset IDs were passed
-         */
        if (! $request->filled('ids')) {
            return redirect()->back()->with('error', trans('admin/hardware/message.update.no_assets_selected'));
        }
@@ -53,53 +39,41 @@ class BulkAssetsController extends Controller
        $bulk_back_url = request()->headers->get('referer');
        session(['bulk_back_url' => $bulk_back_url]);

-
-        $asset_ids = $request->input('ids');
-        $assets = Asset::with('assignedTo', 'location', 'model')->find($asset_ids);
-
-        $models = $assets->unique('model_id');
-        $modelNames = [];
-        foreach($models as $model) {
-            $modelNames[] = $model->model->name;
-        }
+        $asset_ids = array_values(array_unique($request->input('ids')));

        if ($request->filled('bulk_actions')) {
-
-
            switch ($request->input('bulk_actions')) {
                case 'labels':
                    $this->authorize('view', Asset::class);
-
-                    return (new Label)
-                        ->with('assets', $assets)
+                    return view('hardware/labels')
+                        ->with('assets', Asset::find($asset_ids))
                        ->with('settings', Setting::getSettings())
                        ->with('bulkedit', true)
                        ->with('count', 0);

                case 'delete':
                    $this->authorize('delete', Asset::class);
-                    $assets->each(function ($assets) {
-                        $this->authorize('delete', $assets);
+                    $assets = Asset::with('assignedTo', 'location')->find($asset_ids);
+                    $assets->each(function ($asset) {
+                        $this->authorize('delete', $asset);
                    });

                    return view('hardware/bulk-delete')->with('assets', $assets);
                   
                case 'restore':
                    $this->authorize('update', Asset::class);
-                    $assets = Asset::withTrashed()->find($asset_ids);
+                    $assets = Asset::withTrashed()->find($asset_ids); 
                    $assets->each(function ($asset) {
                        $this->authorize('delete', $asset);
                    });
+
                    return view('hardware/bulk-restore')->with('assets', $assets);

                case 'edit':
                    $this->authorize('update', Asset::class);
-
                    return view('hardware/bulk')
                        ->with('assets', $asset_ids)
-                        ->with('statuslabel_list', Helper::statusLabelList())
-                        ->with('models', $models->pluck(['model']))
-                        ->with('modelNames', $modelNames);
+                        ->with('statuslabel_list', Helper::statusLabelList());
            }
        }

@@ -117,35 +91,19 @@ class BulkAssetsController extends Controller
    public function update(Request $request)
    {
        $this->authorize('update', Asset::class);
-        $has_errors = 0;
-        $error_array = array();

        // Get the back url from the session and then destroy the session
        $bulk_back_url = route('hardware.index');
-
        if ($request->session()->has('bulk_back_url')) {
            $bulk_back_url = $request->session()->pull('bulk_back_url');
        }

-       $custom_field_columns = CustomField::all()->pluck('db_column')->toArray();

-     
-        if (! $request->filled('ids') || count($request->input('ids')) == 0) {
+        if (! $request->filled('ids') || count($request->input('ids')) <= 0) {
            return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.update.no_assets_selected'));
        }

-
-        $assets = Asset::whereIn('id', array_keys($request->input('ids')))->get();
-
-
-
-        /**
-         * If ANY of these are filled, prepare to update the values on the assets.
-         *
-         * Additional checks will be needed for some of them to make sure the values
-         * make sense (for example, changing the status ID to something incompatible with
-         * its checkout status.
-         */
+        $assets = array_keys($request->input('ids'));

        if (($request->filled('purchase_date'))
            || ($request->filled('expected_checkin'))
@@ -162,35 +120,22 @@ class BulkAssetsController extends Controller
            || ($request->filled('null_purchase_date'))
            || ($request->filled('null_expected_checkin_date'))
            || ($request->filled('null_next_audit_date'))
-            || ($request->anyFilled($custom_field_columns))

        ) {
-            // Let's loop through those assets and build an update array
-            foreach ($assets as $asset) {
+            foreach ($assets as $assetId) {

                $this->update_array = [];

-                /**
-                 * Leave out model_id and status here because we do math on that later. We have to do some extra
-                 * validation and checks on those two.
-                 *
-                 * It's tempting to make these match the request check above, but some of these values require
-                 * extra work to make sure the data makes sense.
-                 */
                $this->conditionallyAddItem('purchase_date')
                    ->conditionallyAddItem('expected_checkin')
+                    ->conditionallyAddItem('model_id')
                    ->conditionallyAddItem('order_number')
                    ->conditionallyAddItem('requestable')
+                    ->conditionallyAddItem('status_id')
                    ->conditionallyAddItem('supplier_id')
                    ->conditionallyAddItem('warranty_months')
                    ->conditionallyAddItem('next_audit_date');
-                    foreach ($custom_field_columns as $key => $custom_field_column) {
-                        $this->conditionallyAddItem($custom_field_column); 
-                   }

-                /**
-                 * Blank out fields that were requested to be blanked out via checkbox
-                 */
                if ($request->input('null_purchase_date')=='1') {
                    $this->update_array['purchase_date'] = null;
                }
@@ -214,152 +159,41 @@ class BulkAssetsController extends Controller
                    }
                }

-                /**
-                 * We're trying to change the model ID - we need to do some extra checks here to make sure
-                 * the custom field values work for the custom fieldset rules around this asset. Uniqueness
-                 * and requiredness across the fieldset is particularly important, since those are
-                 * fieldset-specific attributes.
-                 */
-                if ($request->filled('model_id')) {
-                    $this->update_array['model_id'] = AssetModel::find($request->input('model_id'))->id;
-                }
-
-                /**
-                 * We're trying to change the status ID - we need to do some extra checks here to
-                 * make sure the status label type is one that makes sense for the state of the asset,
-                 * for example, we shouldn't be able to make an asset archived if it's currently assigned
-                 * to someone/something.
-                 */
-                if ($request->filled('status_id')) {
-                    $updated_status = Statuslabel::find($request->input('status_id'));
-
-                    // We cannot assign a non-deployable status type if the asset is already assigned.
-                    // This could probably be added to a form request.
-                    // If the asset isn't assigned, we don't care what the status is.
-                    // Otherwise we need to make sure the status type is still a deployable one.
-                    if (
-                        ($asset->assigned_to == '')
-                        || ($updated_status->deployable == '1') && ($asset->assetstatus->deployable == '1')
-                    ) {
-                        $this->update_array['status_id'] = $updated_status->id;
-                    }
-
-                }
-
-                /**
-                 * We're changing the location ID - figure out which location we should apply
-                 * this change to:
-                 *
-                 * 0 - RTD location only
-                 * 1 - location ID and RTD location ID
-                 * 2 - location ID only
-                 *
-                 * Note: this is kinda dumb and we should just use human-readable values IMHO. - snipe
-                 */
                if ($request->filled('rtd_location_id')) {
-
-                    if (($request->filled('update_real_loc')) && (($request->input('update_real_loc')) == '0')) {
-                        $this->update_array['rtd_location_id'] = $request->input('rtd_location_id');
-                    }
-
+                    $this->update_array['rtd_location_id'] = $request->input('rtd_location_id');
                    if (($request->filled('update_real_loc')) && (($request->input('update_real_loc')) == '1')) {
                        $this->update_array['location_id'] = $request->input('rtd_location_id');
-                        $this->update_array['rtd_location_id'] = $request->input('rtd_location_id');
                    }
-
-                    if (($request->filled('update_real_loc')) && (($request->input('update_real_loc')) == '2')) {
-                        $this->update_array['location_id'] = $request->input('rtd_location_id');
-                    }
-
                }

-
-                /**
-                 * ------------------------------------------------------------------------------
-                 * ANYTHING that happens past this foreach
-                 * WILL NOT BE logged in the edit log_meta data
-                 *  ------------------------------------------------------------------------------
-                 */
                $changed = [];
+                $asset = Asset::where('id' ,$assetId)->get();

                foreach ($this->update_array as $key => $value) {
-
-                    if ($this->update_array[$key] != $asset->{$key}) {
-                        $changed[$key]['old'] = $asset->{$key};
+                    if ($this->update_array[$key] != $asset->toArray()[0][$key]) {
+                        $changed[$key]['old'] = $asset->toArray()[0][$key];
                        $changed[$key]['new'] = $this->update_array[$key];
                    }
-
                }

-                /**
-                 * Start all the custom fields shenanigans
-                 */
+                $logAction = new Actionlog();
+                $logAction->item_type = Asset::class;
+                $logAction->item_id = $assetId;
+                $logAction->created_at =  date("Y-m-d H:i:s");
+                $logAction->user_id = Auth::id();
+                $logAction->log_meta = json_encode($changed);
+                $logAction->logaction('update');

-                // Does the model have a fieldset?
-                if ($asset->model->fieldset) {
-                    foreach ($asset->model->fieldset->fields as $field) {
-
-                        if ((array_key_exists($field->db_column, $this->update_array)) && ($field->field_encrypted == '1')) {
-                            $decrypted_old = Helper::gracefulDecrypt($field, $asset->{$field->db_column});
-
-                            /*
-                             * Check if the decrypted existing value is different from one we just submitted
-                             * and if not, pull it out of the object since it shouldn't really be updating at all.
-                             * If we don't do this, it will try to re-encrypt it, and the same value encrypted two
-                             * different times will have different values, so it will *look* like it was updated
-                             * but it wasn't.
-                             */
-                            if ($decrypted_old != $this->update_array[$field->db_column]) {
-                                $asset->{$field->db_column} = \Crypt::encrypt($this->update_array[$field->db_column]);
-                            } else {
-                                /*
-                                 * Remove the encrypted custom field from the update_array, since nothing changed
-                                 */
-                                unset($this->update_array[$field->db_column]);
-                                unset($asset->{$field->db_column});
-                            }
-
-                            /*
-                             * These custom fields aren't encrypted, just carry on as usual
-                             */
-                        } else {
-
-                            if ((array_key_exists($field->db_column, $this->update_array)) && ($asset->{$field->db_column} != $this->update_array[$field->db_column])) {
-
-                                // Check if this is an array, and if so, flatten it
-                                if (is_array($this->update_array[$field->db_column])) {
-                                    $asset->{$field->db_column} = implode(', ', $this->update_array[$field->db_column]);
-                                } else {
-                                    $asset->{$field->db_column} = $this->update_array[$field->db_column];
-                                }
-                            }
-                        }
-
-                    } // endforeach
-                }
-
-
-                // Check if it passes validation, and then try to save
-                if (!$asset->update($this->update_array)) {
-
-                    // Build the error array
-                    foreach ($asset->getErrors()->toArray() as $key => $message) {
-                        for ($x = 0; $x < count($message); $x++) {
-                            $error_array[$key][] = trans('general.asset') . ' ' . $asset->id . ': ' . $message[$x];
-                            $has_errors++;
-                        }
-                    }
-
-                }  // end if saved
-
-            } // end asset foreach
-
-            if ($has_errors > 0) {
-                return redirect($bulk_back_url)->with('bulk_asset_errors', $error_array);
-            }
+                DB::table('assets')
+                    ->where('id', $assetId)
+                    ->update($this->update_array);
+            } // endforeach

            return redirect($bulk_back_url)->with('success', trans('admin/hardware/message.update.success'));
+
+
        }
+
        // no values given, nothing to update
        return redirect($bulk_back_url)->with('warning', trans('admin/hardware/message.update.nothing_updated'));
    }
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -56,6 +56,7 @@ class LoginController extends Controller
        parent::__construct();
        $this->middleware('guest', ['except' => ['logout', 'postTwoFactorAuth', 'getTwoFactorAuth', 'getTwoFactorEnroll']]);
        Session::put('backUrl', \URL::previous());
+        // $this->ldap = $ldap;
        $this->saml = $saml;
    }

@@ -81,6 +82,7 @@ class LoginController extends Controller
        }

        if (Setting::getSettings()->login_common_disabled == '1') {
+            \Log::debug('login_common_disabled is set to 1 - return a 403');
            return view('errors.403');
        }

@@ -121,7 +123,7 @@ class LoginController extends Controller

                if ($user = Auth::user()) {
                    $user->last_login = \Carbon::now();
-                    $user->saveQuietly();
+                    $user->save();
                }
                
            } catch (\Exception $e) {
@@ -189,15 +191,13 @@ class LoginController extends Controller

             $ldap_attr = Ldap::parseAndMapLdapAttributes($ldap_user);

-            $user->password = $user->noPassword();
            if (Setting::getSettings()->ldap_pw_sync=='1') {
                $user->password = bcrypt($request->input('password'));
            }
-
            $user->email = $ldap_attr['email'];
            $user->first_name = $ldap_attr['firstname'];
            $user->last_name = $ldap_attr['lastname']; //FIXME (or TODO?) - do we need to map additional fields that we now support? E.g. country, phone, etc.
-            $user->saveQuietly();
+            $user->save();
        } // End if(!user)
        return $user;
    }
@@ -317,7 +317,7 @@ class LoginController extends Controller
        if ($user = Auth::user()) {
            $user->last_login = \Carbon::now();
            $user->activated = 1;
-            $user->saveQuietly();
+            $user->save();
        }
        // Redirect to the users page
        return redirect()->intended()->with('success', trans('auth/message.signin.success'));
@@ -369,7 +369,7 @@ class LoginController extends Controller
                [-2, -2, -2, -2]
            );

-        $user->saveQuietly(); // make sure to save *AFTER* displaying the barcode, or else we might save a two_factor_secret that we never actually displayed to the user if the barcode fails
+        $user->save(); // make sure to save *AFTER* displaying the barcode, or else we might save a two_factor_secret that we never actually displayed to the user if the barcode fails

        return view('auth.two_factor_enroll')->with('barcode_obj', $barcode_obj);
    }
@@ -424,7 +424,7 @@ class LoginController extends Controller

        if (Google2FA::verifyKey($user->two_factor_secret, $secret)) {
            $user->two_factor_enrolled = 1;
-            $user->saveQuietly();
+            $user->save();
            $request->session()->put('2fa_authed', $user->id);

            return redirect()->route('home')->with('success', 'You are logged in!');
--- a/app/Http/Controllers/CompaniesController.php
+++ b/app/Http/Controllers/CompaniesController.php
@@ -60,9 +60,6 @@ final class CompaniesController extends Controller

        $company = new Company;
        $company->name = $request->input('name');
-        $company->phone = $request->input('phone');
-        $company->fax = $request->input('fax');
-        $company->email = $request->input('email');

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

@@ -114,9 +111,6 @@ final class CompaniesController extends Controller
        $this->authorize('update', $company);

        $company->name = $request->input('name');
-        $company->phone = $request->input('phone');
-        $company->fax = $request->input('fax');
-        $company->email = $request->input('email');

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

@@ -125,7 +119,8 @@ final class CompaniesController extends Controller
                ->with('success', trans('admin/companies/message.update.success'));
        }

-        return redirect()->back()->withInput()->withErrors($company->getErrors());
+        return redirect()->route('companies.edit', ['company' => $companyId])
+            ->with('error', trans('admin/companies/message.update.error'));
    }

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

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

            return redirect()->route('components.index')->with('success',
                trans('admin/components/message.checkin.success'));
--- a/app/Http/Controllers/Components/ComponentCheckoutController.php
+++ b/app/Http/Controllers/Components/ComponentCheckoutController.php
@@ -20,38 +20,25 @@ class ComponentCheckoutController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @see ComponentCheckoutController::store() method that stores the data.
     * @since [v3.0]
-     * @param int $id
+     * @param int $componentId
     * @return \Illuminate\Contracts\View\View
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create($id)
+    public function create($componentId)
    {
+        // Check if the component exists
+        if (is_null($component = Component::find($componentId))) {
+            // Redirect to the component management page with error
+            return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));
+        }
+        $this->authorize('checkout', $component);

-        if ($component = Component::find($id)) {
-
-            $this->authorize('checkout', $component);
-
-            // Make sure the category is valid
-            if ($component->category) {
-
-                // Make sure there is at least one available to checkout
-                if ($component->numRemaining() <= 0){
-                    return redirect()->route('components.index')
-                        ->with('error', trans('admin/components/message.checkout.unavailable'));
-                }
-
-                // Return the checkout view
-                return view('components/checkout', compact('component'));
-            }
-
-            // Invalid category
-            return redirect()->route('components.edit', ['component' => $component->id])
-                ->with('error', trans('general.invalid_item_category_single', ['type' => trans('general.component')]));
+        // Make sure there is at least one available to checkout
+        if ($component->numRemaining() <= 0){
+            return redirect()->route('components.index')->with('error', trans('admin/components/message.checkout.unavailable'));
        }

-        // Not found
-        return redirect()->route('components.index')->with('error', trans('admin/components/message.not_found'));
-
+        return view('components/checkout', compact('component'));
    }

    /**
--- a/app/Http/Controllers/Components/ComponentsFilesController.php
+++ b/app/Http/Controllers/Components/ComponentsFilesController.php
@@ -132,7 +132,7 @@ class ComponentsFilesController extends Controller
     * @return \Symfony\Component\HttpFoundation\Response
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function show($componentId = null, $fileId = null)
+    public function show($componentId = null, $fileId = null, $download = true)
    {
        \Log::debug('Private filesystem is: '.config('filesystems.default'));
        $component = Component::find($componentId);
@@ -142,7 +142,7 @@ class ComponentsFilesController extends Controller
            $this->authorize('view', $component);
            $this->authorize('components.files', $component);

-            if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $component->id)->find($fileId)) {
+            if (! $log = Actionlog::find($fileId)) {
                return response('No matching record for that asset/file', 500)
                    ->header('Content-Type', 'text/plain');
            }
@@ -157,17 +157,21 @@ class ComponentsFilesController extends Controller
                    ->header('Content-Type', 'text/plain');
            } else {

-                // Display the file inline
-                if (request('inline') == 'true') {
-                    $headers = [
-                        'Content-Disposition' => 'inline',
-                    ];
-                    return Storage::download($file, $log->filename, $headers);
-                }
-
                if (config('filesystems.default') == 'local') { // TODO - is there any way to fix this at the StorageHelper layer?
                    return StorageHelper::downloader($file);
-                } 
+                } else {
+                    if ($download != 'true') {
+                        \Log::debug('display the file');
+                        if ($contents = file_get_contents(Storage::url($file))) { // TODO - this will fail on private S3 files or large public ones
+                            return Response::make(Storage::url($file)->header('Content-Type', mime_content_type($file)));
+                        }
+
+                        return JsonResponse::create(['error' => 'Failed validation: '], 500);
+                    }
+
+                    return StorageHelper::downloader($file);
+
+                }
            }
        }

--- a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
+++ b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Consumables;

 use App\Events\CheckoutableCheckedOut;
 use App\Http\Controllers\Controller;
-use App\Models\Accessory;
 use App\Models\Consumable;
 use App\Models\User;
 use Illuminate\Http\Request;
@@ -19,38 +18,25 @@ class ConsumableCheckoutController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @see ConsumableCheckoutController::store() method that stores the data.
     * @since [v1.0]
-     * @param int $id
+     * @param int $consumableId
     * @return \Illuminate\Contracts\View\View
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create($id)
+    public function create($consumableId)
    {

-        if ($consumable = Consumable::with('users')->find($id)) {
-
-            $this->authorize('checkout', $consumable);
-
-            // Make sure the category is valid
-            if ($consumable->category) {
-
-                // Make sure there is at least one available to checkout
-                if ($consumable->numRemaining() <= 0){
-                    return redirect()->route('consumables.index')
-                        ->with('error', trans('admin/consumables/message.checkout.unavailable'));
-                }
-
-                // Return the checkout view
-                return view('consumables/checkout', compact('consumable'));
-            }
-
-            // Invalid category
-            return redirect()->route('consumables.edit', ['consumable' => $consumable->id])
-                ->with('error', trans('general.invalid_item_category_single', ['type' => trans('general.consumable')]));
+        if (is_null($consumable = Consumable::with('users')->find($consumableId))) {
+            return redirect()->route('consumables.index')->with('error', trans('admin/consumables/message.does_not_exist'));
        }

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

+        $this->authorize('checkout', $consumable);
+
+        return view('consumables/checkout', compact('consumable'));
    }

    /**
--- a/app/Http/Controllers/Consumables/ConsumablesFilesController.php
+++ b/app/Http/Controllers/Consumables/ConsumablesFilesController.php
@@ -131,7 +131,7 @@ class ConsumablesFilesController extends Controller
     * @return \Symfony\Consumable\HttpFoundation\Response
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function show($consumableId = null, $fileId = null)
+    public function show($consumableId = null, $fileId = null, $download = true)
    {
        $consumable = Consumable::find($consumableId);

@@ -140,7 +140,7 @@ class ConsumablesFilesController extends Controller
            $this->authorize('view', $consumable);
            $this->authorize('consumables.files', $consumable);

-            if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $consumable->id)->find($fileId)) {
+            if (! $log = Actionlog::find($fileId)) {
                return response('No matching record for that asset/file', 500)
                    ->header('Content-Type', 'text/plain');
            }
@@ -155,19 +155,22 @@ class ConsumablesFilesController extends Controller
                    ->header('Content-Type', 'text/plain');
            } else {

-                // Display the file inline
-                if (request('inline') == 'true') {
-                    $headers = [
-                        'Content-Disposition' => 'inline',
-                    ];
-                    return Storage::download($file, $log->filename, $headers);
-                }
-
-
                // We have to override the URL stuff here, since local defaults in Laravel's Flysystem
                // won't work, as they're not accessible via the web
                if (config('filesystems.default') == 'local') { // TODO - is there any way to fix this at the StorageHelper layer?
                    return StorageHelper::downloader($file);
+                } else {
+                    if ($download != 'true') {
+                        \Log::debug('display the file');
+                        if ($contents = file_get_contents(Storage::url($file))) { // TODO - this will fail on private S3 files or large public ones
+                            return Response::make(Storage::url($file)->header('Content-Type', mime_content_type($file)));
+                        }
+
+                        return JsonResponse::create(['error' => 'Failed validation: '], 500);
+                    }
+
+                    return StorageHelper::downloader($file);
+
                }
            }
        }
--- a/app/Http/Controllers/CustomFieldsController.php
+++ b/app/Http/Controllers/CustomFieldsController.php
@@ -109,8 +109,6 @@ class CustomFieldsController extends Controller
            "is_unique" => $request->get("is_unique", 0),
            "display_in_user_view" => $display_in_user_view,
            "auto_add_to_fieldsets" => $request->get("auto_add_to_fieldsets", 0),
-            "show_in_listview" => $request->get("show_in_listview", 0),
-            "show_in_requestable_list" => $request->get("show_in_requestable_list", 0),
            "user_id" => Auth::id()
        ]);

@@ -267,8 +265,6 @@ class CustomFieldsController extends Controller
        $field->is_unique     = $request->get("is_unique", 0);
        $field->display_in_user_view = $display_in_user_view;
        $field->auto_add_to_fieldsets = $request->get("auto_add_to_fieldsets", 0);
-        $field->show_in_listview = $request->get("show_in_listview", 0);
-        $field->show_in_requestable_list = $request->get("show_in_requestable_list", 0);

        if ($request->get('format') == 'CUSTOM REGEX') {
            $field->format = e($request->get('custom_format'));
--- a/app/Http/Controllers/CustomFieldsetsController.php
+++ b/app/Http/Controllers/CustomFieldsetsController.php
@@ -94,7 +94,7 @@ class CustomFieldsetsController extends Controller
        $this->authorize('create', CustomField::class);

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

--- a/app/Http/Controllers/DepartmentsController.php
+++ b/app/Http/Controllers/DepartmentsController.php
@@ -170,8 +170,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->phone = $request->input('phone');
-        $department->fax = $request->input('fax');

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

--- a/app/Http/Controllers/LabelsController.php
+++ b/app/Http/Controllers/LabelsController.php
@@ -1,85 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Models\Asset;
-use App\Models\AssetModel;
-use App\Models\Category;
-use App\Models\Company;
-use App\Models\Labels\Label;
-use App\Models\Location;
-use App\Models\Manufacturer;
-use App\Models\Setting;
-use App\Models\Supplier;
-use App\Models\User;
-use App\View\Label as LabelView;
-use Illuminate\Support\Facades\Storage;
-
-class LabelsController extends Controller
-{
-    /**
-     * Returns the Label view with test data
-     *
-     * @author Grant Le Roux <grant.leroux+snipe-it@gmail.com>
-     * @param  string  $labelName
-     * @return \Illuminate\Contracts\View\View
-     */
-    public function show(string $labelName)
-    {
-        $labelName = str_replace('/', '\\', $labelName);
-        $template = Label::find($labelName);
-
-        $exampleAsset = new Asset();
-
-        $exampleAsset->id = 999999;
-        $exampleAsset->name = 'JEN-867-5309';
-        $exampleAsset->asset_tag = '100001';
-        $exampleAsset->serial = 'SN9876543210';
-        $exampleAsset->asset_eol_date = '2025-01-01';
-        $exampleAsset->order_number = '12345';
-        $exampleAsset->purchase_date = '2023-01-01';
-        $exampleAsset->status_id = 1;
-
-        $exampleAsset->company = new Company([
-            'name' => 'Test Company Limited',
-            'phone' => '1-555-555-5555',
-            'email' => 'company@example.com',
-        ]);
-
-        $exampleAsset->setRelation('assignedTo', new User(['first_name' => 'Luke', 'last_name' => 'Skywalker']));
-        $exampleAsset->defaultLoc = new Location(['name' => 'Building 1', 'phone' => '1-555-555-5555']);
-        $exampleAsset->location = new Location(['name' => 'Building 2', 'phone' => '1-555-555-5555']);
-
-        $exampleAsset->model = new AssetModel();
-        $exampleAsset->model->id = 999999;
-        $exampleAsset->model->name = 'Test Model';
-        $exampleAsset->model->model_number = 'MDL5678';
-        $exampleAsset->model->manufacturer = new Manufacturer();
-        $exampleAsset->model->manufacturer->id = 999999;
-        $exampleAsset->model->manufacturer->name = 'Test Manufacturing Inc.';
-        $exampleAsset->model->manufacturer->support_email = 'support@test.com';
-        $exampleAsset->model->manufacturer->support_phone = '1-555-555-5555';
-        $exampleAsset->model->manufacturer->support_url = 'https://example.com';
-        $exampleAsset->supplier = new Supplier(['name' => 'Test Company Limited']);
-        $exampleAsset->model->category = new Category();
-        $exampleAsset->model->category->id = 999999;
-        $exampleAsset->model->category->name = 'Test Category';
-
-        $settings = Setting::getSettings();
-        if (request()->has('settings')) {
-            $overrides = request()->get('settings');
-            foreach ($overrides as $key => $value) {
-                $settings->$key = $value;
-            }
-        }
-
-        return (new LabelView())
-            ->with('assets', collect([$exampleAsset]))
-            ->with('settings', $settings)
-            ->with('template', $template)
-            ->with('bulkedit', false)
-            ->with('count', 0);
-
-        return redirect()->route('home')->with('error', trans('admin/labels/message.does_not_exist'));
-    }
-}
--- a/app/Http/Controllers/Licenses/LicenseCheckinController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckinController.php
@@ -76,7 +76,7 @@ class LicenseCheckinController extends Controller

        // Declare the rules for the form validation
        $rules = [
-            'notes'   => 'string|nullable',
+            'note'   => 'string|nullable',
        ];

        // Create a new validator instance from our validation rules
@@ -97,11 +97,10 @@ class LicenseCheckinController extends Controller
        // Update the asset data
        $licenseSeat->assigned_to = null;
        $licenseSeat->asset_id = null;
-        $licenseSeat->notes = $request->input('notes');

        // Was the asset updated?
        if ($licenseSeat->save()) {
-            event(new CheckoutableCheckedIn($licenseSeat, $return_to, Auth::user(), $request->input('notes')));
+            event(new CheckoutableCheckedIn($licenseSeat, $return_to, Auth::user(), $request->input('note')));

            if ($backTo == 'user') {
                return redirect()->route('users.show', $return_to->id)->with('success', trans('admin/licenses/message.checkin.success'));
@@ -129,13 +128,6 @@ class LicenseCheckinController extends Controller
        $license = License::findOrFail($licenseId);
        $this->authorize('checkin', $license);

-        if (! $license->reassignable) {
-            // Not allowed to checkin
-            Session::flash('error', 'License not reassignable.');
-
-            return redirect()->back()->withInput();
-        }
-
        $licenseSeatsByUser = LicenseSeat::where('license_id', '=', $licenseId)
            ->whereNotNull('assigned_to')
            ->with('user')
--- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Licenses;
 use App\Events\CheckoutableCheckedOut;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\LicenseCheckoutRequest;
-use App\Models\Accessory;
 use App\Models\Asset;
 use App\Models\License;
 use App\Models\LicenseSeat;
@@ -22,35 +21,23 @@ class LicenseCheckoutController extends Controller
     *
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
-     * @param $id
+     * @param $licenseId
     * @return \Illuminate\Contracts\View\View
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function create($id)
+    public function create($licenseId)
    {
-
-        if ($license = License::find($id)) {
+        // Check that the license is valid
+        if ($license = License::find($licenseId)) {

            $this->authorize('checkout', $license);
-
-            if ($license->category) {
-
-                // Make sure there is at least one available to checkout
-                if ($license->availCount()->count() < 1){
-                    return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.not_enough_seats'));
-                }
-
-                // Return the checkout view
-                return view('licenses/checkout', compact('license'));
+            // If the license is valid, check that there is an available seat
+            if ($license->avail_seats_count < 1) {
+                return redirect()->route('licenses.index')->with('error', 'There are no available seats for this license');
            }
-
-            // Invalid category
-            return redirect()->route('licenses.edit', ['license' => $license->id])
-                ->with('error', trans('general.invalid_item_category_single', ['type' => trans('general.license')]));
-
+            return view('licenses/checkout', compact('license'));
        }

-        // Not found
        return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.not_found'));


@@ -76,7 +63,6 @@ class LicenseCheckoutController extends Controller

        $licenseSeat = $this->findLicenseSeatToCheckout($license, $seatId);
        $licenseSeat->user_id = Auth::id();
-        $licenseSeat->notes = $request->input('notes');
        

        $checkoutMethod = 'checkoutTo'.ucwords(request('checkout_to_type'));
@@ -118,7 +104,7 @@ class LicenseCheckoutController extends Controller
            $licenseSeat->assigned_to = $target->assigned_to;
        }
        if ($licenseSeat->save()) {
-            event(new CheckoutableCheckedOut($licenseSeat, $target, Auth::user(), request('notes')));
+            event(new CheckoutableCheckedOut($licenseSeat, $target, Auth::user(), request('note')));

            return true;
        }
@@ -135,7 +121,7 @@ class LicenseCheckoutController extends Controller
        $licenseSeat->assigned_to = request('assigned_to');

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

            return true;
        }
--- a/app/Http/Controllers/Licenses/LicenseFilesController.php
+++ b/app/Http/Controllers/Licenses/LicenseFilesController.php
@@ -137,7 +137,7 @@ class LicenseFilesController extends Controller
            $this->authorize('view', $license);
            $this->authorize('licenses.files', $license);

-            if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $license->id)->find($fileId)) {
+            if (! $log = Actionlog::find($fileId)) {
                return response('No matching record for that asset/file', 500)
                    ->header('Content-Type', 'text/plain');
            }
@@ -152,19 +152,21 @@ class LicenseFilesController extends Controller
                    ->header('Content-Type', 'text/plain');
            } else {

-                if (request('inline') == 'true') {
-
-                    $headers = [
-                        'Content-Disposition' => 'inline',
-                    ];
-
-                    return Storage::download($file, $log->filename, $headers);
-                }
-
                // We have to override the URL stuff here, since local defaults in Laravel's Flysystem
                // won't work, as they're not accessible via the web
                if (config('filesystems.default') == 'local') { // TODO - is there any way to fix this at the StorageHelper layer?
                    return StorageHelper::downloader($file);
+                } else {
+                    if ($download != 'true') {
+                        \Log::debug('display the file');
+                        if ($contents = file_get_contents(Storage::url($file))) { // TODO - this will fail on private S3 files or large public ones
+                            return Response::make(Storage::url($file)->header('Content-Type', mime_content_type($file)));
+                        }
+
+                        return JsonResponse::create(['error' => 'Failed validation: '], 500);
+                    }
+
+                    return StorageHelper::downloader($file);

                }
            }
--- a/app/Http/Controllers/Licenses/LicensesController.php
+++ b/app/Http/Controllers/Licenses/LicensesController.php
@@ -207,7 +207,7 @@ class LicensesController extends Controller
        if ($license->assigned_seats_count == 0) {
            // Delete the license and the associated license seats
            DB::table('license_seats')
-                ->where('license_id', $license->id)
+                ->where('id', $license->id)
                ->update(['assigned_to' => null, 'asset_id' => null]);

            $licenseSeats = $license->licenseseats();
--- a/app/Http/Controllers/LocationsController.php
+++ b/app/Http/Controllers/LocationsController.php
@@ -79,8 +79,6 @@ class LocationsController extends Controller
        $location->ldap_ou = $request->input('ldap_ou');
        $location->manager_id = $request->input('manager_id');
        $location->user_id = Auth::id();
-        $location->phone = request('phone');
-        $location->fax = request('fax');

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

@@ -141,8 +139,6 @@ class LocationsController extends Controller
        $location->state = $request->input('state');
        $location->country = $request->input('country');
        $location->zip = $request->input('zip');
-        $location->phone = request('phone');
-        $location->fax = request('fax');
        $location->ldap_ou = $request->input('ldap_ou');
        $location->manager_id = $request->input('manager_id');

--- a/app/Http/Controllers/ManufacturersController.php
+++ b/app/Http/Controllers/ManufacturersController.php
@@ -2,12 +2,8 @@

 namespace App\Http\Controllers;

-use App\Helpers\Helper;
 use App\Http\Requests\ImageUploadRequest;
-use App\Models\Actionlog;
-use App\Models\Asset;
 use App\Models\Manufacturer;
-use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
@@ -222,37 +218,22 @@ class ManufacturersController extends Controller
     * @return Redirect
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
-    public function restore($id)
+    public function restore($manufacturers_id)
    {
-        $this->authorize('delete', Manufacturer::class);
+        $this->authorize('create', Manufacturer::class);
+        $manufacturer = Manufacturer::onlyTrashed()->where('id', $manufacturers_id)->first();

-        if ($manufacturer = Manufacturer::withTrashed()->find($id)) {
-
-            if ($manufacturer->deleted_at == '') {
-                return redirect()->back()->with('error', trans('general.not_deleted', ['item_type' => trans('general.manufacturer')]));
-            }
+        if ($manufacturer) {

+            // Not sure why this is necessary - it shouldn't fail validation here, but it fails without this, so....
+            $manufacturer->setValidating(false);
            if ($manufacturer->restore()) {
-                $logaction = new Actionlog();
-                $logaction->item_type = Manufacturer::class;
-                $logaction->item_id = $manufacturer->id;
-                $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = Auth::user()->id;
-                $logaction->logaction('restore');
-
-                // Redirect them to the deleted page if there are more, otherwise the section index
-                $deleted_manufacturers = Manufacturer::onlyTrashed()->count();
-                if ($deleted_manufacturers > 0) {
-                    return redirect()->back()->with('success', trans('admin/manufacturers/message.success.restored'));
-                }
                return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.restore.success'));
            }

-            // Check validation to make sure we're not restoring an asset with the same asset tag (or unique attribute) as an existing asset
-            return redirect()->back()->with('error', trans('general.could_not_restore', ['item_type' => trans('general.manufacturer'), 'error' => $manufacturer->getErrors()->first()]));
+            return redirect()->back()->with('error', 'Could not restore.');
        }

-        return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.does_not_exist'));
-
+        return redirect()->back()->with('error', trans('admin/manufacturers/message.does_not_exist'));
    }
 }
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -134,7 +134,6 @@ class ProfileController extends Controller
        ];

        $validator = \Validator::make($request->all(), $rules);
-
        $validator->after(function ($validator) use ($request, $user) {
            if (! Hash::check($request->input('current_password'), $user->password)) {
                $validator->errors()->add('current_password', trans('validation.custom.hashed_pass'));
@@ -160,14 +159,12 @@ class ProfileController extends Controller
        });

        if (! $validator->fails()) {
-
            $user->password = Hash::make($request->input('password'));
-            // We have to use saveQuietly here because for some reason this method was calling the User Oserver twice :(
-            $user->saveQuietly();
-            
+            $user->save();
+
            // Log the user out of other devices
            Auth::logoutOtherDevices($request->input('password'));
-            return redirect()->route('account')->with('success', trans('passwords.password_change'));
+            return redirect()->route('account.password.index')->with('success', 'Password updated!');

        }
        return redirect()->back()->withInput()->withErrors($validator);
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -23,7 +23,6 @@ use Input;
 use League\Csv\Reader;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use League\Csv\EscapeFormula;
-use App\Http\Requests\CustomAssetReportRequest;


 /**
@@ -247,9 +246,6 @@ class ReportsController extends Controller
                trans('general.action'),
                trans('general.type'),
                trans('general.item'),
-                trans('general.license_serial'),
-                trans('general.model_name'),
-                trans('general.model_no'),
                'To',
                trans('general.notes'),
                'Changed',
@@ -292,9 +288,6 @@ class ReportsController extends Controller
                        $actionlog->present()->actionType(),
                        e($actionlog->itemType()),
                        ($actionlog->itemType() == 'user') ? $actionlog->filename : $item_name,
-                        ($actionlog->item->serial) ? $actionlog->item->serial : null,
-                        ($actionlog->item->model) ? htmlspecialchars($actionlog->item->model->name, ENT_NOQUOTES) : null,
-                        ($actionlog->item->model) ? $actionlog->item->model->model_number : null,
                        $target_name,
                        ($actionlog->note) ? e($actionlog->note) : '',
                        $actionlog->log_meta,
@@ -410,12 +403,11 @@ class ReportsController extends Controller
     * @since [v1.0]
     * @return \Illuminate\Http\Response
     */
-    public function postCustom(CustomAssetReportRequest $request)
+    public function postCustom(Request $request)
    {
        ini_set('max_execution_time', env('REPORT_TIME_LIMIT', 12000)); //12000 seconds = 200 minutes
        $this->authorize('reports.view');

-
        \Debugbar::disable();
        $customfields = CustomField::get();
        $response = new StreamedResponse(function () use ($customfields, $request) {
@@ -509,6 +501,7 @@ class ReportsController extends Controller
                $header[] = trans('general.zip');
            }

+
            if ($request->filled('assigned_to')) {
                $header[] = trans('admin/hardware/table.checkoutto');
                $header[] = trans('general.type');
@@ -534,53 +527,24 @@ class ReportsController extends Controller
                $header[] = trans('admin/users/table.title');
            }

-            if ($request->filled('phone')) {
-                $header[] = trans('admin/users/table.phone');
-            }
-
-            if ($request->filled('user_address')) {
-                $header[] = trans('admin/reports/general.custom_export.user_address');
-            }
-
-            if ($request->filled('user_city')) {
-                $header[] = trans('admin/reports/general.custom_export.user_city');
-            }
-
-            if ($request->filled('user_state')) {
-                $header[] = trans('admin/reports/general.custom_export.user_state');
-            }
-
-            if ($request->filled('user_country')) {
-                $header[] = trans('admin/reports/general.custom_export.user_country');
-            }
-
-            if ($request->filled('user_zip')) {
-                $header[] = trans('admin/reports/general.custom_export.user_zip');
-            }
-
            if ($request->filled('status')) {
                $header[] = trans('general.status');
            }

            if ($request->filled('warranty')) {
-                $header[] = trans('admin/hardware/form.warranty');
-                $header[] = trans('admin/hardware/form.warranty_expires');
+                $header[] = 'Warranty';
+                $header[] = 'Warranty Expires';
            }
-
            if ($request->filled('depreciation')) {
-                $header[] = trans('admin/hardware/table.book_value');
-                $header[] = trans('admin/hardware/table.diff');
-                $header[] = trans('admin/hardware/form.fully_depreciated');
+                $header[] = 'Value';
+                $header[] = 'Diff';
+                $header[] = 'Fully Depreciated';
            }

            if ($request->filled('checkout_date')) {
                $header[] = trans('admin/hardware/table.checkout_date');
            }

-            if ($request->filled('checkin_date')) {
-                $header[] = trans('admin/hardware/table.last_checkin_date');
-            }
-
            if ($request->filled('expected_checkin')) {
                $header[] = trans('admin/hardware/form.expected_checkin');
            }
@@ -626,7 +590,7 @@ class ReportsController extends Controller
            $executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];
            \Log::debug('Added headers: '.$executionTime);

-            $assets = Asset::select('assets.*')->with(
+            $assets = \App\Models\Company::scopeCompanyables(Asset::select('assets.*'))->with(
                'location', 'assetstatus', 'company', 'defaultLoc', 'assignedTo',
                'model.category', 'model.manufacturer', 'supplier');
            
@@ -675,35 +639,18 @@ class ReportsController extends Controller
            }

            if (($request->filled('created_start')) && ($request->filled('created_end'))) {
-                $created_start = \Carbon::parse($request->input('created_start'))->startOfDay();
-                $created_end = \Carbon::parse($request->input('created_end'))->endOfDay();
-
-                $assets->whereBetween('assets.created_at', [$created_start, $created_end]);
+                $assets->whereBetween('assets.created_at', [$request->input('created_start'), $request->input('created_end')]);
            }
            if (($request->filled('checkout_date_start')) && ($request->filled('checkout_date_end'))) {
-                $checkout_start = \Carbon::parse($request->input('checkout_date_start'))->startOfDay();
-                $checkout_end = \Carbon::parse($request->input('checkout_date_end'))->endOfDay();
-
-                $assets->whereBetween('assets.last_checkout', [$checkout_start, $checkout_end]);
-            }
-
-            if (($request->filled('checkin_date_start'))) {
-                    $assets->whereBetween('last_checkin', [
-                        Carbon::parse($request->input('checkin_date_start'))->startOfDay(),
-                        // use today's date is `checkin_date_end` is not provided
-                        Carbon::parse($request->input('checkin_date_end', now()))->endOfDay(),
-                    ]);
+                $assets->whereBetween('assets.last_checkout', [$request->input('checkout_date_start'), $request->input('checkout_date_end')]);
            }

            if (($request->filled('expected_checkin_start')) && ($request->filled('expected_checkin_end'))) {
-                    $assets->whereBetween('assets.expected_checkin', [$request->input('expected_checkin_start'), $request->input('expected_checkin_end')]);
+                $assets->whereBetween('assets.expected_checkin', [$request->input('expected_checkin_start'), $request->input('expected_checkin_end')]);
            }

            if (($request->filled('last_audit_start')) && ($request->filled('last_audit_end'))) {
-                    $last_audit_start = \Carbon::parse($request->input('last_audit_start'))->startOfDay();
-                    $last_audit_end = \Carbon::parse($request->input('last_audit_end'))->endOfDay();
-
-                    $assets->whereBetween('assets.last_audit_date', [$last_audit_start, $last_audit_end]);
+                $assets->whereBetween('assets.last_audit_date', [$request->input('last_audit_start'), $request->input('last_audit_end')]);
            }

            if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) {
@@ -774,7 +721,7 @@ class ReportsController extends Controller
                    }

                    if ($request->filled('eol')) {
-                            $row[] = ($asset->asset_eol_date) ? $asset->asset_eol_date : '';
+                        $row[] = ($asset->purchase_date != '') ? $asset->present()->eol_date() : '';
                    }

                    if ($request->filled('order')) {
@@ -858,54 +805,6 @@ class ReportsController extends Controller
                        }
                    }

-                    if ($request->filled('phone')) {
-                        if ($asset->checkedOutToUser()) {
-                            $row[] = ($asset->assignedto) ? $asset->assignedto->phone : '';
-                        } else {
-                            $row[] = ''; // Empty string if unassigned
-                        }
-                    }
-
-                    if ($request->filled('user_address')) {
-                        if ($asset->checkedOutToUser()) {
-                            $row[] = ($asset->assignedto) ? $asset->assignedto->address : '';
-                        } else {
-                            $row[] = ''; // Empty string if unassigned
-                        }
-                    }
-
-                    if ($request->filled('user_city')) {
-                        if ($asset->checkedOutToUser()) {
-                            $row[] = ($asset->assignedto) ? $asset->assignedto->city : '';
-                        } else {
-                            $row[] = ''; // Empty string if unassigned
-                        }
-                    }
-
-                    if ($request->filled('user_state')) {
-                        if ($asset->checkedOutToUser()) {
-                            $row[] = ($asset->assignedto) ? $asset->assignedto->state : '';
-                        } else {
-                            $row[] = ''; // Empty string if unassigned
-                        }
-                    }
-
-                    if ($request->filled('user_country')) {
-                        if ($asset->checkedOutToUser()) {
-                            $row[] = ($asset->assignedto) ? $asset->assignedto->country : '';
-                        } else {
-                            $row[] = ''; // Empty string if unassigned
-                        }
-                    }
-
-                    if ($request->filled('user_zip')) {
-                        if ($asset->checkedOutToUser()) {
-                            $row[] = ($asset->assignedto) ? $asset->assignedto->zip : '';
-                        } else {
-                            $row[] = ''; // Empty string if unassigned
-                        }
-                    }
-
                    if ($request->filled('status')) {
                        $row[] = ($asset->assetstatus) ? $asset->assetstatus->name.' ('.$asset->present()->statusMeta.')' : '';
                    }
@@ -927,12 +826,6 @@ class ReportsController extends Controller
                        $row[] = ($asset->last_checkout) ? $asset->last_checkout : '';
                    }

-                    if ($request->filled('checkin_date')) {
-                        $row[] = ($asset->last_checkin)
-                            ? Carbon::parse($asset->last_checkin)->format('Y-m-d')
-                            : '';
-                    }
-
                    if ($request->filled('expected_checkin')) {
                        $row[] = ($asset->expected_checkin) ? $asset->expected_checkin : '';
                    }
@@ -1101,12 +994,7 @@ class ReportsController extends Controller

        $assetsForReport = $acceptances
            ->filter(function ($acceptance) {
-                $acceptance_checkoutable_flag = false;
-                if ($acceptance->checkoutable){
-                    $acceptance_checkoutable_flag = $acceptance->checkoutable->checkedOutToUser();
-                }
-                
-                return $acceptance->checkoutable_type == 'App\Models\Asset' && $acceptance_checkoutable_flag;
+                return $acceptance->checkoutable_type == 'App\Models\Asset';
            })
            ->map(function($acceptance) {
                return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];
@@ -1123,34 +1011,27 @@ class ReportsController extends Controller
     * @throws \Illuminate\Auth\Access\AuthorizationException
     * @version v1.0
     */
-    public function sentAssetAcceptanceReminder(Request $request)
+    public function sentAssetAcceptanceReminder($acceptanceId = null)
    {
        $this->authorize('reports.view');

-        if (!$acceptance = CheckoutAcceptance::pending()->find($request->input('acceptance_id'))) {
-            \Log::debug('No pending acceptances');
+        if (!$acceptance = CheckoutAcceptance::pending()->find($acceptanceId)) {
            // Redirect to the unaccepted assets report page with error
            return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.bad_data'));
        }
-
        $assetItem = $acceptance->checkoutable;

-        \Log::debug(print_r($assetItem, true));
-
        if (is_null($acceptance->created_at)){
-            \Log::debug('No acceptance created_at');
            return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.bad_data'));
        } else {
            $logItem_res = $assetItem->checkouts()->where('created_at', '=', $acceptance->created_at)->get();
-
            if ($logItem_res->isEmpty()){
-                \Log::debug('Acceptance date mismatch');
                return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.bad_data'));
            }
            $logItem = $logItem_res[0];
        }

-        if (!$assetItem->assignedTo->locale){
+        if(!$assetItem->assignedTo->locale){
            Notification::locale(Setting::getSettings()->locale)->send(
                $assetItem->assignedTo,
                new CheckoutAssetNotification($assetItem, $assetItem->assignedTo, $logItem->user, $acceptance, $logItem->note)
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -7,7 +7,6 @@ use App\Helpers\StorageHelper;
 use App\Http\Requests\ImageUploadRequest;
 use App\Http\Requests\SettingsSamlRequest;
 use App\Http\Requests\SetupUserRequest;
-use App\Models\CustomField;
 use App\Models\Group;
 use App\Models\Setting;
 use App\Models\Asset;
@@ -27,7 +26,7 @@ use Response;
 use App\Http\Requests\SlackSettingsRequest;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Artisan;
-use Illuminate\Support\Facades\Validator;
+use Validator;

 /**
 * This controller handles all actions related to Settings for
@@ -591,7 +590,6 @@ class SettingsController extends Controller
        $setting->date_display_format = $request->input('date_display_format');
        $setting->time_display_format = $request->input('time_display_format');
        $setting->digit_separator = $request->input('digit_separator');
-        $setting->name_display_format = $request->input('name_display_format');

        if ($setting->save()) {
            return redirect()->route('settings.index')
@@ -810,10 +808,9 @@ class SettingsController extends Controller
     */
    public function getLabels()
    {
-        return view('settings.labels', [
-            'setting' => Setting::getSettings(),
-            'customFields' => CustomField::all(),
-        ]);
+        $setting = Setting::getSettings();
+
+        return view('settings.labels', compact('setting'));
    }

    /**
@@ -830,14 +827,6 @@ class SettingsController extends Controller
        if (is_null($setting = Setting::getSettings())) {
            return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
        }
-        $setting->label2_enable = $request->input('label2_enable');
-        $setting->label2_template = $request->input('label2_template');
-        $setting->label2_title = $request->input('label2_title');
-        $setting->label2_asset_logo = $request->input('label2_asset_logo');
-        $setting->label2_1d_type = $request->input('label2_1d_type');
-        $setting->label2_2d_type = $request->input('label2_2d_type');
-        $setting->label2_2d_target = $request->input('label2_2d_target');
-        $setting->label2_fields = $request->input('label2_fields');
        $setting->labels_per_page = $request->input('labels_per_page');
        $setting->labels_width = $request->input('labels_width');
        $setting->labels_height = $request->input('labels_height');
@@ -886,7 +875,7 @@ class SettingsController extends Controller
        }

        if ($setting->save()) {
-            return redirect()->route('settings.labels.index')
+            return redirect()->route('settings.index')
                ->with('success', trans('admin/settings/message.update.success'));
        }

@@ -1250,11 +1239,13 @@ class SettingsController extends Controller
            if (!$request->hasFile('file')) {
                return redirect()->route('settings.backups.index')->with('error', 'No file uploaded');
            } else {
-
                $max_file_size = Helper::file_upload_max_size();
-                $validator = Validator::make($request->all(), [
+
+                $rules = [
                    'file' => 'required|mimes:zip|max:'.$max_file_size,
-                ]);
+                ];
+
+                $validator = \Validator::make($request->all(), $rules);

                if ($validator->passes()) {

@@ -1265,7 +1256,7 @@ class SettingsController extends Controller
                        return redirect()->route('settings.backups.index')->with('success', 'File uploaded');
                }

-                return redirect()->route('settings.backups.index')->withErrors($validator);
+                return redirect()->route('settings.backups.index')->withErrors($request->getErrors());

            }

--- a/app/Http/Controllers/Users/BulkUsersController.php
+++ b/app/Http/Controllers/Users/BulkUsersController.php
@@ -125,26 +125,10 @@ class BulkUsersController extends Controller
            ];
        }

-        /**
-         * Check to see if the user wants to actually blank out the values vs skip them
-         */
        if ($request->input('null_location_id')=='1') {
            $this->update_array['location_id'] = null;
        }

-        if ($request->input('null_department_id')=='1') {
-            $this->update_array['department_id'] = null;
-        }
-
-        if ($request->input('null_manager_id')=='1') {
-            $this->update_array['manager_id'] = null;
-        }
-
-        if ($request->input('null_company_id')=='1') {
-            $this->update_array['company_id'] = null;
-        }
-
-        
        if (! $manager_conflict) {
            $this->conditionallyAddItem('manager_id');
        }
--- a/app/Http/Controllers/Users/LDAPImportController.php
+++ b/app/Http/Controllers/Users/LDAPImportController.php
@@ -49,19 +49,15 @@ class LDAPImportController extends Controller
    {
        $this->authorize('update', User::class);
        // Call Artisan LDAP import command.
-
-        Artisan::call('snipeit:ldap-sync', ['--location_id' => $request->input('location_id'), '--json_summary' => true]);
+        $location_id = $request->input('location_id');
+        Artisan::call('snipeit:ldap-sync', ['--location_id' => $location_id, '--json_summary' => true]);

        // Collect and parse JSON summary.
        $ldap_results_json = Artisan::output();
        $ldap_results = json_decode($ldap_results_json, true);
-        if (!$ldap_results) {
-            return redirect()->back()->withInput()->with('error', trans('general.no_results'));
-        }

        // Direct user to appropriate status page.
        if ($ldap_results['error']) {
-
            return redirect()->back()->withInput()->with('error', $ldap_results['error_message']);
        }

--- a/app/Http/Controllers/Users/UserFilesController.php
+++ b/app/Http/Controllers/Users/UserFilesController.php
@@ -2,7 +2,6 @@

 namespace App\Http\Controllers\Users;

-use App\Helpers\StorageHelper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\AssetFileRequest;
 use App\Models\Actionlog;
@@ -136,36 +135,22 @@ class UserFilesController extends Controller
     */
    public function show($userId = null, $fileId = null)
    {
-
-        if (empty($fileId)) {
-            return redirect()->route('users.show')->with('error', 'Invalid file request');
-        }
-
        $user = User::find($userId);

        // the license is valid
        if (isset($user->id)) {
-
            $this->authorize('view', $user);

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

-                // Display the file inline
-                if (request('inline') == 'true') {
-                    $headers = [
-                        'Content-Disposition' => 'inline',
-                    ];
-                    return Storage::download('private_uploads/users/'.$log->filename, $log->filename, $headers);
-                }
-
-                return Storage::download('private_uploads/users/'.$log->filename);
-            }
-
-            return redirect()->route('users.index')->with('error',  trans('admin/users/message.log_record_not_found'));
+            return Response::download($file); //FIXME this doesn't use the new StorageHelper yet, but it's complicated...
        }
+        // Prepare the error message
+        $error = trans('admin/users/message.user_not_found', ['id' => $userId]);

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

 }
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -7,10 +7,10 @@ use App\Http\Controllers\Controller;
 use App\Http\Controllers\UserNotFoundException;
 use App\Http\Requests\ImageUploadRequest;
 use App\Http\Requests\SaveUserRequest;
-use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\Company;
 use App\Models\Group;
+use App\Models\Ldap;
 use App\Models\Setting;
 use App\Models\User;
 use App\Notifications\WelcomeNotification;
@@ -385,35 +385,18 @@ class UsersController extends Controller
     */
    public function getRestore($id = null)
    {
-        if ($user = User::withTrashed()->find($id)) {
-            $this->authorize('delete', $user);
-
-            if ($user->deleted_at == '') {
-                return redirect()->back()->with('error', trans('general.not_deleted', ['item_type' => trans('general.user')]));
-            }
-
-            if ($user->restore()) {
-                $logaction = new Actionlog();
-                $logaction->item_type = User::class;
-                $logaction->item_id = $user->id;
-                $logaction->created_at = date('Y-m-d H:i:s');
-                $logaction->user_id = Auth::user()->id;
-                $logaction->logaction('restore');
-
-                // Redirect them to the deleted page if there are more, otherwise the section index
-                $deleted_users = User::onlyTrashed()->count();
-                if ($deleted_users > 0) {
-                    return redirect()->back()->with('success', trans('admin/users/message.success.restored'));
-                }
-                return redirect()->route('users.index')->with('success', trans('admin/users/message.success.restored'));
-
-            }
-
-            // Check validation to make sure we're not restoring a user with the same username as an existing user
-            return redirect()->back()->with('error', trans('general.could_not_restore', ['item_type' => trans('general.user'), 'error' => $user->getErrors()->first()]));
+        $this->authorize('update', User::class);
+        // Get user information
+        if (! User::onlyTrashed()->find($id)) {
+            return redirect()->route('users.index')->with('error', trans('admin/users/messages.user_not_found'));
        }

-        return redirect()->route('users.index')->with('error', trans('admin/users/message.does_not_exist'));
+        // Restore the user
+        if (User::withTrashed()->where('id', $id)->restore()) {
+            return redirect()->route('users.index')->with('success', trans('admin/users/message.success.restored'));
+        }
+
+        return redirect()->route('users.index')->with('error', 'User could not be restored.');
    }

    /**
--- a/app/Http/Livewire/CategoryEditForm.php
+++ b/app/Http/Livewire/CategoryEditForm.php
@@ -1,67 +0,0 @@
-<?php
-
-namespace App\Http\Livewire;
-
-use Livewire\Component;
-
-class CategoryEditForm extends Component
-{
-    public $defaultEulaText;
-
-    public $eulaText;
-
-    public $originalSendCheckInEmailValue;
-
-    public $requireAcceptance;
-
-    public $sendCheckInEmail;
-
-    public $useDefaultEula;
-
-    public function mount()
-    {
-        $this->originalSendCheckInEmailValue = $this->sendCheckInEmail;
-
-        if ($this->eulaText || $this->useDefaultEula) {
-            $this->sendCheckInEmail = 1;
-        }
-    }
-
-    public function render()
-    {
-        return view('livewire.category-edit-form');
-    }
-
-    public function updated($property, $value)
-    {
-        if (! in_array($property, ['eulaText', 'useDefaultEula'])) {
-            return;
-        }
-
-        $this->sendCheckInEmail = $this->eulaText || $this->useDefaultEula ? 1 : $this->originalSendCheckInEmailValue;
-    }
-
-    public function getShouldDisplayEmailMessageProperty(): bool
-    {
-        return $this->eulaText || $this->useDefaultEula;
-    }
-
-    public function getEmailMessageProperty(): string
-    {
-        if ($this->useDefaultEula) {
-            return trans('admin/categories/general.email_will_be_sent_due_to_global_eula');
-        }
-
-        return trans('admin/categories/general.email_will_be_sent_due_to_category_eula');
-    }
-
-    public function getEulaTextDisabledProperty()
-    {
-        return (bool)$this->useDefaultEula;
-    }
-
-    public function getSendCheckInEmailDisabledProperty()
-    {
-        return $this->eulaText || $this->useDefaultEula;
-    }
-}
--- a/app/Http/Livewire/Importer.php
+++ b/app/Http/Livewire/Importer.php
@@ -215,7 +215,6 @@ class Importer extends Component
            'manufacturer' => trans('general.manufacturer'),
            'order_number' => trans('general.order_number'),
            'image' => trans('general.importer.image_filename'),
-            'asset_eol_date' => trans('admin/hardware/form.eol_date'),
            /**
             * Checkout fields:
             * Assets can be checked out to other assets, people, or locations, but we currently
@@ -275,7 +274,6 @@ class Importer extends Component
            'license_email' => trans('admin/licenses/form.to_email'),
            'license_name' => trans('admin/licenses/form.to_name'),
            'purchase_order' => trans('admin/licenses/form.purchase_order'),
-            'order_number' => trans('general.order_number'),
            'reassignable' => trans('admin/licenses/form.reassignable'),
            'seats' => trans('admin/licenses/form.seats'),
            'notes' => trans('general.notes'),
@@ -286,9 +284,6 @@ class Importer extends Component
            'maintained' => trans('admin/licenses/form.maintained'),
            'checkout_class' => trans('general.importer.checkout_type'),
            'serial' => trans('general.license_serial'),
-            'email' => trans('general.importer.checked_out_to_email'),
-            'username' => trans('general.importer.checked_out_to_username'),
-            'manufacturer' => trans('general.manufacturer'),
        ];

        $this->users_fields  = [
@@ -318,7 +313,7 @@ class Importer extends Component
            'gravatar' => trans('general.importer.gravatar'),
            'start_date'    => trans('general.start_date'),
            'end_date'   => trans('general.end_date'),
-            'employee_num'   => trans('general.employee_number'),
+            'employee_number'   => trans('general.employee_number'),
        ];

        $this->locations_fields  = [
@@ -485,17 +480,8 @@ class Importer extends Component

    public function selectFile($id)
    {
-        $this->clearMessage();

        $this->activeFile = Import::find($id);
-
-        if (!$this->activeFile) {
-            $this->message = trans('admin/hardware/message.import.file_missing');
-            $this->message_type = 'danger';
-
-            return;
-        }
-
        $this->field_map = null;
        foreach($this->activeFile->header_row as $element) {
            if(isset($this->activeFile->field_map[$element])) {
@@ -530,12 +516,6 @@ class Importer extends Component
        }
    }

-    public function clearMessage()
-    {
-        $this->message = null;
-        $this->message_type = null;
-    }
-
    public function render()
    {
        $this->files = Import::orderBy('id','desc')->get(); //HACK - slows down renders.
--- a/app/Http/Livewire/SlackSettingsForm.php
+++ b/app/Http/Livewire/SlackSettingsForm.php
@@ -12,7 +12,7 @@ class SlackSettingsForm extends Component
    public $webhook_endpoint;
    public $webhook_channel;
    public $webhook_botname;
-    public $isDisabled ='disabled' ;
+    public $isDisabled ='' ;
    public $webhook_name;
    public $webhook_link;
    public $webhook_placeholder;
@@ -22,17 +22,11 @@ class SlackSettingsForm extends Component

    public Setting $setting;

-    public $webhook_endpoint_rules;
-
-
    protected $rules = [
-        'webhook_endpoint'                      => 'required_with:webhook_channel|starts_with:http://,https://,ftp://,irc://,https://hooks.slack.com/services/|url|nullable',
+        'webhook_endpoint'                      => 'url|required_with:webhook_channel|starts_with:https://hooks.slack.com/services|nullable',
        'webhook_channel'                       => 'required_with:webhook_endpoint|starts_with:#|nullable',
        'webhook_botname'                       => 'string|nullable',
    ];
-    public $messages = [
-        'webhook_endpoint.starts_with'          => 'your webhook endpoint should begin with http://, https:// or other protocol.',
-    ];

    public function mount() {
        $this->webhook_text= [
@@ -61,7 +55,9 @@ class SlackSettingsForm extends Component
        $this->webhook_botname = $this->setting->webhook_botname;
        $this->webhook_options = $this->setting->webhook_selected;

-
+        if($this->setting->webhook_selected == 'general'){
+            $this->isDisabled='';
+        }
        if($this->setting->webhook_endpoint != null && $this->setting->webhook_channel != null){
            $this->isDisabled= '';
        }
@@ -69,8 +65,9 @@ class SlackSettingsForm extends Component
    }
    public function updated($field) {

+        if($this->webhook_selected != 'general') {
            $this->validateOnly($field, $this->rules);
-
+        }
    }

    public function updatedWebhookSelected() {
@@ -85,6 +82,7 @@ class SlackSettingsForm extends Component
    }

    private function isButtonDisabled() {
+        if($this->webhook_selected == 'slack') {
            if (empty($this->webhook_endpoint)) {
                $this->isDisabled = 'disabled';
                $this->save_button = trans('admin/settings/general.webhook_presave');
@@ -93,6 +91,8 @@ class SlackSettingsForm extends Component
                $this->isDisabled = 'disabled';
                $this->save_button = trans('admin/settings/general.webhook_presave');
            }
+        }
+
    }

    public function render()
@@ -108,7 +108,6 @@ class SlackSettingsForm extends Component
            'defaults' => [
                'exceptions' => false,
            ],
-            'allow_redirects' => false,
        ]);

        $payload = json_encode(
@@ -117,23 +116,18 @@ class SlackSettingsForm extends Component
                'text'       => trans('general.webhook_test_msg', ['app' => $this->webhook_name]),
                'username'    => e($this->webhook_botname),
                'icon_emoji' => ':heart:',
-
            ]);

        try {
-            $test = $webhook->post($this->webhook_endpoint, ['body' => $payload]);

-            if(($test->getStatusCode() == 302)||($test->getStatusCode() == 301)){
-                return session()->flash('error' , trans('admin/settings/message.webhook.error_redirect', ['endpoint' => $this->webhook_endpoint]));
-            }
+            $webhook->post($this->webhook_endpoint, ['body' => $payload]);
            $this->isDisabled='';
            $this->save_button = trans('general.save');
-            return session()->flash('success' , trans('admin/settings/message.webhook.success', ['webhook_name' => $this->webhook_name]));
+            return session()->flash('success' , 'Your '.$this->webhook_name.' Integration works!');

        } catch (\Exception $e) {

-            $this->isDisabled='disabled';
-            $this->save_button = trans('admin/settings/general.webhook_presave');
+            $this->isDisabled= 'disabled';
            return session()->flash('error' , trans('admin/settings/message.webhook.error', ['error_message' => $e->getMessage(), 'app' => $this->webhook_name]));
        }

@@ -164,7 +158,9 @@ class SlackSettingsForm extends Component
        if (Helper::isDemoMode()) {
            session()->flash('error',trans('general.feature_disabled'));
        } else {
-            $this->validate($this->rules);
+            if ($this->webhook_selected != 'general') {
+                $this->validate($this->rules);
+            }

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

--- a/app/Http/Requests/StoreAssetRequest.php
+++ b/app/Http/Requests/StoreAssetRequest.php
@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use App\Models\Asset;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Gate;
-
-class StoreAssetRequest extends ImageUploadRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize(): bool
-    {
-        return Gate::allows('create', new Asset);
-    }
-
-    public function prepareForValidation(): void
-    {
-        //
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules(): array
-    {
-        $rules = array_merge(
-            (new Asset)->getRules(),
-            parent::rules(),
-        );
-
-        return $rules;
-    }
-}
--- a/app/Http/Traits/UniqueSerialTrait.php
+++ b/app/Http/Traits/UniqueSerialTrait.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Traits;
+
+use App\Models\Setting;
+
+trait UniqueSerialTrait
+{
+    /**
+     * Prepare a unique_ids rule, adding a model identifier if required.
+     *
+     * @param array  $parameters
+     * @param string $field
+     *
+     * @return string
+     */
+    protected function prepareUniqueSerialRule($parameters, $field)
+    {
+        if ($settings = Setting::getSettings()) {
+            if ($settings->unique_serial == '1') {
+                return 'unique_undeleted:'.$this->table.','.$this->getKey();
+            }
+        }
+    }
+}
--- a/app/Http/Transformers/AccessoriesTransformer.php
+++ b/app/Http/Transformers/AccessoriesTransformer.php
@@ -32,7 +32,7 @@ class AccessoriesTransformer
            'model_number' => ($accessory->model_number) ? e($accessory->model_number) : null,
            'category' => ($accessory->category) ? ['id' => $accessory->category->id, 'name'=> e($accessory->category->name)] : null,
            'location' => ($accessory->location) ? ['id' => $accessory->location->id, 'name'=> e($accessory->location->name)] : null,
-            'notes' => ($accessory->notes) ? Helper::parseEscapedMarkedownInline($accessory->notes) : null,
+            'notes' => ($accessory->notes) ? Helper::parseEscapedMarkedown($accessory->notes) : null,
            'qty' => ($accessory->qty) ? (int) $accessory->qty : null,
            'purchase_date' => ($accessory->purchase_date) ? Helper::getFormattedDateObject($accessory->purchase_date, 'date') : null,
            'purchase_cost' => Helper::formatCurrencyOutput($accessory->purchase_cost),
--- a/app/Http/Transformers/ActionlogsTransformer.php
+++ b/app/Http/Transformers/ActionlogsTransformer.php
@@ -3,17 +3,8 @@ namespace App\Http\Transformers;

 use App\Helpers\Helper;
 use App\Models\Actionlog;
-use App\Models\Asset;
-use App\Models\CustomField;
 use App\Models\Setting;
-use App\Models\Company;
-use App\Models\Supplier;
-use App\Models\Location;
-use App\Models\AssetModel;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Contracts\Encryption\DecryptException;
-use Illuminate\Support\Facades\Crypt;
-use Illuminate\Support\Facades\Gate;

 class ActionlogsTransformer
 {
@@ -47,80 +38,21 @@ class ActionlogsTransformer
    public function transformActionlog (Actionlog $actionlog, $settings = null)
    {
        $icon = $actionlog->present()->icon();
-        $custom_fields = CustomField::all();
-
        if ($actionlog->filename!='') {
-            $icon =  Helper::filetype_icon($actionlog->filename);
+            $icon =  e(\App\Helpers\Helper::filetype_icon($actionlog->filename));
        }

        // This is necessary since we can't escape special characters within a JSON object
        if (($actionlog->log_meta) && ($actionlog->log_meta!='')) {
            $meta_array = json_decode($actionlog->log_meta);

-            $clean_meta = [];
-
            if ($meta_array) {
-
                foreach ($meta_array as $fieldname => $fieldata) {
-
                    $clean_meta[$fieldname]['old'] = $this->clean_field($fieldata->old);
                    $clean_meta[$fieldname]['new'] = $this->clean_field($fieldata->new);
-
-                    // this is a custom field
-                    if (str_starts_with($fieldname, '_snipeit_')) {
-                        
-                        foreach ($custom_fields as $custom_field) {
-
-                            if ($custom_field->db_column == $fieldname) {
-
-                                if ($custom_field->field_encrypted == '1')  {
-
-                                    // Unset these fields. We need to decrypt them, since even if the decrypted value
-                                    // didn't change, their value in the DB will, so we have to compare the unencrypted version
-                                    // to see if the values actually did change
-                                    unset($clean_meta[$fieldname]);
-                                    unset($clean_meta[$fieldname]);
-
-                                    $enc_old = '';
-                                    $enc_new = '';
-
-                                    try  {
-                                        $enc_old = \Crypt::decryptString($this->clean_field($fieldata->old));
-                                    } catch (\Exception $e) {
-                                        \Log::debug('Could not decrypt field - maybe the key changed?');
-                                    }
-
-                                    try {
-                                        $enc_new = \Crypt::decryptString($this->clean_field($fieldata->new));
-                                    } catch (\Exception $e) {
-                                        \Log::debug('Could not decrypt field - maybe the key changed?');
-                                    }
-
-                                    if ($enc_old != $enc_new) {
-                                        \Log::debug('custom fields do not match');
-                                        $clean_meta[$fieldname]['old'] = "************";
-                                        $clean_meta[$fieldname]['new'] = "************";
-
-                                        // Display the changes if the user is an admin or superadmin
-                                        if (Gate::allows('admin')) {
-                                            $clean_meta[$fieldname]['old'] = ($enc_old) ? unserialize($enc_old): '';
-                                            $clean_meta[$fieldname]['new'] = ($enc_new) ? unserialize($enc_new): '';
-                                        }
-
-                                    }
-
-
-                                }
-
-                            }
-
-                        }
-                    }
-
                }

            }
-            $clean_meta= $this->changedInfo($clean_meta);
        }

        $file_url = '';
@@ -178,15 +110,14 @@ class ActionlogsTransformer
                'type' => e($actionlog->targetType()),
            ] : null,

-            'note'          => ($actionlog->note) ? Helper::parseEscapedMarkedownInline($actionlog->note): null,
+            'note'          => ($actionlog->note) ? Helper::parseEscapedMarkedown($actionlog->note): null,
            'signature_file'   => ($actionlog->accept_signature) ? route('log.signature.view', ['filename' => $actionlog->accept_signature ]) : null,
            'log_meta'          => ((isset($clean_meta)) && (is_array($clean_meta))) ? $clean_meta: null,
            'action_date'   => ($actionlog->action_date) ? Helper::getFormattedDateObject($actionlog->action_date, 'datetime'): Helper::getFormattedDateObject($actionlog->created_at, 'datetime'),
        ];
+        //\Log::info("Clean Meta is: ".print_r($clean_meta,true));

-//        \Log::info("Clean Meta is: ".print_r($clean_meta,true));
        //dd($array);
-
        return $array;
    }

@@ -201,98 +132,6 @@ class ActionlogsTransformer
        }
        return (new DatatablesTransformer)->transformDatatables($array, $total);
    }
-    /**
-     * This takes the ids of the changed attributes and returns the names instead for the history view of an Asset
-     *
-     * @param  array $clean_meta
-     * @return array
-     */
-
-    public function changedInfo(array $clean_meta)
-    {   $location = Location::withTrashed()->get();
-        $supplier = Supplier::withTrashed()->get();
-        $model = AssetModel::withTrashed()->get();
-        $company = Company::get();
-
-
-        if(array_key_exists('rtd_location_id',$clean_meta)) {
-
-            $oldRtd = $location->find($clean_meta['rtd_location_id']['old']);
-            $oldRtdName = $oldRtd ? e($oldRtd->name) : trans('general.deleted');
-
-            $newRtd = $location->find($clean_meta['rtd_location_id']['new']);
-            $newRtdName = $newRtd ? e($newRtd->name) : trans('general.deleted');
-
-            $clean_meta['rtd_location_id']['old'] = $clean_meta['rtd_location_id']['old'] ? "[id: ".$clean_meta['rtd_location_id']['old']."] ". $oldRtdName : '';
-            $clean_meta['rtd_location_id']['new'] = $clean_meta['rtd_location_id']['new'] ? "[id: ".$clean_meta['rtd_location_id']['new']."] ". $newRtdName : '';
-            $clean_meta['Default Location'] = $clean_meta['rtd_location_id'];
-            unset($clean_meta['rtd_location_id']);
-        }
-
-
-        if (array_key_exists('location_id', $clean_meta)) {
-
-            $oldLocation = $location->find($clean_meta['location_id']['old']);
-            $oldLocationName = $oldLocation ? e($oldLocation->name) : trans('general.deleted');
-
-            $newLocation = $location->find($clean_meta['location_id']['new']);
-            $newLocationName = $newLocation ? e($newLocation->name) : trans('general.deleted');
-
-
-            $clean_meta['location_id']['old'] = $clean_meta['location_id']['old'] ? "[id: ".$clean_meta['location_id']['old']."] ". $oldLocationName : '';
-            $clean_meta['location_id']['new'] = $clean_meta['location_id']['new'] ? "[id: ".$clean_meta['location_id']['new']."] ". $newLocationName : '';
-            $clean_meta['Current Location'] = $clean_meta['location_id'];
-            unset($clean_meta['location_id']);
-        }
-
-        if(array_key_exists('model_id', $clean_meta)) {
-
-            $oldModel = $model->find($clean_meta['model_id']['old']);
-            $oldModelName = $oldModel ? e($oldModel->name) : trans('admin/models/message.deleted');
-
-            $newModel = $model->find($clean_meta['model_id']['new']);
-            $newModelName = $newModel ? e($newModel->name) : trans('admin/models/message.deleted');
-
-            $clean_meta['model_id']['old'] = "[id: ".$clean_meta['model_id']['old']."] ".$oldModelName;
-            $clean_meta['model_id']['new'] = "[id: ".$clean_meta['model_id']['new']."] ".$newModelName; /** model is required at asset creation */
-
-            $clean_meta['Model'] = $clean_meta['model_id'];
-            unset($clean_meta['model_id']);
-        }
-        if(array_key_exists('company_id', $clean_meta)) {
-
-            $oldCompany = $company->find($clean_meta['company_id']['old']);
-            $oldCompanyName = $oldCompany ? e($oldCompany->name) : trans('admin/company/message.deleted');
-
-            $newCompany = $company->find($clean_meta['company_id']['new']);
-            $newCompanyName = $newCompany ? e($newCompany->name) : trans('admin/company/message.deleted');
-
-            $clean_meta['company_id']['old'] = $clean_meta['company_id']['old'] ? "[id: ".$clean_meta['company_id']['old']."] ". $oldCompanyName : trans('general.unassigned');
-            $clean_meta['company_id']['new'] = $clean_meta['company_id']['new'] ? "[id: ".$clean_meta['company_id']['new']."] ". $newCompanyName : trans('general.unassigned');
-            $clean_meta['Company'] = $clean_meta['company_id'];
-            unset($clean_meta['company_id']);
-        }
-        if(array_key_exists('supplier_id', $clean_meta)) {
-
-            $oldSupplier = $supplier->find($clean_meta['supplier_id']['old']);
-            $oldSupplierName = $oldSupplier ? e($oldSupplier->name) : trans('admin/suppliers/message.deleted');
-
-            $newSupplier = $supplier->find($clean_meta['supplier_id']['new']);
-            $newSupplierName = $newSupplier ? e($newSupplier->name) : trans('admin/suppliers/message.deleted');
-
-            $clean_meta['supplier_id']['old'] = $clean_meta['supplier_id']['old'] ? "[id: ".$clean_meta['supplier_id']['old']."] ". $oldSupplierName : trans('general.unassigned');
-            $clean_meta['supplier_id']['new'] = $clean_meta['supplier_id']['new'] ? "[id: ".$clean_meta['supplier_id']['new']."] ". $newSupplierName : trans('general.unassigned');
-            $clean_meta['Supplier'] = $clean_meta['supplier_id'];
-            unset($clean_meta['supplier_id']);
-        }
-        if(array_key_exists('asset_eol_date', $clean_meta)) {
-            $clean_meta['EOL date'] = $clean_meta['asset_eol_date'];
-            unset($clean_meta['asset_eol_date']);
-        }
-
-        return $clean_meta;
-
-    }



--- a/app/Http/Transformers/AssetMaintenancesTransformer.php
+++ b/app/Http/Transformers/AssetMaintenancesTransformer.php
@@ -49,7 +49,7 @@ class AssetMaintenancesTransformer
                'id' => (int) $assetmaintenance->asset->defaultLoc->id,
                'name'=> e($assetmaintenance->asset->defaultLoc->name),
            ] : null,
-            'notes'         => ($assetmaintenance->notes) ? Helper::parseEscapedMarkedownInline($assetmaintenance->notes) : null,
+            'notes'         => ($assetmaintenance->notes) ? Helper::parseEscapedMarkedown($assetmaintenance->notes) : null,
            'supplier'      => ($assetmaintenance->supplier) ? ['id' => $assetmaintenance->supplier->id, 'name'=> e($assetmaintenance->supplier->name)] : null,
            'cost'          => Helper::formatCurrencyOutput($assetmaintenance->cost),
            'asset_maintenance_type'          => e($assetmaintenance->asset_maintenance_type),
--- a/app/Http/Transformers/AssetModelsTransformer.php
+++ b/app/Http/Transformers/AssetModelsTransformer.php
@@ -47,7 +47,6 @@ class AssetModelsTransformer
            ] : null,
            'image' => ($assetmodel->image != '') ? Storage::disk('public')->url('models/'.e($assetmodel->image)) : null,
            'model_number' => e($assetmodel->model_number),
-            'min_amt'   => ($assetmodel->min_amt) ? (int) $assetmodel->min_amt : null,
            'depreciation' => ($assetmodel->depreciation) ? [
                'id' => (int) $assetmodel->depreciation->id,
                'name'=> e($assetmodel->depreciation->name),
@@ -64,7 +63,7 @@ class AssetModelsTransformer
            'default_fieldset_values' => $default_field_values,
            'eol' => ($assetmodel->eol > 0) ? $assetmodel->eol.' months' : 'None',
            'requestable' => ($assetmodel->requestable == '1') ? true : false,
-            'notes' => Helper::parseEscapedMarkedownInline($assetmodel->notes),
+            'notes' => Helper::parseEscapedMarkedown($assetmodel->notes),
            'created_at' => Helper::getFormattedDateObject($assetmodel->created_at, 'datetime'),
            'updated_at' => Helper::getFormattedDateObject($assetmodel->updated_at, 'datetime'),
            'deleted_at' => Helper::getFormattedDateObject($assetmodel->deleted_at, 'datetime'),
@@ -73,7 +72,7 @@ class AssetModelsTransformer

        $permissions_array['available_actions'] = [
            'update' => (Gate::allows('update', AssetModel::class) && ($assetmodel->deleted_at == '')),
-            'delete' => $assetmodel->isDeletable(),
+            'delete' => (Gate::allows('delete', AssetModel::class) && ($assetmodel->assets_count == 0)),
            'clone' => (Gate::allows('create', AssetModel::class) && ($assetmodel->deleted_at == '')),
            'restore' => (Gate::allows('create', AssetModel::class) && ($assetmodel->deleted_at != '')),
        ];
--- a/app/Http/Transformers/AssetsTransformer.php
+++ b/app/Http/Transformers/AssetsTransformer.php
@@ -7,8 +7,7 @@ use App\Models\Asset;
 use App\Models\Setting;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Database\Eloquent\Collection;
-use Carbon\Carbon;
-use Auth;
+

 class AssetsTransformer
 {
@@ -39,7 +38,7 @@ class AssetsTransformer
            'byod' => ($asset->byod ? true : false),

            'model_number' => (($asset->model) && ($asset->model->model_number)) ? e($asset->model->model_number) : null,
-            'eol' => (($asset->asset_eol_date != '') && ($asset->purchase_date != '')) ? Carbon::parse($asset->asset_eol_date)->diffInMonths($asset->purchase_date).' months' : null,
+            'eol' => (($asset->model) && ($asset->model->eol != '')) ? $asset->model->eol : null,
            'asset_eol_date' => ($asset->asset_eol_date != '') ? Helper::getFormattedDateObject($asset->asset_eol_date, 'date') : null,
            'status_label' => ($asset->assetstatus) ? [
                'id' => (int) $asset->assetstatus->id,
@@ -59,7 +58,7 @@ class AssetsTransformer
                'id' => (int) $asset->supplier->id,
                'name'=> e($asset->supplier->name),
            ] : null,
-            'notes' => ($asset->notes) ? Helper::parseEscapedMarkedownInline($asset->notes) : null,
+            'notes' => ($asset->notes) ? Helper::parseEscapedMarkedown($asset->notes) : null,
            'order_number' => ($asset->order_number) ? e($asset->order_number) : null,
            'company' => ($asset->company) ? [
                'id' => (int) $asset->company->id,
@@ -93,7 +92,6 @@ class AssetsTransformer
            'checkout_counter' => (int) $asset->checkout_counter,
            'requests_counter' => (int) $asset->requests_counter,
            'user_can_checkout' => (bool) $asset->availableForCheckout(),
-            'book_value' => Helper::formatCurrencyOutput($asset->getLinearDepreciatedValue()),
        ];


@@ -103,10 +101,10 @@ class AssetsTransformer
            foreach ($asset->model->fieldset->fields as $field) {
                if ($field->isFieldDecryptable($asset->{$field->db_column})) {
                    $decrypted = Helper::gracefulDecrypt($field, $asset->{$field->db_column});
-                    $value = (Gate::allows('assets.view.encrypted_custom_fields')) ? $decrypted : strtoupper(trans('admin/custom_fields/general.encrypted'));
+                    $value = (Gate::allows('superadmin')) ? $decrypted : strtoupper(trans('admin/custom_fields/general.encrypted'));

                    if ($field->format == 'DATE'){
-                        if (Gate::allows('assets.view.encrypted_custom_fields')){
+                        if (Gate::allows('superadmin')){
                            $value = Helper::getFormattedDateObject($value, 'date', false);
                        } else {
                           $value = strtoupper(trans('admin/custom_fields/general.encrypted'));
@@ -147,7 +145,7 @@ class AssetsTransformer
            'clone'         => Gate::allows('create', Asset::class) ? true : false,
            'restore'       => ($asset->deleted_at!='' && Gate::allows('create', Asset::class)) ? true : false,
            'update'        => ($asset->deleted_at=='' && Gate::allows('update', Asset::class)) ? true : false,
-            'delete'        => ($asset->deleted_at=='' && $asset->assigned_to =='' && Gate::allows('delete', Asset::class) && ($asset->deleted_at == '')) ? true : false,
+            'delete'        => ($asset->deleted_at=='' && $asset->assigned_to =='' && Gate::allows('delete', Asset::class)) ? true : false,
        ];      


@@ -232,29 +230,6 @@ class AssetsTransformer
            'assigned_to_self' => ($asset->assigned_to == \Auth::user()->id),
        ];

-        if (($asset->model) && ($asset->model->fieldset) && ($asset->model->fieldset->fields->count() > 0)) {
-            $fields_array = [];
-
-            foreach ($asset->model->fieldset->fields as $field) {
-
-                // Only display this if it's allowed via the custom field setting
-                if (($field->field_encrypted=='0') && ($field->show_in_requestable_list=='1')) {
-
-                    $value = $asset->{$field->db_column};
-                    if (($field->format == 'DATE') && (!is_null($value)) && ($value != '')) {
-                        $value = Helper::getFormattedDateObject($value, 'date', false);
-                    }
-
-                    $fields_array[$field->db_column] = e($value);
-                }
-
-                $array['custom_fields'] = $fields_array;
-            }
-        } else {
-            $array['custom_fields'] = new \stdClass; // HACK to force generation of empty object instead of empty list
-        }
-
-
        $permissions_array['available_actions'] = [
            'cancel' => ($asset->isRequestedBy(\Auth::user())) ? true : false,
            'request' => ($asset->isRequestedBy(\Auth::user())) ? false : true,
--- a/app/Http/Transformers/CompaniesTransformer.php
+++ b/app/Http/Transformers/CompaniesTransformer.php
@@ -26,9 +26,6 @@ class CompaniesTransformer
            $array = [
                'id' => (int) $company->id,
                'name' => e($company->name),
-                'phone' => ($company->phone!='') ? e($company->phone): null,
-                'fax' => ($company->fax!='') ? e($company->fax): null,
-                'email' => ($company->email!='') ? e($company->email): null,
                'image' =>   ($company->image) ? Storage::disk('public')->url('companies/'.e($company->image)) : null,
                'created_at' => Helper::getFormattedDateObject($company->created_at, 'datetime'),
                'updated_at' => Helper::getFormattedDateObject($company->updated_at, 'datetime'),
--- a/app/Http/Transformers/ComponentsTransformer.php
+++ b/app/Http/Transformers/ComponentsTransformer.php
@@ -46,7 +46,7 @@ class ComponentsTransformer
                'id' => (int) $component->company->id,
                'name' => e($component->company->name),
            ] : null,
-            'notes' => ($component->notes) ? Helper::parseEscapedMarkedownInline($component->notes) : null,
+            'notes' => ($component->notes) ? Helper::parseEscapedMarkedown($component->notes) : null,
            'created_at' => Helper::getFormattedDateObject($component->created_at, 'datetime'),
            'updated_at' => Helper::getFormattedDateObject($component->updated_at, 'datetime'),
            'user_can_checkout' =>  ($component->numRemaining() > 0) ? 1 : 0,
--- a/app/Http/Transformers/ConsumablesTransformer.php
+++ b/app/Http/Transformers/ConsumablesTransformer.php
@@ -39,7 +39,7 @@ class ConsumablesTransformer
            'purchase_cost'  => Helper::formatCurrencyOutput($consumable->purchase_cost),
            'purchase_date'  => Helper::getFormattedDateObject($consumable->purchase_date, 'date'),
            'qty'           => (int) $consumable->qty,
-            'notes'         => ($consumable->notes) ? Helper::parseEscapedMarkedownInline($consumable->notes) : null,
+            'notes'         => ($consumable->notes) ? Helper::parseEscapedMarkedown($consumable->notes) : null,
            'created_at' => Helper::getFormattedDateObject($consumable->created_at, 'datetime'),
            'updated_at' => Helper::getFormattedDateObject($consumable->updated_at, 'datetime'),
        ];
--- a/app/Http/Transformers/CustomFieldsTransformer.php
+++ b/app/Http/Transformers/CustomFieldsTransformer.php
@@ -49,7 +49,6 @@ class CustomFieldsTransformer
            'required'   =>  (($field->pivot) && ($field->pivot->required=='1')) ? true : false,
            'display_in_user_view' =>  ($field->display_in_user_view =='1') ? true : false,
            'auto_add_to_fieldsets' =>  ($field->auto_add_to_fieldsets == '1') ? true : false,
-            'show_in_listview'  => ($field->show_in_listview == '1') ? true : false,
            'created_at' => Helper::getFormattedDateObject($field->created_at, 'datetime'),
            'updated_at' => Helper::getFormattedDateObject($field->updated_at, 'datetime'),
        ];
--- a/app/Http/Transformers/DepartmentsTransformer.php
+++ b/app/Http/Transformers/DepartmentsTransformer.php
@@ -26,8 +26,6 @@ class DepartmentsTransformer
            $array = [
                'id' => (int) $department->id,
                'name' => e($department->name),
-                'phone' => ($department->phone!='') ? e($department->phone): null,
-                'fax' => ($department->fax!='') ? e($department->fax): null,
                'image' =>   ($department->image) ? Storage::disk('public')->url(app('departments_upload_url').e($department->image)) : null,
                'company' => ($department->company) ? [
                    'id' => (int) $department->company->id,
--- a/app/Http/Transformers/LabelsTransformer.php
+++ b/app/Http/Transformers/LabelsTransformer.php
@@ -1,71 +0,0 @@
-<?php
-
-namespace App\Http\Transformers;
-
-use App\Helpers\Helper;
-use App\Models\Labels\Label;
-use App\Models\Labels\Sheet;
-use App\Models\Labels\RectangleSheet;
-use Illuminate\Support\Collection;
-
-class LabelsTransformer
-{
-    public function transformLabels(Collection $labels, $total)
-    {
-        $array = [];
-        foreach ($labels as $label) {
-            $array[] = self::transformLabel($label);
-        }
-
-        return (new DatatablesTransformer)->transformDatatables($array, $total);
-    }
-
-    public function transformLabel(Label $label)
-    {
-        $array = [
-            'name' => $label->getName(),
-            'unit' => $label->getUnit(),
-
-            'width'  => number_format($label->getWidth(), 2),
-            'height' => number_format($label->getHeight(), 2),
-
-            'margin_top'    => $label->getMarginTop(),
-            'margin_bottom' => $label->getMarginBottom(),
-            'margin_left'   => $label->getMarginLeft(),
-            'margin_right'  => $label->getMarginRight(),
-
-            'support_asset_tag'  => $label->getSupportAssetTag(),
-            'support_1d_barcode' => $label->getSupport1DBarcode(),
-            'support_2d_barcode' => $label->getSupport2DBarcode(),
-            'support_fields'     => $label->getSupportFields(),
-            'support_logo'       => $label->getSupportLogo(),
-            'support_title'      => $label->getSupportTitle(),
-        ];
-
-        if ($label instanceof Sheet) {
-            $array['sheet_info'] = [
-                'label_width'  => $label->getLabelWidth(),
-                'label_height' => $label->getLabelHeight(),
-
-                'label_margin_top'    => $label->getLabelMarginTop(),
-                'label_margin_bottom' => $label->getLabelMarginBottom(),
-                'label_margin_left'   => $label->getLabelMarginLeft(),
-                'label_margin_right'  => $label->getLabelMarginRight(),
-
-                'labels_per_page' => $label->getLabelsPerPage(),
-                'label_border' => $label->getLabelBorder(),
-            ];
-        }
-
-        if ($label instanceof RectangleSheet) {
-            $array['rectanglesheet_info'] = [
-                'columns' => $label->getColumns(),
-                'rows'    => $label->getRows(),
-                'column_spacing' => $label->getLabelColumnSpacing(),
-                'row_spacing'    => $label->getLabelRowSpacing(),
-            ];
-        }
-
-        return $array;
-    }
-}
--- a/app/Http/Transformers/LicenseSeatsTransformer.php
+++ b/app/Http/Transformers/LicenseSeatsTransformer.php
@@ -45,7 +45,6 @@ class LicenseSeatsTransformer
                'name'=> e($seat->location()->name),
            ] : null,
            'reassignable' => (bool) $seat->license->reassignable,
-            'notes' => e($seat->notes),
            'user_can_checkout' => (($seat->assigned_to == '') && ($seat->asset_id == '')),
        ];

--- a/app/Http/Transformers/LicensesTransformer.php
+++ b/app/Http/Transformers/LicensesTransformer.php
@@ -34,7 +34,7 @@ class LicensesTransformer
            'depreciation' => ($license->depreciation) ? ['id' => (int) $license->depreciation->id,'name'=> e($license->depreciation->name)] : null,
            'purchase_cost' => Helper::formatCurrencyOutput($license->purchase_cost),
            'purchase_cost_numeric' => $license->purchase_cost,
-            'notes' => Helper::parseEscapedMarkedownInline($license->notes),
+            'notes' => Helper::parseEscapedMarkedown($license->notes),
            'expiration_date' => Helper::getFormattedDateObject($license->expiration_date, 'date'),
            'seats' => (int) $license->seats,
            'free_seats_count' => (int) $license->free_seats_count,
--- a/app/Http/Transformers/LocationsTransformer.php
+++ b/app/Http/Transformers/LocationsTransformer.php
@@ -43,8 +43,6 @@ class LocationsTransformer
                'state' =>  ($location->state) ? e($location->state) : null,
                'country' => ($location->country) ? e($location->country) : null,
                'zip' => ($location->zip) ? e($location->zip) : null,
-                'phone' => ($location->phone!='') ? e($location->phone): null,
-                'fax' => ($location->fax!='') ? e($location->fax): null,
                'assigned_assets_count' => (int) $location->assigned_assets_count,
                'assets_count'    => (int) $location->assets_count,
                'rtd_assets_count'    => (int) $location->rtd_assets_count,
--- a/app/Http/Transformers/SuppliersTransformer.php
+++ b/app/Http/Transformers/SuppliersTransformer.php
@@ -43,7 +43,7 @@ class SuppliersTransformer
                'licenses_count' => (int) $supplier->licenses_count,
                'consumables_count' => (int) $supplier->consumables_count,
                'components_count' => (int) $supplier->components_count,
-                'notes' => ($supplier->notes) ? Helper::parseEscapedMarkedownInline($supplier->notes) : null,
+                'notes' => ($supplier->notes) ? Helper::parseEscapedMarkedown($supplier->notes) : null,
                'created_at' => Helper::getFormattedDateObject($supplier->created_at, 'datetime'),
                'updated_at' => Helper::getFormattedDateObject($supplier->updated_at, 'datetime'),

--- a/app/Http/Transformers/UsersTransformer.php
+++ b/app/Http/Transformers/UsersTransformer.php
@@ -24,7 +24,7 @@ class UsersTransformer
        $array = [
                'id' => (int) $user->id,
                'avatar' => e($user->present()->gravatar),
-                'name' => e($user->getFullNameAttribute()),
+                'name' => e($user->first_name).' '.e($user->last_name),
                'first_name' => e($user->first_name),
                'last_name' => e($user->last_name),
                'username' => e($user->username),
@@ -53,7 +53,7 @@ class UsersTransformer
                    'id' => (int) $user->userloc->id,
                    'name'=> e($user->userloc->name),
                ] : null,
-                'notes'=> Helper::parseEscapedMarkedownInline($user->notes),
+                'notes'=> Helper::parseEscapedMarkedown($user->notes),
                'permissions' => $user->decodePermissions(),
                'activated' => ($user->activated == '1') ? true : false,
                'autoassign_licenses' => ($user->autoassign_licenses == '1') ? true : false,
@@ -79,7 +79,7 @@ class UsersTransformer

        $permissions_array['available_actions'] = [
            'update' => (Gate::allows('update', User::class) && ($user->deleted_at == '')),
-            'delete' => $user->isDeletable(),
+            'delete' => (Gate::allows('delete', User::class) && ($user->assets_count == 0) && ($user->licenses_count == 0) && ($user->accessories_count == 0)),
            'clone' => (Gate::allows('create', User::class) && ($user->deleted_at == '')),
            'restore' => (Gate::allows('create', User::class) && ($user->deleted_at != '')),
        ];
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snipe	61fd427678	Bumped version Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php	2023-07-05 14:41:34 +01:00
snipe	32747cafde	Merge remote-tracking branch 'origin/develop'	2023-07-05 14:37:53 +01:00
snipe	e18c3e08be	Merge remote-tracking branch 'origin/develop'	2023-06-29 21:23:53 +01:00
snipe	33b1a31ed3	Merge remote-tracking branch 'origin/develop'	2023-06-29 21:19:25 +01:00
snipe	1b71ab6d86	Updated prod assets Signed-off-by: snipe <snipe@snipe.net>	2023-06-29 20:41:16 +01:00
snipe	af26ec471f	Merge remote-tracking branch 'origin/develop' Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/dist/skins/skin-yellow-dark.css # public/css/dist/skins/skin-yellow-dark.min.css # public/mix-manifest.json	2023-06-29 20:41:05 +01:00
snipe	4dd71e0332	Merge remote-tracking branch 'origin/develop'	2023-06-29 17:14:15 +01:00
snipe	4908082240	Merge remote-tracking branch 'origin/develop'	2023-06-29 16:23:35 +01:00
snipe	ead5f039b4	Merge remote-tracking branch 'origin/develop'	2023-06-29 15:33:12 +01:00
snipe	2c23c71823	Merge remote-tracking branch 'origin/develop'	2023-06-28 16:41:49 +01:00
snipe	4cb9c25e83	Merge remote-tracking branch 'origin/develop'	2023-06-26 08:30:35 +01:00
snipe	c377e0617c	Merge remote-tracking branch 'origin/develop' Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php	2023-06-21 19:07:07 +01:00
snipe	2ac4449ea3	Merge remote-tracking branch 'origin/develop'	2023-06-15 20:30:07 +01:00
snipe	83708e1be9	Merge remote-tracking branch 'origin/develop'	2023-06-13 18:36:22 +01:00
snipe	f552bcef78	Merge pull request #13143 from qay21/patch-1 Fixed #13129: Add missing LDAP lib required for LDAPS support	2023-06-12 14:04:05 +01:00
Quentin Aymard	fc6c5eadd7	Fix missing ldap packages This should provide LDAPS support out of the box, and fix #13129	2023-06-09 11:14:41 +02:00
snipe	924d0b25e8	Merge remote-tracking branch 'origin/develop' Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php # public/css/dist/all.css # public/js/build/app.js # public/js/build/vendor.js # public/js/dist/all.js # public/mix-manifest.json	2023-06-08 08:53:22 +01:00
snipe	fc5b02e392	Merge remote-tracking branch 'origin/develop'	2023-06-01 19:51:49 +01:00
snipe	18eda15ec1	Merge remote-tracking branch 'origin/develop'	2023-05-31 16:19:34 +01:00
snipe	c05a4452bc	Merge + update assets Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/mix-manifest.json	2023-05-29 18:20:12 -04:00
snipe	a3a64be19b	Merge remote-tracking branch 'origin/develop' Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/mix-manifest.json	2023-05-24 16:06:26 -07:00
snipe	f1b4bba3ae	Merge remote-tracking branch 'origin/develop'	2023-05-16 23:12:41 -07:00
snipe	dbae01f545	Merge remote-tracking branch 'origin/develop' Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/dist/skins/skin-red-dark.css # public/css/dist/skins/skin-red-dark.min.css # public/mix-manifest.json	2023-05-16 17:41:39 -07:00
snipe	5be993df8d	Merge remote-tracking branch 'origin/develop'	2023-05-16 16:42:17 -07:00
snipe	37f75c5001	Merge remote-tracking branch 'origin/develop'	2023-05-16 16:29:36 -07:00
snipe	b1fda46e11	Production assets Signed-off-by: snipe <snipe@snipe.net>	2023-05-10 11:25:28 -07:00
snipe	6b7a7b8aee	Merge remote-tracking branch 'origin/develop'	2023-05-10 11:23:29 -07:00
snipe	63c660f306	Merge pull request #12999 from snipe/develop Google Oauth Recap	2023-05-10 10:01:23 -07:00