Change button classes based on inheritance

Fixes #18138 redirect to Previous Page from accessories edit screen

.all-contributorsrc

@@ -4235,6 +4235,33 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "smarsching",
+      "name": "Sebastian Marsching",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2880129?v=4",
+      "profile": "http://sebastian.marsching.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mohammad-ahmadi1",
+      "name": "Mo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/40658372?v=4",
+      "profile": "https://github.com/mohammad-ahmadi1",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "MarvelousAnything",
+      "name": "Owen V. Hayes",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20994684?v=4",
+      "profile": "https://github.com/MarvelousAnything",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }

.env.example

@@ -190,6 +190,7 @@ APP_ALLOW_INSECURE_HOSTS=false
 GOOGLE_MAPS_API=
 LDAP_MEM_LIM=500M
 LDAP_TIME_LIM=600
+BACKUP_TIME_LIMIT=600
 IMPORT_TIME_LIMIT=600
 IMPORT_MEMORY_LIMIT=500M
 REPORT_TIME_LIMIT=12000

.github/workflows/tests-mysql.yml

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

.github/workflows/tests-postgres.yml

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

.github/workflows/tests-sqlite.yml

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

CONTRIBUTORS.md

@@ -68,7 +68,8 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/181059?v=4" width="110px;"/><br /><sub>Juan Font</sub>](https://github.com/juanfont)<br />[💻](https://github.com/snipe/snipe-it/commits?author=juanfont "Code") | [<img src="https://avatars.githubusercontent.com/u/13137708?v=4" width="110px;"/><br /><sub>Juho Taipale</sub>](https://github.com/juhotaipale)<br />[💻](https://github.com/snipe/snipe-it/commits?author=juhotaipale "Code") | [<img src="https://avatars.githubusercontent.com/u/1007419?v=4" width="110px;"/><br /><sub>Korvin Szanto</sub>](https://github.com/KorvinSzanto)<br />[💻](https://github.com/snipe/snipe-it/commits?author=KorvinSzanto "Code") | [<img src="https://avatars.githubusercontent.com/u/8513053?v=4" width="110px;"/><br /><sub>Lewis Foster</sub>](https://lewisfoster.foo/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sniff122 "Code") | [<img src="https://avatars.githubusercontent.com/u/33877541?v=4" width="110px;"/><br /><sub>Logan Swartzendruber</sub>](https://github.com/loganswartz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=loganswartz "Code") | [<img src="https://avatars.githubusercontent.com/u/1156208?v=4" width="110px;"/><br /><sub>Lorenzo P.</sub>](https://github.com/lopezio)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lopezio "Code") | [<img src="https://avatars.githubusercontent.com/u/33946590?v=4" width="110px;"/><br /><sub>Lukas Jung</sub>](https://github.com/m4us1ne)<br />[💻](https://github.com/snipe/snipe-it/commits?author=m4us1ne "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/10965027?v=4" width="110px;"/><br /><sub>Ellie</sub>](https://leafedfox.xyz/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=LeafedFox "Code") | [<img src="https://avatars.githubusercontent.com/u/20960555?v=4" width="110px;"/><br /><sub>GA Stamper</sub>](https://github.com/gastamper)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gastamper "Code") | [<img src="https://avatars.githubusercontent.com/u/206553556?v=4" width="110px;"/><br /><sub>Guillaume Lefranc</sub>](https://github.com/gl-pup)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gl-pup "Code") | [<img src="https://avatars.githubusercontent.com/u/733892?v=4" width="110px;"/><br /><sub>Hajo Möller</sub>](https://github.com/dasjoe)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dasjoe "Code") | [<img src="https://avatars.githubusercontent.com/u/3420063?v=4" width="110px;"/><br /><sub>Istvan Basa</sub>](https://github.com/pottom)<br />[💻](https://github.com/snipe/snipe-it/commits?author=pottom "Code") | [<img src="https://avatars.githubusercontent.com/u/810824?v=4" width="110px;"/><br /><sub>JJ Asghar</sub>](https://jjasghar.github.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jjasghar "Code") | [<img src="https://avatars.githubusercontent.com/u/40404495?v=4" width="110px;"/><br /><sub>James E. Msenga</sub>](https://github.com/JemCdo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JemCdo "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/6865786?v=4" width="110px;"/><br /><sub>Jan Felix Wiebe</sub>](https://github.com/jfwiebe)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jfwiebe "Code") | [<img src="https://avatars.githubusercontent.com/u/43412008?v=4" width="110px;"/><br /><sub>Jo Drexl</sub>](https://www.nfon.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=drexljo "Code") | [<img src="https://avatars.githubusercontent.com/u/4807843?v=4" width="110px;"/><br /><sub>Austin Sasko</sub>](https://github.com/austinsasko)<br />[💻](https://github.com/snipe/snipe-it/commits?author=austinsasko "Code") | [<img src="https://avatars.githubusercontent.com/u/4875039?v=4" width="110px;"/><br /><sub>Jasson</sub>](http://jassoncordones.github.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JassonCordones "Code") | [<img src="https://avatars.githubusercontent.com/u/76069640?v=4" width="110px;"/><br /><sub>Okean</sub>](https://github.com/Tinyblargon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Tinyblargon "Code") | [<img src="https://avatars.githubusercontent.com/u/6515064?v=4" width="110px;"/><br /><sub>Alejandro Medrano</sub>](https://www.lst.tfo.upm.es/alejandro-medrano/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=amedranogil "Code") | [<img src="https://avatars.githubusercontent.com/u/58696401?v=4" width="110px;"/><br /><sub>Lukas Kraic</sub>](https://github.com/lukaskraic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lukaskraic "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/1571724?v=4" width="110px;"/><br /><sub>Герхард PICCORO Lenz McKAY </sub>](https://github-readme-stats.vercel.app/api?username=mckaygerhard)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mckaygerhard "Code") | [<img src="https://avatars.githubusercontent.com/u/15015119?v=4" width="110px;"/><br /><sub>Johannes Pollitt</sub>](https://github.com/FlorestanII)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FlorestanII "Code") | [<img src="https://avatars.githubusercontent.com/u/14185442?v=4" width="110px;"/><br /><sub>Michael Strobel</sub>](https://strobelm.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=strobelm "Code") | [<img src="https://avatars.githubusercontent.com/u/634790?v=4" width="110px;"/><br /><sub>Nicky West</sub>](http://nickwest.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nickwest "Code") | [<img src="https://avatars.githubusercontent.com/u/1347327?v=4" width="110px;"/><br /><sub>akaspeh1</sub>](https://github.com/akaspeh1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=akaspeh1 "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/1571724?v=4" width="110px;"/><br /><sub>Герхард PICCORO Lenz McKAY </sub>](https://github-readme-stats.vercel.app/api?username=mckaygerhard)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mckaygerhard "Code") | [<img src="https://avatars.githubusercontent.com/u/15015119?v=4" width="110px;"/><br /><sub>Johannes Pollitt</sub>](https://github.com/FlorestanII)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FlorestanII "Code") | [<img src="https://avatars.githubusercontent.com/u/14185442?v=4" width="110px;"/><br /><sub>Michael Strobel</sub>](https://strobelm.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=strobelm "Code") | [<img src="https://avatars.githubusercontent.com/u/634790?v=4" width="110px;"/><br /><sub>Nicky West</sub>](http://nickwest.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nickwest "Code") | [<img src="https://avatars.githubusercontent.com/u/1347327?v=4" width="110px;"/><br /><sub>akaspeh1</sub>](https://github.com/akaspeh1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=akaspeh1 "Code") | [<img src="https://avatars.githubusercontent.com/u/2880129?v=4" width="110px;"/><br /><sub>Sebastian Marsching</sub>](http://sebastian.marsching.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=smarsching "Code") | [<img src="https://avatars.githubusercontent.com/u/40658372?v=4" width="110px;"/><br /><sub>Mo</sub>](https://github.com/mohammad-ahmadi1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mohammad-ahmadi1 "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/20994684?v=4" width="110px;"/><br /><sub>Owen V. Hayes</sub>](https://github.com/MarvelousAnything)<br />[💻](https://github.com/snipe/snipe-it/commits?author=MarvelousAnything "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

app/Console/Commands/ObjectImportCommand.php

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

app/Console/Commands/SendAcceptanceReminder.php

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

app/Console/Commands/SendInventoryAlerts.php

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

app/Console/Commands/SendUpcomingAuditReport.php

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

app/Console/Commands/SystemBackup.php

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

app/Enums/ActionType.php

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

app/Helpers/IconHelper.php

@@ -40,6 +40,8 @@ class IconHelper
                 return 'fa-solid fa-trash-arrow-up';
             case 'external-link':
                 return 'fa fa-external-link';
+            case 'link':
+                return 'fa fa-link';
             case 'email':
                 return 'fa-regular fa-envelope';
             case 'phone':
@@ -199,6 +201,8 @@ class IconHelper
                 return 'fa-solid fa-lightbulb';
             case 'highlight':
                 return 'fa-solid fa-highlighter';
+            case 'inherit':
+                return 'fa-solid fa-layer-group';
         }
     }
 }

app/Http/Controllers/Accessories/AccessoriesController.php

@@ -182,7 +182,11 @@ class AccessoriesController extends Controller
 
             $accessory = $request->handleImages($accessory);
 
-            session()->put(['redirect_option' => $request->get('redirect_option')]);
+            if($request->get('redirect_option') === 'back'){
+                session()->put(['redirect_option' => 'index']);
+            } else {
+                session()->put(['redirect_option' => $request->get('redirect_option')]);
+            }
 
             if ($accessory->save()) {
                 return Helper::getRedirectOption($request, $accessory->id, 'Accessories')

app/Http/Controllers/Account/AcceptanceController.php

@@ -116,8 +116,6 @@ class AcceptanceController extends Controller
 
         $item = $acceptance->checkoutable_type::find($acceptance->checkoutable_id);
 
-
-
         // If signatures are required, make sure we have one
         if (Setting::getSettings()->require_accept_signature == '1') {
 
@@ -164,11 +162,9 @@ class AcceptanceController extends Controller
             'signature' => (($sig_filename && array_key_exists('1', $encoded_image))) ? $encoded_image[1] : null,
             'logo' => ($encoded_logo) ?? null,
             'date_settings' => $settings->date_display_format,
-            'admin' => auth()->user()->present()?->fullName,
             'qty' => $acceptance->qty ?? 1,
         ];
 
-
         if ($request->input('asset_acceptance') == 'accepted') {
 
 

app/Http/Controllers/Api/DepartmentsController.php

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

app/Http/Controllers/Api/GroupsController.php

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

app/Http/Controllers/Api/LicenseSeatsController.php

@@ -26,11 +26,11 @@ class LicenseSeatsController extends Controller
         if ($license = License::find($licenseId)) {
             $this->authorize('view', $license);
 
-            $seats = LicenseSeat::with('license', 'user', 'asset', 'user.department')
+            $seats = LicenseSeat::with('license', 'user', 'asset', 'user.department',  'user.company', 'asset.company')
                 ->where('license_seats.license_id', $licenseId);
 
             if ($request->input('status') == 'available') {
-                $seats->whereNull('license_seats.assigned_to');
+                $seats->whereNull('license_seats.assigned_to')->whereNull('license_seats.asset_id');
             }
 
             if ($request->input('status') == 'assigned') {
@@ -40,8 +40,10 @@ class LicenseSeatsController extends Controller
 
             $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
 
-            if ($request->input('sort') == 'department') {
+            if ($request->input('sort') == 'assigned_user.department') {
                 $seats->OrderDepartments($order);
+            } elseif ($request->input('sort') == 'assigned_user.company') {
+                    $seats->OrderCompany($order);
             } else {
                 $seats->orderBy('updated_at', $order);
             }
@@ -83,7 +85,7 @@ class LicenseSeatsController extends Controller
             return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat not found'));
         }
         // 2. does the seat belong to the specified license?
-        if (! $license = $licenseSeat->license()->first() || $license->id != intval($licenseId)) {
+        if (! $licenseSeat = $licenseSeat->license()->first() || $licenseSeat->id != intval($licenseId)) {
             return response()->json(Helper::formatStandardApiResponse('error', null, 'Seat does not belong to the specified license'));
         }
 

app/Http/Controllers/Api/UploadedFilesController.php

@@ -51,21 +51,14 @@ class UploadedFilesController extends Controller
             ];
 
 
-        if (($request->filled('action_type') && ($request->input('action_type') == 'audit'))) {
-            $uploads = self::$map_object_type[$object_type]::withTrashed()->find($id)->audits()
-                ->with('adminuser');
-        } else {
-            $uploads = self::$map_object_type[$object_type]::withTrashed()->find($id)->uploads()
-                ->with('adminuser');
-        }
-
+        $uploads = self::$map_object_type[$object_type]::withTrashed()->find($id)->uploads()
+            ->with('adminuser');
 
         $offset = ($request->input('offset') > $uploads->count()) ? $uploads->count() : abs($request->input('offset'));
         $limit = app('api_limit_value');
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
 
-
         // Text search on action_logs fields
         // We could use the normal Actionlogs text scope, but it's a very heavy query since it's searching across all relations
         // and we generally won't need that here

app/Http/Controllers/Controller.php

@@ -30,6 +30,7 @@ use App\Models\Consumable;
 use App\Models\License;
 use App\Models\Location;
 use App\Models\Maintenance;
+use App\Models\Supplier;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
@@ -52,6 +53,7 @@ abstract class Controller extends BaseController
         'licenses' => License::class,
         'locations' => Location::class,
         'models' => AssetModel::class,
+        'suppliers' => Supplier::class,
         'users' => User::class,
     ];
 
@@ -66,6 +68,7 @@ abstract class Controller extends BaseController
         'licenses' => 'private_uploads/licenses/',
         'locations' => 'private_uploads/locations/',
         'models' => 'private_uploads/models/',
+        'suppliers' => 'private_uploads/suppliers/',
         'users' => 'private_uploads/users/',
     ];
 
@@ -73,13 +76,14 @@ abstract class Controller extends BaseController
         'accessories' => 'accessory',
         'maintenances' => 'maintenance',
         'assets' => 'asset',
-        'audits' => 'audit',
+        'audits' => 'audits',
         'components' => 'component',
         'consumables' => 'consumable',
         'hardware' => 'asset',
         'licenses' => 'license',
         'locations' => 'location',
         'models' => 'model',
+        'suppliers' => 'supplier',
         'users' => 'user',
     ];
 

app/Http/Controllers/GroupsController.php

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

app/Http/Controllers/ReportsController.php

@@ -3,12 +3,21 @@
 namespace App\Http\Controllers;
 
 use App\Helpers\Helper;
+use App\Mail\CheckoutAccessoryMail;
 use App\Mail\CheckoutAssetMail;
+use App\Mail\CheckoutComponentMail;
+use App\Mail\CheckoutConsumableMail;
+use App\Mail\CheckoutLicenseMail;
 use App\Models\Accessory;
+use App\Models\AccessoryCheckout;
 use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\Category;
+use App\Models\Checkoutable;
+use App\Models\Component;
+use App\Models\Consumable;
+use App\Models\LicenseSeat;
 use App\Models\Maintenance;
 use App\Models\CheckoutAcceptance;
 use App\Models\Company;
@@ -18,9 +27,11 @@ use App\Models\License;
 use App\Models\ReportTemplate;
 use App\Models\Setting;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Illuminate\Mail\Mailable;
 use Illuminate\Support\Facades\Mail;
 use \Illuminate\Contracts\View\View;
 use League\Csv\Reader;
@@ -1116,34 +1127,30 @@ class ReportsController extends Controller
         $this->authorize('reports.view');
         $showDeleted = $deleted == 'deleted';
 
-        $query = CheckoutAcceptance::pending()
-            ->where('checkoutable_type', 'App\Models\Asset')
+        $query = CheckoutAcceptance::Pending()
             ->with([
                 'checkoutable' => function (MorphTo $query) {
-                    $query->morphWith([
-                        AssetModel::class => ['model'],
-                        Company::class => ['company'],
-                        Asset::class => ['assignedTo'],
-                    ])->with('model.category');
+                    $query->withTrashed()->morphWith([
+                        Asset::class => ['model.category', 'assignedTo', 'company'],
+                        Accessory::class => ['category','checkouts', 'company'],
+                        LicenseSeat::class => ['user', 'license'],
+                        Component::class => ['assignedTo', 'company'],
+                        Consumable::class => ['company'],
+                    ]);
                 },
                 'assignedTo' => function($query){
                          $query->withTrashed();
                     }
-            ]);
+            ])->orderByDesc('checkout_acceptances.created_at');
+
 
         if ($showDeleted) {
             $query->withTrashed();
         }
 
-        $assetsForReport = $query->get()
-                ->map(function ($acceptance) {
-                    return [
-                        'assetItem' => $acceptance->checkoutable,
-                        'acceptance' => $acceptance,
-                    ];
-            });
+        $itemsForReport = $query->get()->map(fn ($unaccepted) => Checkoutable::fromAcceptance($unaccepted));
 
-        return view('reports/unaccepted_assets', compact('assetsForReport','showDeleted' ));
+        return view('reports/unaccepted_assets', compact('itemsForReport','showDeleted' ));
     }
 
     /**
@@ -1155,41 +1162,77 @@ class ReportsController extends Controller
     public function sentAssetAcceptanceReminder(Request $request) : RedirectResponse
     {
         $this->authorize('reports.view');
-
-        if (!$acceptance = CheckoutAcceptance::pending()->find($request->input('acceptance_id'))) {
+        $id = $request->input('acceptance_id');
+        $query = CheckoutAcceptance::query()
+            ->with([
+                'checkoutable' => function (MorphTo $query) {
+                    $query->withTrashed()->morphWith([
+                        Asset::class       => ['model.category', 'assignedTo', 'company', 'checkouts'],
+                        Accessory::class   => ['category', 'company', 'checkouts'],
+                        LicenseSeat::class => ['user', 'license', 'checkouts'],
+                        Component::class   => ['assignedTo', 'company', 'checkouts'],
+                        Consumable::class  => ['company', 'checkouts'],
+                    ]);
+                },
+                'assignedTo' => fn ($q) => $q->withTrashed(),
+            ])
+            ->pending();
+        $acceptance = $query->find($id);
+        if (!$acceptance) {
             Log::debug('No pending acceptances');
-            // Redirect to the unaccepted assets report page with error
+            // Redirect to the unaccepted items report page with error
             return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.bad_data'));
         }
+        $item      = $acceptance->checkoutable;
+        $assignee  = $acceptance->assignedTo ?? $item->assignedTo ?? null;
+        $email     = $assignee?->email;
+        $locale    = $assignee?->locale;
 
-        $assetItem = $acceptance->checkoutable;
-
-        Log::debug(print_r($assetItem, true));
+        Log::debug(print_r($acceptance, 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($item instanceof LicenseSeat){
+                $logItem_res = $item->license->checkouts()->with('adminuser')->where('created_at', '=', $acceptance->created_at)->get();
+            }
+            else{
+                $logItem_res = $item->checkouts()->with('adminuser')->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];
         }
-        $email = $assetItem->assignedTo?->email;
-        $locale = $assetItem->assignedTo?->locale;
 
         if (is_null($email) || $email === '') {
             return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.no_email'));
         }
-
-        Mail::to($email)->send((new CheckoutAssetMail($assetItem, $assetItem->assignedTo, $logItem->user, $acceptance, $logItem->note, firstTimeSending: false))->locale($locale));
+        $mailable = $this->getCheckoutMailType($acceptance, $logItem);
+        Mail::to($email)->send($mailable->locale($locale));
 
         return redirect()->route('reports/unaccepted_assets')->with('success', trans('admin/reports/general.reminder_sent'));
     }
+    private function getCheckoutMailType(CheckoutAcceptance $acceptance, $logItem) : Mailable
+    {
+        $lookup = [
+            Accessory::class => CheckoutAccessoryMail::class,
+            Asset::class => CheckoutAssetMail::class,
+            LicenseSeat::class => CheckoutLicenseMail::class,
+            Consumable::class => CheckoutConsumableMail::class,
+            Component::class => CheckoutComponentMail::class,
+        ];
+        $mailable= $lookup[get_class($acceptance->checkoutable)];
 
+        return new $mailable($acceptance->checkoutable,
+            $acceptance->checkedOutTo ?? $acceptance->assignedTo,
+            $logItem->adminuser,
+            $acceptance,
+            $acceptance->note);
+
+    }
     /**
      * sentAssetAcceptanceReminder
      *
@@ -1221,31 +1264,41 @@ class ReportsController extends Controller
     public function postAssetAcceptanceReport($deleted = false) : Response
     {
         $this->authorize('reports.view');
-        $showDeleted = $deleted == 'deleted';
+        $showDeleted = request('deleted') === 'deleted';;
 
         /**
          * Get all assets with pending checkout acceptances
          */
-        if($showDeleted) {
-            $acceptances = CheckoutAcceptance::pending()->where('checkoutable_type', 'App\Models\Asset')->withTrashed()->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model'])->get();
-        } else {
-            $acceptances = CheckoutAcceptance::pending()->where('checkoutable_type', 'App\Models\Asset')->with(['assignedTo', 'checkoutable.assignedTo', 'checkoutable.model'])->get();
-        }
 
-        $assetsForReport = $acceptances
-            ->filter(function($acceptance) {
-                return $acceptance->checkoutable_type == 'App\Models\Asset';
-            })
-            ->map(function($acceptance) {
-                return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];
-            });
+            $acceptances = CheckoutAcceptance::pending()
+                ->with([
+                    'checkoutable' => function (MorphTo $acceptance) {
+                        $acceptance->withTrashed()->morphWith([
+                            Asset::class => ['model.category', 'assignedTo', 'company'],
+                            Accessory::class => ['category','checkouts', 'company'],
+                            LicenseSeat::class => ['user', 'license'],
+                            Component::class => ['assignedTo', 'company'],
+                            Consumable::class => ['company'],
+                        ]);
+                    },
+                    'assignedTo',
+                ])->orderByDesc('checkout_acceptances.created_at');
+
+            if ($showDeleted) {
+                $acceptances->withTrashed();
+            }
+
+        $itemsForReport = $acceptances->get()->map(fn ($unaccepted) => Checkoutable::fromAcceptance($unaccepted));
 
         $rows = [];
 
         $header = [
+            trans('general.date'),
+            trans('general.type'),
+            trans('admin/companies/table.title'),
             trans('general.category'),
             trans('admin/hardware/form.model'),
-            trans('admin/hardware/form.name'),
+            trans('general.name'),
             trans('admin/hardware/table.asset_tag'),
             trans('admin/hardware/table.checkoutto'),
         ];
@@ -1253,16 +1306,19 @@ class ReportsController extends Controller
         $header = array_map('trim', $header);
         $rows[] = implode(',', $header);
 
-        foreach ($assetsForReport as $item) {
+        foreach ($itemsForReport as $item) {
 
-            if ($item['assetItem'] != null){
+            if ($item != null){
             
                 $row    = [ ];
-                $row[]  = str_replace(',', '', e($item['assetItem']->model->category->name));
-                $row[]  = str_replace(',', '', e($item['assetItem']->model->name));
-                $row[]  = str_replace(',', '', e($item['assetItem']->name));
-                $row[]  = str_replace(',', '', e($item['assetItem']->asset_tag));
-                $row[]  = str_replace(',', '', e(($item['acceptance']->assignedTo) ? $item['acceptance']->assignedTo->display_name : trans('admin/reports/general.deleted_user')));
+                $row[]  = str_replace(',', '', $item->acceptance->created_at);
+                $row[]  = str_replace(',', '', $item->type);
+                $row[]  = str_replace(',', '', $item->plain_text_company);
+                $row[]  = str_replace(',', '', $item->plain_text_category);
+                $row[]  = str_replace(',', '', $item->plain_text_model);
+                $row[]  = str_replace(',', '', $item->plain_text_name);
+                $row[]  = str_replace(',', '', $item->asset_tag);
+                $row[]  = str_replace(',', '', ($item->acceptance->assignedto) ? $item->acceptance->assignedto->display_name : trans('admin/reports/general.deleted_user'));
                 $rows[] = implode(',', $row);
             }
         }

app/Http/Controllers/SettingsController.php

@@ -772,6 +772,7 @@ class SettingsController extends Controller
         $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_prefix = $request->input('label2_2d_prefix');
         $setting->label2_2d_target = $request->input('label2_2d_target');
         $setting->label2_fields = $request->input('label2_fields');
         $setting->label2_empty_row_count = $request->input('label2_empty_row_count');

app/Http/Controllers/Users/UsersController.php

@@ -308,6 +308,13 @@ class UsersController extends Controller
                 $permissions_array['superuser'] = $orig_superuser;
             }
 
+            // Unset any of the inherited user permissions (0), since that behavior is the default anyway
+            foreach ($permissions_array as $permission => $value) {
+                if ($value == '0') {
+                    unset($permissions_array[$permission]);
+                }
+
+            }
             $user->permissions = json_encode($permissions_array);
 
             // Only save groups if the user is a superuser

app/Http/Controllers/ViewAssetsController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Actions\CheckoutRequests\CancelCheckoutRequestAction;
 use App\Actions\CheckoutRequests\CreateCheckoutRequestAction;
+use App\Enums\ActionType;
 use App\Exceptions\AssetNotRequestable;
 use App\Models\Actionlog;
 use App\Models\Asset;
@@ -201,7 +202,7 @@ class ViewAssetsController extends Controller
         if (($item_request = $item->isRequestedBy($user)) || $cancel_by_admin) {
             $item->cancelRequest($requestingUser);
             $data['item_quantity'] = ($item_request) ? $item_request->qty : 1;
-            $logaction->logaction('request_canceled');
+            $logaction->logaction(ActionType::RequestCanceled);
 
             if (($settings->alert_email != '') && ($settings->alerts_enabled == '1') && (! config('app.lock_passwords'))) {
                 $settings->notify(new RequestAssetCancelation($data));

app/Http/Requests/StoreDepartmentRequest.php

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

app/Http/Requests/StoreLabelSettings.php

@@ -49,6 +49,7 @@ class StoreLabelSettings extends FormRequest
             'labels_pagewidth'                    => 'numeric|nullable',
             'labels_pageheight'                   => 'numeric|nullable',
             'qr_text'                             => 'max:31|nullable',
+            'label2_2d_prefix'                    => 'nullable|max:191',
             'label2_template'                     => [
                 'required',
                 Rule::in($names),

app/Http/Requests/StoreNotificationSettings.php

@@ -32,7 +32,7 @@ class StoreNotificationSettings extends FormRequest
             ],
             'alert_threshold'                     => 'numeric|nullable',
             'alert_interval'                      => 'numeric|nullable|gt:0',
-            'audit_warning_days'                  => 'numeric|nullable',
+            'audit_warning_days'                  => 'numeric|nullable|gte:0',
             'due_checkin_days'                    => 'numeric|nullable|gt:0',
             'audit_interval'                      => 'numeric|nullable|gt:0',
         ];

app/Http/Requests/UpdateAssetRequest.php

@@ -28,23 +28,31 @@ class UpdateAssetRequest extends ImageUploadRequest
      */
     public function rules()
     {
+        $setting = Setting::getSettings();
+
         $rules = array_merge(
             parent::rules(),
             (new Asset)->getRules(),
-            // this is to overwrite rulesets that include required, and rewrite unique_undeleted
+            // This overwrites the rulesets that are set at the model level (via Watson) but are not necessarily required at the request level when doing a PATCH update.
+            // Confusingly, this skips the unique_undeleted validator at the model level (and therefore the UniqueUndeletedTrait), so we have to re-add those
+            // rules here without the requiredness, since those values will already exist if you're updating an existing asset.
             [
                 'model_id'  => ['integer', 'exists:models,id,deleted_at,NULL', 'not_array'],
                 'status_id' => ['integer', 'exists:status_labels,id'],
                 'asset_tag' => [
                     'min:1', 'max:255', 'not_array',
-                    Rule::unique('assets', 'asset_tag')->ignore($this->asset)->withoutTrashed()
+                    Rule::unique('assets', 'asset_tag')->ignore($this->asset)->withoutTrashed(),
+                ],
+                'serial' => [
+                    'string', 'max:255', 'not_array',
+                    $setting->unique_serial=='1' ? Rule::unique('assets', 'serial')->ignore($this->asset)->withoutTrashed() : 'nullable',
                 ],
             ],
         );
 
         // if the purchase cost is passed in as a string **and** the digit_separator is ',' (as is common in the EU)
         // then we tweak the purchase_cost rule to make it a string
-        if (Setting::getSettings()->digit_separator === '1.234,56' && is_string($this->input('purchase_cost'))) {
+        if ($setting->digit_separator === '1.234,56' && is_string($this->input('purchase_cost'))) {
             $rules['purchase_cost'] = ['nullable', 'string'];
         }
 

app/Http/Transformers/AssetModelsTransformer.php

@@ -68,7 +68,7 @@ class AssetModelsTransformer
             'default_fieldset_values' => $default_field_values,
             'eol' => ($assetmodel->eol > 0) ? $assetmodel->eol.' months' : 'None',
             'requestable' => ($assetmodel->requestable == '1') ? true : false,
-            'require_serial' => $assetmodel->require_serial,
+            'require_serial' => ($assetmodel->require_serial == '1') ? true : false,
             'notes' => Helper::parseEscapedMarkedownInline($assetmodel->notes),
             'created_by' => ($assetmodel->adminuser) ? [
                 'id' => (int) $assetmodel->adminuser->id,

app/Http/Transformers/DepartmentsTransformer.php

@@ -43,7 +43,7 @@ class DepartmentsTransformer
                     'id' => (int) $department->location->id,
                     'name' => e($department->location->name),
                 ] : null,
-                'users_count' => e($department->users_count),
+                'users_count' => (int) ($department->users_count),
                 'notes' => Helper::parseEscapedMarkedownInline($department->notes),
                 'created_at' => Helper::getFormattedDateObject($department->created_at, 'datetime'),
                 'updated_at' => Helper::getFormattedDateObject($department->updated_at, 'datetime'),

app/Http/Transformers/LicenseSeatsTransformer.php

@@ -36,6 +36,12 @@ class LicenseSeatsTransformer
                             'name' => e($seat->user->department->name),
 
                         ] : null,
+                'company'=> ($seat->user->company) ?
+                    [
+                        'id' => (int) $seat->user->company->id,
+                        'name' => e($seat->user->company->name),
+
+                    ] : null,
                 'created_at' => Helper::getFormattedDateObject($seat->created_at, 'datetime'),
             ] : null,
             'assigned_asset' => ($seat->asset) ? [

app/Http/Transformers/UsersTransformer.php

@@ -68,7 +68,8 @@ class UsersTransformer
                 ] : null,
                 'notes'=> Helper::parseEscapedMarkedownInline($user->notes),
                 'role' => $role,
-                'permissions' => $user->decodePermissions(),
+                'user_permissions' => $user->decodePermissions(),
+                'effective_permissions' => $user->getEffectivePermissions('true'),
                 'activated' => ($user->activated == '1') ? true : false,
                 'autoassign_licenses' => ($user->autoassign_licenses == '1') ? true : false,
                 'ldap_import' => ($user->ldap_import == '1') ? true : false,

app/Importer/AssetImporter.php

@@ -44,7 +44,7 @@ class AssetImporter extends ItemImporter
             foreach ($this->customFields as $customField) {
                 $customFieldValue = $this->array_smart_custom_field_fetch($row, $customField);
 
-                if ($customFieldValue) {
+                if (!is_null($customFieldValue)) {
                     if ($customField->field_encrypted == 1) {
                         $this->item['custom_fields'][$customField->db_column_name()] = Crypt::encrypt($customFieldValue);
                         $this->log('Custom Field '.$customField->name.': '.Crypt::encrypt($customFieldValue));

app/Livewire/CategoryEditForm.php

@@ -2,6 +2,7 @@
 
 namespace App\Livewire;
 
+use Livewire\Attributes\Computed;
 use Livewire\Component;
 
 class CategoryEditForm extends Component
@@ -12,43 +13,25 @@ class CategoryEditForm extends Component
 
     public $eulaText;
 
-    public $originalSendCheckInEmailValue;
-
     public bool $requireAcceptance;
 
     public bool $sendCheckInEmail;
 
     public bool $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
+    #[Computed]
+    public function emailWillBeSendDueToEula(): bool
     {
         return $this->eulaText || $this->useDefaultEula;
     }
 
-    public function getEmailMessageProperty(): string
+    #[Computed]
+    public function emailMessage(): string
     {
         if ($this->useDefaultEula) {
             return trans('admin/categories/general.email_will_be_sent_due_to_global_eula');
@@ -57,13 +40,9 @@ class CategoryEditForm extends Component
         return trans('admin/categories/general.email_will_be_sent_due_to_category_eula');
     }
 
-    public function getEulaTextDisabledProperty()
+    #[Computed]
+    public function eulaTextDisabled()
     {
         return (bool)$this->useDefaultEula;
     }
-
-    public function getSendCheckInEmailDisabledProperty()
-    {
-        return $this->eulaText || $this->useDefaultEula;
-    }
 }

app/Livewire/SlackSettingsForm.php

@@ -159,7 +159,7 @@ class SlackSettingsForm extends Component
             ]);
 
         try {
-            $test = $webhook->post($this->webhook_endpoint, ['body' => $payload, ['headers' => ['Content-Type' => 'application/json']]]);
+            $test = $webhook->post($this->webhook_endpoint, ['body' => $payload, 'headers' => ['Content-Type' => 'application/json']]);
 
             if(($test->getStatusCode() == 302)||($test->getStatusCode() == 301)){
                 return session()->flash('error' , trans('admin/settings/message.webhook.error_redirect', ['endpoint' => $this->webhook_endpoint]));

app/Mail/CheckoutAssetMail.php

@@ -87,7 +87,7 @@ class CheckoutAssetMail extends Mailable
             $name  = $this->target->assignedto?->display_name;
         }
         else if($this->target instanceof Location){
-            $name  = $this->target->manager->name;
+            $name  = $this->target->manager?->name;
         }
 
         // Check if the item has custom fields associated with it

app/Mail/SendUpcomingAuditMail.php

@@ -17,10 +17,11 @@ class SendUpcomingAuditMail extends Mailable
     /**
      * Create a new message instance.
      */
-    public function __construct($params, $threshold)
+    public function __construct($params, $threshold, $total)
     {
         $this->assets = $params;
         $this->threshold = $threshold;
+        $this->total = $total;
     }
 
     /**
@@ -32,7 +33,7 @@ class SendUpcomingAuditMail extends Mailable
 
         return new Envelope(
             from: $from,
-            subject: trans_choice('mail.upcoming-audits', $this->assets->count(), ['count' => $this->assets->count(), 'threshold' => $this->threshold]),
+            subject: trans_choice('mail.upcoming-audits', $this->total, ['count' => $this->total, 'threshold' => $this->threshold]),
         );
     }
 
@@ -49,6 +50,7 @@ class SendUpcomingAuditMail extends Mailable
             with:  [
                 'assets'  => $this->assets,
                 'threshold'  => $this->threshold,
+                'total'  => $this->total,
             ],
         );
     }

app/Models/Accessory.php

@@ -6,6 +6,7 @@ use App\Helpers\Helper;
 use App\Models\Traits\Acceptable;
 use App\Models\Traits\CompanyableTrait;
 use App\Models\Traits\HasUploads;
+use App\Models\Traits\Loggable;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;

app/Models/Actionlog.php

@@ -9,6 +9,7 @@ use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Str;
+use App\Enums\ActionType;
 
 /**
  * Model for the Actionlog (the table that keeps a historical log of
@@ -335,9 +336,12 @@ class Actionlog extends SnipeModel
      * @since  [v3.0]
      * @return bool
      */
-    public function logaction($actiontype)
+    public function logaction(string|ActionType $actiontype)
     {
-        $this->action_type = $actiontype;
+        if (is_string($actiontype)) {
+            $actiontype = ActionType::from($actiontype);
+        }
+        $this->action_type = $actiontype->value;
         $this->remote_ip =  request()->ip();
         $this->user_agent = request()->header('User-Agent');
         $this->action_source = $this->determineActionSource();
@@ -360,7 +364,7 @@ class Actionlog extends SnipeModel
     {
         $now = Carbon::now();
         $last_audit_date = $this->created_at; // this is the action log's created at, not the asset itself
-        $next_audit = $last_audit_date->addMonth($monthInterval); // this actually *modifies* the $last_audit_date
+        $next_audit = $last_audit_date->addMonth((int) $monthInterval); // this actually *modifies* the $last_audit_date
         $next_audit_days = (int) round($now->diffInDays($next_audit, true));
         $override_default_next = $next_audit;
 
@@ -466,6 +470,8 @@ class Actionlog extends SnipeModel
     public function uploads_file_url()
     {
 
+
+
         if (($this->action_type == 'accepted') || ($this->action_type == 'declined')) {
             return route('log.storedeula.download', ['filename' => $this->filename]);
         }
@@ -476,7 +482,6 @@ class Actionlog extends SnipeModel
             $object = 'models';
         }
 
-        // @todo - remove audit special case when audits have their own file handling route
         if ($this->action_type == 'audit') {
             $object = 'audits';
         }
@@ -517,6 +522,8 @@ class Actionlog extends SnipeModel
             return 'private_uploads/locations/'.$this->filename;
         case Maintenance::class:
              return 'private_uploads/maintenances/'.$this->filename;
+        case Supplier::class:
+            return 'private_uploads/suppliers/'.$this->filename;
         case User::class:
             return 'private_uploads/users/'.$this->filename;
         default:

app/Models/Asset.php

@@ -9,6 +9,8 @@ use App\Http\Traits\UniqueUndeletedTrait;
 use App\Models\Traits\Acceptable;
 use App\Models\Traits\CompanyableTrait;
 use App\Models\Traits\HasUploads;
+use App\Models\Traits\Loggable;
+use App\Models\Traits\Requestable;
 use App\Models\Traits\Searchable;
 use App\Presenters\AssetPresenter;
 use App\Presenters\Presentable;
@@ -280,7 +282,7 @@ class Asset extends Depreciable
     protected function warrantyExpires(): Attribute
     {
         return Attribute:: make(
-            get: fn(mixed $value, array $attributes) => ($attributes['warranty_months'] && $attributes['purchase_date']) ? Carbon::parse($attributes['purchase_date'])->addMonths($attributes['warranty_months']) : null,
+            get: fn(mixed $value, array $attributes) => ($attributes['warranty_months'] && $attributes['purchase_date']) ? Carbon::parse($attributes['purchase_date'])->addMonths((int)$attributes['warranty_months']) : null,
         );
     }
 
@@ -937,25 +939,37 @@ class Asset extends Depreciable
      */
     public static function getExpiringWarrantyOrEol($days = 30)
     {
-        
-        return self::where('archived', '=', '0')
+        $now = now();
+        $end = now()->addDays($days);
+
+        $expired_assets = self::query()
+            ->where('archived', '=', '0')
             ->NotArchived()
             ->whereNull('deleted_at')
-            ->where(function ($query) use ($days) {
-                // Check for manual asset EOL first
-                $query->where(function ($query) use ($days) {
-                    $query->whereNotNull('asset_eol_date')
-                        ->whereBetween('asset_eol_date', [Carbon::now(), Carbon::now()->addDays($days)]);
-                // Otherwise use the warranty months + purchase date + threshold
-                })->orWhere(function ($query) use ($days) {
-                    $query->whereNotNull('purchase_date')
-                        ->whereNotNull('warranty_months')
-                        ->whereBetween('purchase_date', [Carbon::now(), Carbon::now()->addMonths('assets.warranty_months')->addDays($days)]);
-                });
-            })
-            ->orderBy('asset_eol_date', 'ASC')
-            ->orderBy('purchase_date', 'ASC')
+            ->whereNotNull('asset_eol_date')
+            ->whereBetween('asset_eol_date', [$now, $end])
             ->get();
+
+        $assets_with_warranties = self::query()
+            ->where('archived', '=', '0')
+            ->NotArchived()
+            ->whereNull('deleted_at')
+            ->whereNotNull('purchase_date')
+            ->whereNotNull('warranty_months')
+            ->get();
+
+        $expired_warranties = $assets_with_warranties->filter(function ($asset) use ($now, $end) {
+            $expiration_window = Carbon::parse($asset->purchase_date)->addMonths((int) $asset->warranty_months);
+
+            return $expiration_window->betweenIncluded($now, $end);
+        });
+        return $expired_assets->concat($expired_warranties)
+            ->unique('id')
+            ->sortBy([
+                ['asset_eol_date', 'ASC'],
+                ['purchase_date', 'ASC']
+            ])
+            ->values();
     }
 
 

app/Models/AssetModel.php

@@ -2,16 +2,18 @@
 
 namespace App\Models;
 
+use App\Http\Traits\TwoColumnUniqueUndeletedTrait;
 use App\Models\Traits\HasUploads;
+use App\Models\Traits\Loggable;
+use App\Models\Traits\Requestable;
 use App\Models\Traits\Searchable;
+use App\Presenters\AssetModelPresenter;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Storage;
 use Watson\Validating\ValidatingTrait;
-use \App\Presenters\AssetModelPresenter;
-use App\Http\Traits\TwoColumnUniqueUndeletedTrait;
 
 /**
  * Model for Asset Models. Asset Models contain higher level

app/Models/CheckoutAcceptance.php

@@ -190,6 +190,11 @@ class CheckoutAcceptance extends Model
         }
 
         $pdf->Ln();
+
+        // Check for CJK in the translation string for date. (This is a good proxy for the rest of the document)
+        Helper::hasRtl(trans('general.date')) ? $pdf->setRTL(true) : $pdf->setRTL(false);
+        Helper::isCjk(trans('general.date')) ? $pdf->SetFont('cid0cs', '', 9) : $pdf->SetFont('dejavusans', '', 8, '', true);
+
         $pdf->writeHTML(trans('general.date') . ': ' . Helper::getFormattedDateObject(now(), 'datetime', false), true, 0, true, 0, '');
 
         if ($data['company_name'] != null) {
@@ -224,7 +229,6 @@ class CheckoutAcceptance extends Model
         foreach ($eula_lines as $eula_line) {
             Helper::hasRtl($eula_line) ? $pdf->setRTL(true) : $pdf->setRTL(false);
             Helper::isCjk($eula_line) ? $pdf->SetFont('cid0cs', '', 9) : $pdf->SetFont('dejavusans', '', 8, '', true);
-
             $pdf->writeHTML(Helper::parseEscapedMarkedown($eula_line), true, 0, true, 0, '');
         }
         $pdf->Ln();
@@ -239,8 +243,11 @@ class CheckoutAcceptance extends Model
             $pdf->Ln();
         }
 
+        Helper::hasRtl(trans('general.notes')) ? $pdf->setRTL(true) : $pdf->setRTL(false);
+        Helper::isCjk(trans('general.notes')) ? $pdf->SetFont('cid0cs', '', 9) : $pdf->SetFont('dejavusans', '', 8, '', true);
+
         if ($data['note'] != null) {
-            Helper::isCjk($data['note']) ? $pdf->SetFont('cid0cs', '', 9) : $pdf->SetFont('dejavusans', '', 8, '', true);
+            Helper::isCjk(trans('general.notes')) ? $pdf->SetFont('cid0cs', '', 9) : $pdf->SetFont('dejavusans', '', 8, '', true);
             $pdf->writeHTML(trans('general.notes') . ': ' . e($data['note']), true, 0, true, 0, '');
             $pdf->Ln();
         }

app/Models/Checkoutable.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Models;
+
+class Checkoutable
+{
+    public function __construct(
+        public int $acceptance_id,
+        public string $company,
+        public string $category,
+        public string $model,
+        public string $asset_tag,
+        public string $name,
+        public string $type,
+        public object $acceptance,
+        public object $assignee,
+        public readonly string $plain_text_category,
+        public readonly string $plain_text_model,
+        public readonly string $plain_text_name,
+        public readonly string $plain_text_company,
+    ){}
+
+    public static function fromAcceptance(CheckoutAcceptance $unaccepted): self
+    {
+        $unaccepted_row = $unaccepted->checkoutable;
+        $acceptance = $unaccepted;
+
+        $assignee = $acceptance->assignedTo;
+        $company = $unaccepted_row->company ? optional($unaccepted_row->company)->present()->nameUrl() : '';
+        $category = $model = $name = $tag = '';
+        $type = $acceptance->checkoutable_item_type ?? '';
+
+
+        if($unaccepted_row instanceof Asset){
+            $category = optional($unaccepted_row->model?->category?->present())->nameUrl() ?? '';
+            $model = optional($unaccepted_row->present())->modelUrl() ?? '';
+            $name = optional($unaccepted_row->present())->nameUrl() ?? '';
+            $tag = (string) ($unaccepted_row->asset_tag ?? '');
+         }
+        if($unaccepted_row instanceof Accessory){
+            $category = optional($unaccepted_row->category?->present())->nameUrl() ?? '';
+            $model = $unaccepted_row->model_number ?? '';
+            $name = optional($unaccepted_row->present())->nameUrl() ?? '';
+        }
+        if($unaccepted_row instanceof LicenseSeat){
+            $category = optional($unaccepted_row->license->category?->present())->nameUrl() ?? '';
+            $company = optional($unaccepted_row->license->company?->present())?->nameUrl() ?? '';
+            $model = '';
+            $name = $unaccepted_row->license->present()->nameUrl() ?? '';
+        }
+        if($unaccepted_row instanceof Consumable){
+            $category = optional($unaccepted_row->category?->present())->nameUrl() ?? '';
+            $model = $unaccepted_row->model_number ?? '';
+            $name = $unaccepted_row?->present()?->nameUrl() ?? '';
+        }
+        if($unaccepted_row instanceof Component){
+            $category = optional($unaccepted_row->category?->present())->nameUrl() ?? '';
+            $model = $unaccepted_row->model_number ?? '';
+            $name = $unaccepted_row?->present()?->nameUrl()  ?? '';
+        }
+
+        return new self(
+            acceptance_id: $acceptance->id,
+            company: $company,
+            category: $category,
+            model: $model,
+            asset_tag: $tag,
+            name: $name,
+            type: $type,
+            acceptance: $acceptance,
+            assignee: $assignee,
+            //plain text for CSVs
+            plain_text_category: ($unaccepted_row->model?->category?->name ?? $unaccepted_row->license->category?->name ?? $unaccepted_row->category?->name ?? ''),
+            plain_text_model: ($unaccepted_row->model?->name ?? $unaccepted_row->model_number ?? ''),
+            plain_text_name: ($unaccepted_row->name ?? $unaccepted_row->license?->name ?? ''),
+            plain_text_company: ($unaccepted_row->company)->name ?? $unaccepted_row->license->company?->name ?? '',
+        );
+    }
+}

app/Models/Component.php

@@ -5,6 +5,7 @@ namespace App\Models;
 use App\Helpers\Helper;
 use App\Models\Traits\CompanyableTrait;
 use App\Models\Traits\HasUploads;
+use App\Models\Traits\Loggable;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -274,7 +275,19 @@ class Component extends SnipeModel
     {
         return $this->category?->checkin_email;
     }
-
+    /**
+     * Get the list of checkouts for this License
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since  [v2.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function checkouts()
+    {
+        return $this->assetlog()->where('action_type', '=', 'checkout')
+            ->orderBy('created_at', 'desc')
+            ->withTrashed();
+    }
 
     /**
      * Check how many items within a component are remaining

app/Models/Consumable.php

@@ -6,6 +6,7 @@ use App\Helpers\Helper;
 use App\Models\Traits\Acceptable;
 use App\Models\Traits\CompanyableTrait;
 use App\Models\Traits\HasUploads;
+use App\Models\Traits\Loggable;
 use App\Models\Traits\Searchable;
 use App\Presenters\ConsumablePresenter;
 use App\Presenters\Presentable;
@@ -316,6 +317,20 @@ class Consumable extends SnipeModel
 
         return $this->purchase_cost !== null ? $this->qty * $this->purchase_cost : null;
     }
+    /**
+     * Get the list of checkouts for this consumable
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since  [v2.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function checkouts()
+    {
+        return $this->assetlog()->where('action_type', '=', 'checkout')
+            ->orderBy('created_at', 'desc')
+            ->withTrashed();
+    }
+
     /**
      * -----------------------------------------------
      * BEGIN MUTATORS

app/Models/Department.php

@@ -31,10 +31,13 @@ class Department extends SnipeModel
     ];
 
     protected $rules = [
-        'name'                  => 'required|max:255|is_unique_department',
-        'location_id'           => 'numeric|nullable',
-        'company_id'            => 'numeric|nullable',
-        'manager_id'            => 'numeric|nullable',
+        'name'        => 'required|max:255|is_unique_across_company_and_location:departments,name',
+        'location_id' => 'numeric|nullable|exists:locations,id',
+        'company_id'  => 'numeric|nullable|exists:companies,id',
+        'manager_id'  => 'numeric|nullable|exists:users,id',
+        'phone'       => 'string|max:255|nullable',
+        'fax'         => 'string|max:255|nullable',
+        'notes'       => 'string|max:255|nullable',
     ];
 
     /**

app/Models/Group.php

@@ -93,6 +93,9 @@ class Group extends SnipeModel
 
                 if (!is_integer($permission)) {
                     $permissions[$permission] = (int) $value;
+                    if ($permission == 'superuser') {
+                        break;
+                    }
                 } else {
                     \Log::info('Weird data here - skipping it');
                     unset($permissions[$permission]);

app/Models/Labels/Tapes/Brother/TZe_24mm_E.php

@@ -4,15 +4,15 @@ namespace App\Models\Labels\Tapes\Brother;
 
 class TZe_24mm_E extends TZe_24mm
 {
-    private const BARCODE_MARGIN =   1.50;
+    private const BARCODE_MARGIN =   1.75;
     private const TAG_SIZE       =   2.00;
     private const TITLE_SIZE     =   2.80;
     private const TITLE_MARGIN   =   0.50;
     private const LABEL_SIZE     =   2.00;
-    private const LABEL_MARGIN   = - 0.35;
+    private const LABEL_MARGIN   = - 0.75;
     private const FIELD_SIZE     =   2.80;
     private const FIELD_MARGIN   =   0.15;
-    private const BARCODE1D_SIZE = - 1.00;  
+    private const BARCODE1D_SIZE = - 2.25;
 
     public function getUnit()  { return 'mm'; }
     public function getWidth() { return 45.0; }

app/Models/Ldap.php

@@ -104,6 +104,78 @@ class Ldap extends Model
         return $connection;
     }
 
+    /**
+     * Finds user via Admin search *first*, and _then_ try to bind as that user, returning the user attributes on success,
+     * or false on failure. This enables login when the DN is harder to programmatically 'guess' due to having users in
+     * various different OU's or other LDAP entities.
+     */
+    public static function findAndBindMultiOU(string $baseDn, string $filterQuery, string $password, int $slow_failure = 3): array|false
+    {
+        /**
+         *  If you *don't* set the slow_failure variable, do note that we might permit timing attacks in here - if
+         *  your find results come back 'slow' when a user *does* exist, but fast if they *don't* exist, then you
+         *  can use this to enumerate users.
+         *
+         *  Even if that's *not* true, we still might have an issue: if we don't find the user, then we don't even _try_
+         *  to bind as them. Again, that could permit a timing attack.
+         *
+         *  Instead of checking every little thing, we just wrap everything in a try/catch in order to unify the
+         *  'slow_failure' treatment. All failures are re-raised as exceptions so that all failures exit from the
+         *  same place.
+         */
+        $connection = null;
+        $admin_conn = null;
+        try {
+            /**
+             * First we get an 'admin' connection, which will need search permissions. That was already a requirement
+             * here, so that's not a big lift. But it _is_ possible to configure LDAP to only login, and *not* to be
+             * able to import lists of users. In that case, this function *will not work* - and you should use the
+             * legacy 'findAndBindUserLdap' method, below. Otherwise, it looks like this would attempt an anonymous
+             * bind - which you might want, but you probably don't.
+             *
+             **/
+            $admin_conn = self::connectToLdap();
+            self::bindAdminToLdap($admin_conn);
+            $results = ldap_search($admin_conn, $baseDn, $filterQuery);
+            $entry_count = ldap_count_entries($admin_conn, $results);
+            if ($entry_count != 1) {
+                throw new \Exception('Wrong number of entries found: ' . $entry_count);
+            }
+            $entry = ldap_first_entry($admin_conn, $results);
+            $user = ldap_get_attributes($admin_conn, $entry);
+            $userDn = ldap_get_dn($admin_conn, $entry);
+            if (!$userDn) {
+                throw new \Exception("No user DN found");
+            }
+            \Log::debug("FOUND DN IS: $userDn");
+            // The temptation now is to do ldap_unbind on the $admin_conn, but that gets handled in the 'finally' below.
+            // I don't know if that means a separate 'connection' is maintained to the LDAP server or not, and would
+            // definitely prefer to not do that if we can avoid it. But I don't know enough about the LDAP protocol to
+            // be certain that that happens.
+
+            //now we try to log in (bind) as that found user
+            $connection = self::connectToLdap();
+            $bind_results = ldap_bind($connection, $userDn, $password);
+            if (!$bind_results) {
+                throw new \Exception("Unable to bind as user");
+            }
+            return array_change_key_case($user);
+        } catch (\Exception $e) {
+            \Log::debug("Exception on fast find-and-bind: " . $e->getMessage());
+            if ($slow_failure) {
+                sleep($slow_failure);
+            }
+            return false; //TODO - make this null instead for a slightly nicer type signature
+        } finally {
+            if ($admin_conn) {
+                ldap_unbind($admin_conn);
+            }
+            if ($connection) {
+                ldap_unbind($connection);
+            }
+        }
+    }
+
 
     /**
      * Binds/authenticates the user to LDAP, and returns their attributes.
@@ -147,25 +219,27 @@ class Ldap extends Model
 
         Log::debug('Filter query: '.$filterQuery);
 
+        // only try this if we have an Admin username set; otherwise use the 'legacy' method
+        if (($settings->ldap_uname) && ($baseDn)) {
+            // in the fallowing call, we pick a slow-failure of 0 because we might need to fall through to 'legacy'
+            $fast_bind = self::findAndBindMultiOU($baseDn, $filterQuery, $password, 0);
+            if ($fast_bind) {
+                \Log::debug("Fast bind worked");
+                return $fast_bind;
+            }
+            \Log::debug("Fast bind failed; falling through to legacy bind");
+        }
+
         if (! $ldapbind = @ldap_bind($connection, $userDn, $password)) {
             Log::debug("Status of binding user: $userDn to directory: (directly!) ".($ldapbind ? "success" : "FAILURE"));
-            if (! $ldapbind = self::bindAdminToLdap($connection)) {
-                /*
-                 * TODO PLEASE:
-                 *
-                 * this isn't very clear, so it's important to note: the $ldapbind value is never correctly returned - we never 'return true' from self::bindAdminToLdap() (the function
-                 * just "falls off the end" without ever explictly returning 'true')
-                 *
-                 * but it *does* have an interesting side-effect of checking for the LDAP password being incorrectly encrypted with the wrong APP_KEY, so I'm leaving it in for now.
-                 *
-                 * If it *did* correctly return 'true' on a succesful bind, it would _probably_ allow users to log in with an incorrect password. Which would be horrible!
-                 *
-                 * Let's definitely fix this at the next refactor!!!!
-                 *
-                 */
-                Log::debug("Status of binding Admin user: $userDn to directory instead: ".($ldapbind ? "success" : "FAILURE"));
-                return false;
+            // replicate the old bad-decryption-key detection behavior here
+            try {
+                Crypt::decrypt(Setting::getSettings()->ldap_pword);
+            } catch (\Exception $e) {
+                throw new \Exception('Your app key has changed! Could not decrypt LDAP password using your current app key, so LDAP authentication has been disabled. Login with a local account, update the LDAP password and re-enable it in Admin > Settings.');
             }
+            //regardless of anything else; stuff isn't working. Return false.
+            return false;
         }
 
         if (! $results = ldap_search($connection, $baseDn, $filterQuery)) {

app/Models/License.php

@@ -5,6 +5,7 @@ namespace App\Models;
 use App\Helpers\Helper;
 use App\Models\Traits\CompanyableTrait;
 use App\Models\Traits\HasUploads;
+use App\Models\Traits\Loggable;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Carbon\Carbon;
@@ -415,7 +416,12 @@ class License extends Depreciable
         }
         return false;
     }
-
+    public function checkouts()
+    {
+        return $this->assetlog()->where('action_type', '=', 'checkout')
+            ->orderBy('created_at', 'desc')
+            ->withTrashed();
+    }
     /**
      * Determine whether the user should be required to accept the license
      *

app/Models/LicenseSeat.php

@@ -4,6 +4,7 @@ namespace App\Models;
 
 use App\Models\Traits\Acceptable;
 use App\Models\Traits\CompanyableChildTrait;
+use App\Models\Traits\Loggable;
 use App\Notifications\CheckinLicenseNotification;
 use App\Notifications\CheckoutLicenseNotification;
 use App\Presenters\Presentable;
@@ -75,7 +76,7 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild
     protected function displayName(): Attribute
     {
         return Attribute:: make(
-            get: fn(mixed $value) => $this->license->name,
+            get: fn(mixed $value) => $this->license?->name,
         );
     }
 
@@ -134,7 +135,31 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild
 
         return false;
     }
+    /**
+     * Get the list of checkouts for this License
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since  [v2.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function checkouts()
+    {
+        return $this->assetlog()->where('action_type', '=', 'checkout')
+            ->orderBy('created_at', 'desc')
+            ->withTrashed();
+    }
 
+    /**
+     * Establishes the license -> action logs relationship
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since  [v3.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function assetlog()
+    {
+        return $this->hasMany(Actionlog::class, 'item_id')->where('item_type', self::class)->orderBy('created_at', 'desc')->withTrashed();
+    }
     /**
      * Query builder scope to order on department
      *
@@ -152,17 +177,24 @@ class LicenseSeat extends SnipeModel implements ICompanyableChild
     }
 
 
+    public function scopeOrderCompany($query, $order)
+    {
+
+
+        return $query->leftJoin('users as license_seat_users', 'license_seats.assigned_to', '=', 'license_seat_users.id')
+            ->leftJoin('companies as license_user_company', 'license_user_company.id', '=', 'license_seat_users.company_id')
+            ->whereNotNull('license_seats.assigned_to')
+            ->orderBy('license_user_company.name', $order);
+    }
+
+
     public function scopeByAssigned($query)
     {
 
         return $query->where(
             function ($query) {
                 $query->whereNotNull('assigned_to')
-                    ->orWhere(
-                        function ($query) {
-                            $query->whereNotNull('asset_id');
-                        }
-                    );
+                    ->orWhereNotNull('asset_id');
             }
         );
 

app/Models/Location.php

@@ -5,6 +5,7 @@ namespace App\Models;
 use App\Http\Traits\UniqueUndeletedTrait;
 use App\Models\Traits\CompanyableTrait;
 use App\Models\Traits\HasUploads;
+use App\Models\Traits\Loggable;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;

app/Models/Maintenance.php

@@ -5,6 +5,7 @@ namespace App\Models;
 use App\Helpers\Helper;
 use App\Models\Traits\CompanyableChildTrait;
 use App\Models\Traits\HasUploads;
+use App\Models\Traits\Loggable;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;

app/Models/Supplier.php

@@ -3,15 +3,18 @@
 namespace App\Models;
 
 use App\Http\Traits\UniqueUndeletedTrait;
+use App\Models\Traits\HasUploads;
 use App\Models\Traits\Searchable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Watson\Validating\ValidatingTrait;
 use \Illuminate\Database\Eloquent\Relations\Relation;
+use App\Models\Traits\Loggable;
 class Supplier extends SnipeModel
 {
     use HasFactory;
     use SoftDeletes;
+    use HasUploads;
 
     protected $table = 'suppliers';
 
@@ -42,6 +45,7 @@ class Supplier extends SnipeModel
     use ValidatingTrait;
     use UniqueUndeletedTrait;
     use Searchable;
+    use Loggable;
 
     /**
      * The attributes that should be included when searching the model.

app/Models/Traits/Loggable.php

@@ -1,8 +1,14 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Traits;
 
+use App\Models\Actionlog;
+use App\Models\Asset;
+use App\Models\License;
+use App\Models\LicenseSeat;
+use App\Models\Location;
 use App\Models\Setting;
+use App\Models\User;
 use App\Notifications\AuditNotification;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;

app/Models/Traits/Requestable.php

@@ -1,8 +1,10 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Traits;
 
 use Illuminate\Support\Facades\Auth;
+use App\Models\CheckoutRequest;
+use App\Models\User;
 
 // $asset->requests
 // $asset->isRequestedBy($user)

app/Models/User.php

@@ -5,6 +5,7 @@ namespace App\Models;
 use App\Http\Traits\UniqueUndeletedTrait;
 use App\Models\Traits\CompanyableTrait;
 use App\Models\Traits\HasUploads;
+use App\Models\Traits\Loggable;
 use App\Models\Traits\Searchable;
 use App\Presenters\Presentable;
 use App\Presenters\UserPresenter;
@@ -224,15 +225,41 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         return false;
     }
 
+    public function hasIndividualPermissions()
+    {
+        $permissions = [];
+
+        if (is_object($this->permissions)) {
+            $permissions = json_decode(json_encode($this->permissions), true);
+        }
+
+        if (is_string($this->permissions)) {
+            $permissions = json_decode($this->permissions, true);
+        }
+
+        if (($permissions) && (is_array($permissions))) {
+            foreach ($permissions as $permission) {
+                if ($permission != 0) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Internally check the user permission for the given section
      *
      * @return bool
      */
-    protected function checkPermissionSection($section)
+    protected function checkPermissionSection($section, $return_explicit = false)
     {
         $user_groups = $this->groups;
-        if (($this->permissions == '') && (count($user_groups) == 0)) {
+
+
+        // The user has no permissions and is not in any groups
+        if ((($this->permissions == '') || ($this->permissions == 'null')) && (count($user_groups) == 0)) {
             return false;
         }
 
@@ -247,11 +274,14 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         }
 
 
-        $is_user_section_permissions_set = ($user_permissions != '') && array_key_exists($section, $user_permissions);
-        //If the user is explicitly granted, return true
+        $is_user_section_permissions_set = array_key_exists($section, $user_permissions);
+
+
+        // If the user is explicitly granted, return true
         if ($is_user_section_permissions_set && ($user_permissions[$section] == '1')) {
             return true;
         }
+
         // If the user is explicitly denied, return false
         if ($is_user_section_permissions_set && ($user_permissions[$section] == '-1')) {
             return false;
@@ -261,6 +291,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         foreach ($user_groups as $user_group) {
             $group_permissions = (array) json_decode($user_group->permissions, true);
             if (((array_key_exists($section, $group_permissions)) && ($group_permissions[$section] == '1'))) {
+                \Log::debug('user '.$this->id.' is granted '.$section.' permission via group membership');
                 return true;
             }
         }
@@ -268,6 +299,64 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         return false;
     }
 
+    // This gets the permissions including group associations
+
+    public function getEffectivePermissions($return_explicit = false) : array{
+
+        // The user has no permissions and is not in any groups
+        if (($this->permissions == '') || ($this->permissions == 'null')) {
+            return [];
+        }
+
+        $user_permissions = $this->permissions;
+
+        if (is_object($this->permissions)) {
+            $user_permissions = json_decode(json_encode($this->permissions), true);
+        }
+
+        if (is_string($this->permissions)) {
+            $user_permissions = json_decode($this->permissions, true);
+        }
+
+        $effective_permissions_array = [];
+
+        foreach (config('permissions') as $section => $section_permissions) {
+
+            for ($x = 0; $x < count($section_permissions); $x++) {
+               $permission_from_config = $section_permissions[$x]['permission'];
+
+               \Log::debug(print_r($user_permissions, true));
+               if ($user_permissions && array_key_exists($permission_from_config, $user_permissions)) {
+
+                   // If the user has an explicit permission set, use that
+                   if ($return_explicit) {
+
+                       \Log::debug('using explicit');
+                       if ($user_permissions[$permission_from_config] == '1') {
+                           $effective_permissions_array[$permission_from_config] = 'grant';
+                       } elseif ($user_permissions[$permission_from_config] == '-1') {
+                           $effective_permissions_array[$permission_from_config] = 'deny';
+                       } else {
+                           $effective_permissions_array[$permission_from_config] = $this->hasAccess($permission_from_config) ? 'inherit-grant' : 'inherit-deny';
+                           // $effective_permissions_array[$permission_from_config] = 'inherit';
+                       }
+
+                   } else {
+                       $effective_permissions_array[$permission_from_config] = $this->hasAccess($permission_from_config) ? 'grant' : 'deny';
+                   }
+
+               } else {
+                   \Log::debug('fallthrough');
+                   //$effective_permissions_array[$permission_from_config] = 'not in user perms';
+                   $effective_permissions_array[$permission_from_config] = $this->hasAccess($permission_from_config) ? 'inherit-grant' : 'inherit-deny';
+               }
+                // $effective_permissions_array[$permission_from_config] = $this->hasAccess($permission_from_config) ? 1 : 0;
+            }
+        }
+
+        return $effective_permissions_array;
+    }
+
     /**
      * Check user permissions
      *
@@ -278,13 +367,17 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
      * @since  [v1.0]
      * @return bool
      */
-    public function hasAccess($section)
+    public function hasAccess($section, $return_explicit = false)
     {
         if ($this->isSuperUser()) {
             return true;
         }
 
-        return $this->checkPermissionSection($section);
+        if (($section!='superuser') && ($this->isAdmin())) {
+            return true;
+        }
+
+        return $this->checkPermissionSection($section, $return_explicit);
     }
 
     /**

app/Notifications/AcceptanceAssetAcceptedNotification.php

@@ -27,14 +27,13 @@ use Illuminate\Notifications\Notification;
         $this->item_model = $params['item_model'];
         $this->item_serial = $params['item_serial'];
         $this->item_status = $params['item_status'];
-        $this->accepted_date = Helper::getFormattedDateObject($params['accepted_date'], 'datetime', false);
+        $this->accepted_date = $params['accepted_date'];
         $this->assigned_to = $params['assigned_to'];
         $this->company_name = $params['company_name'];
         $this->settings = Setting::getSettings();
         $this->file = $params['file'] ?? null;
         $this->qty = $params['qty'] ?? null;
         $this->note = $params['note'] ?? null;
-        $this->admin = $params['admin'] ?? null;
 
     }
 
@@ -77,7 +76,6 @@ use Illuminate\Notifications\Notification;
                 'accepted_date' => $this->accepted_date,
                 'assigned_to'   => $this->assigned_to,
                 'company_name'  => $this->company_name,
-                'admin'         => $this->admin,
                 'qty' => $this->qty,
                 'intro_text'    => trans('mail.acceptance_asset_accepted'),
             ])

app/Notifications/AcceptanceAssetAcceptedToUserNotification.php

@@ -32,7 +32,6 @@ use Illuminate\Notifications\Notification;
         $this->settings = Setting::getSettings();
         $this->file = $params['file'] ?? null;
         $this->qty = $params['qty'] ?? null;
-        $this->admin = $params['admin'] ?? null;
     }
 
     /**
@@ -70,7 +69,6 @@ use Illuminate\Notifications\Notification;
                 'accepted_date' => $this->accepted_date,
                 'assigned_to'   => $this->assigned_to,
                 'company_name'  => $this->company_name,
-                'admin'         => $this->admin,
                 'qty' => $this->qty,
                 'intro_text'    => trans_choice('mail.acceptance_asset_accepted_to_user', $this->qty, ['qty' => $this->qty, 'site_name' => $this->settings->site_name]),
             ])

app/Notifications/AcceptanceAssetDeclinedNotification.php

@@ -25,12 +25,13 @@ class AcceptanceAssetDeclinedNotification extends Notification
         $this->item_model = $params['item_model'];
         $this->item_serial = $params['item_serial'];
         $this->item_status = $params['item_status'];
-        $this->declined_date = Helper::getFormattedDateObject($params['declined_date'], 'date', false);
+        $this->declined_date = $params['declined_date'];
         $this->note = $params['note'];
         $this->assigned_to = $params['assigned_to'];
         $this->company_name = $params['company_name'];
         $this->settings = Setting::getSettings();
         $this->qty = $params['qty'] ?? null;
+        $this->admin = $params['admin'] ?? null;
     }
 
     /**
@@ -70,7 +71,8 @@ class AcceptanceAssetDeclinedNotification extends Notification
                 'declined_date' => $this->declined_date,
                 'assigned_to'   => $this->assigned_to,
                 'company_name'  => $this->company_name,
-                'qty' => $this->qty,
+                'qty'           => $this->qty,
+                'admin'         => $this->admin,
                 'intro_text'    => trans('mail.acceptance_asset_declined'),
             ])
             ->subject(trans('mail.acceptance_asset_declined'));

app/Notifications/CheckoutAssetNotification.php

@@ -93,8 +93,8 @@ class CheckoutAssetNotification extends Notification
         $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';
 
         $fields = [
-            trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->display_name.'>',
-            trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->display_name.'>',
+            trans('general.to_user') => '<'.$target->present()->viewUrl().'|'.$target->display_name.'>',
+            trans('general.by_user') => '<'.$admin->present()->viewUrl().'|'.$admin->display_name.'>',
         ];
 
         if ($item->location) {

app/Notifications/InventoryAlert.php

@@ -2,10 +2,12 @@
 
 namespace App\Notifications;
 
+use AllowDynamicProperties;
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
 
+#[AllowDynamicProperties]
 class InventoryAlert extends Notification
 {
     use Queueable;
@@ -32,9 +34,8 @@ class InventoryAlert extends Notification
      */
     public function via()
     {
-        $notifyBy = ['mail'];
+       return (!empty($this->items) && $this->threshold !== null) ? ['mail'] : [];
 
-        return $notifyBy;
     }
 
     /**

app/Observers/UserObserver.php

@@ -49,7 +49,8 @@ class UserObserver
             'end_date',
             'autoassign_licenses',
             'vip',
-            'password'
+            'password',
+            'permissions'
         ];
         
         $changed = [];

app/Presenters/ActionlogPresenter.php

@@ -102,7 +102,7 @@ class ActionlogPresenter extends Presenter
             return 'fa-solid fa-rotate-right';
         }
 
-        if ($this->action_type == 'note_added') {
+        if ($this->action_type == 'note added') {
             return 'fas fa-sticky-note';
         }
 

app/Presenters/LicensePresenter.php

@@ -248,10 +248,20 @@ class LicensePresenter extends Presenter
                 'title' => trans('admin/users/table.email'),
                 'visible' => true,
                 'formatter' => 'emailFormatter',
-            ], [
-                'field' => 'department',
+            ],
+            [
+                'field' => 'assigned_user.company',
                 'searchable' => false,
-                'sortable' => true,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('general.company'),
+                'visible' => true,
+                'formatter' => 'companiesLinkObjFormatter',
+            ],
+            [
+                'field' => 'assigned_user.department',
+                'searchable' => false,
+                'sortable' => false,
                 'switchable' => true,
                 'title' => trans('general.department'),
                 'visible' => false,

app/Presenters/UploadedFilesPresenter.php

@@ -12,7 +12,7 @@ class UploadedFilesPresenter extends Presenter
      *
      * @return string
      */
-    public static function dataTableLayout($allow_deletes = true)
+    public static function dataTableLayout()
     {
 
         $layout = [
@@ -84,11 +84,7 @@ class UploadedFilesPresenter extends Presenter
                 'title' => trans('general.created_at'),
                 'visible' => true,
                 'formatter' => 'dateDisplayFormatter',
-            ],
-        ];
-
-        if ($allow_deletes == 'true') {
-            $layout[] = [
+            ], [
                 'field' => 'available_actions',
                 'searchable' => false,
                 'sortable' => false,
@@ -96,8 +92,8 @@ class UploadedFilesPresenter extends Presenter
                 'title' => trans('table.actions'),
                 'visible' => true,
                 'formatter' => 'deleteUploadFormatter',
-            ];
-        }
+            ],
+        ];
 
         return json_encode($layout);
     }

app/Providers/BreadcrumbsServiceProvider.php

@@ -342,7 +342,8 @@ class BreadcrumbsServiceProvider extends ServiceProvider
 
         Breadcrumbs::for('groups.edit', fn (Trail $trail, Group $group) =>
         $trail->parent('groups.index', route('groups.index'))
-            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $group->name]), route('groups.edit', $group))
+            ->push($group->name, route('groups.show', $group))
+            ->push(trans('general.breadcrumb_button_actions.edit'), route('groups.edit', $group))
         );
 
 
@@ -590,7 +591,6 @@ class BreadcrumbsServiceProvider extends ServiceProvider
         );
 
 
-
         Breadcrumbs::for('users.show', fn (Trail $trail, User $user) =>
         $trail->parent('users.index', route('users.index'))
             ->push($user->display_name ?? 'Missing Username!', route('users.show', $user))
@@ -598,6 +598,7 @@ class BreadcrumbsServiceProvider extends ServiceProvider
 
         Breadcrumbs::for('users.edit', fn (Trail $trail, User $user) =>
         $trail->parent('users.index', route('users.index'))
+            ->push($user->display_name, route('users.show', $user))
             ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $user->name]), route('users.edit', $user))
         );
 

app/Providers/ValidationServiceProvider.php

@@ -283,41 +283,36 @@ class ValidationServiceProvider extends ServiceProvider
             }
         });
 
-        Validator::extend('is_unique_department', function ($attribute, $value, $parameters, $validator) {
+        /**
+         * Check that the 'name' field is unique in the table while within both company_id and location_id
+         * This is only used by Departments right now, but could be used elsewhere in the future.
+         */
+        Validator::extend('is_unique_across_company_and_location', function ($attribute, $value, $parameters, $validator) {
             $data = $validator->getData();
+            $table = array_get($parameters, 0);
 
-            if (
-                array_key_exists('location_id', $data) && $data['location_id'] !== null &&
-                array_key_exists('company_id', $data) && $data['company_id'] !== null
-            ) {
-                //for updating existing departments
-                if(array_key_exists('id', $data) && $data['id'] !== null){
-                    $count = Department::where('name', $data['name'])
-                        ->where('location_id', $data['location_id'])
-                        ->where('company_id', $data['company_id'])
-                        ->whereNotNull('company_id')
-                        ->whereNotNull('location_id')
-                        ->where('id', '!=', $data['id'])
-                        ->count('name');
+            $count = DB::table($table)->select($attribute)
+                ->where($attribute, $value)
+                ->whereNull('deleted_at');
 
-                    return $count < 1;
-                }else // for entering in new departments
-                {
-                $count = Department::where('name', $data['name'])
-                    ->where('location_id', $data['location_id'])
-                    ->where('company_id', $data['company_id'])
-                    ->whereNotNull('company_id')
-                    ->whereNotNull('location_id')
-                    ->count('name');
-
-                return $count < 1;
+            if (array_key_exists('id', $data) && $data['id'] !== null) {
+                $count = $count->where('id', '!=', $data['id']);
             }
-        }
-            else {
-                return true;
-        }
+
+            if (array_key_exists('location_id', $data) && $data['location_id'] !== null) {
+                $count = $count->where('location_id', $data['location_id']);
+            }
+
+            if (array_key_exists('company_id', $data) && $data['company_id'] !== null) {
+                $count = $count->where('company_id', $data['company_id']);
+            }
+
+            $count = $count->count('name');
+            return $count < 1;
+
         });
 
+
         Validator::extend('not_array', function ($attribute, $value, $parameters, $validator) {
             return !is_array($value);
         });

app/View/Label.php

@@ -140,18 +140,32 @@ class Label implements View
             if ($template->getSupport2DBarcode()) {
                     $barcode2DType = $settings->label2_2d_type;
                 if (($barcode2DType != 'none') && (!is_null($barcode2DType))) {
+
+                    $label2_2d_prefix = $settings->label2_2d_prefix ? e($settings->label2_2d_prefix) : '';
                         switch ($settings->label2_2d_target) {
                             case 'ht_tag': 
                                 $barcode2DTarget = route('ht/assetTag', $asset->asset_tag); 
                                 break;
                             case 'plain_asset_id': 
-                                $barcode2DTarget = (string) $asset->id; 
+                                $barcode2DTarget = $label2_2d_prefix.(string) $asset->id;
                                 break;
                             case 'plain_asset_tag': 
-                                $barcode2DTarget = $asset->asset_tag; 
+                                $barcode2DTarget = $label2_2d_prefix.$asset->asset_tag;
                                 break;
                             case 'plain_serial_number': 
-                                $barcode2DTarget = $asset->serial; 
+                                $barcode2DTarget = $label2_2d_prefix.$asset->serial;
+                                break;
+                            case 'plain_model_number':
+                                $barcode2DTarget = $label2_2d_prefix.$asset->model->model_number ?? '';
+                                break;
+                            case 'plain_model_name':
+                                $barcode2DTarget = $label2_2d_prefix.$asset->model->display_name ?? '';
+                                break;
+                            case 'plain_manufacturer_name':
+                                $barcode2DTarget = $label2_2d_prefix.$asset->model->display_name;
+                                break;
+                            case 'plain_location_name':
+                                $barcode2DTarget = $label2_2d_prefix.$asset->location->name;
                                 break;
                             case 'location':
                                 $barcode2DTarget = $asset->location_id

config/database.php

@@ -18,9 +18,10 @@ $dump_options = [
     //'add_extra_option' => '--optionname=optionvalue',
 ];
 
-// Some versions of mysql do not support the --skip-ssl option and will fail if it is even set
+// For modern versions of mysqldump, use --ssl-mode=DISABLED
 if (env('DB_DUMP_SKIP_SSL') == 'true') {
-    $dump_options['skip_ssl'] = true;
+    // Correctly add the option as a string to the 'add_extra_option' key.
+    $dump_options['add_extra_option'] = '--ssl-mode=DISABLED';
 }
 
 

config/permissions.php

@@ -9,11 +9,9 @@
 
 return [
 
-    'Global' => [
+    'Superuser' => [
         [
             'permission' => 'superuser',
-            'label'      => 'Super User',
-            'note'       => 'Determines whether the user has full access to all aspects of the admin. This setting overrides any more specific permissions throughout the system. ',
             'display'    => true,
         ],
     ],
@@ -21,17 +19,13 @@ return [
     'Admin' => [
         [
             'permission' => 'admin',
-            'label'      => '',
-            'note'       => 'Determines whether the user has access to most aspects of the admin. ',
             'display'    => true,
         ],
     ],
 
-    'CSV Import' => [
+    'Import' => [
         [
             'permission' => 'import',
-            'label'      => '',
-            'note'       => 'This will allow users to import even if access to users, assets, etc is denied elsewhere.',
             'display'    => true,
         ],
     ],
@@ -39,8 +33,6 @@ return [
     'Reports' => [
         [
             'permission' => 'reports.view',
-            'label'      => 'View',
-            'note'       => 'Determines whether the user has the ability to view reports.',
             'display'    => true,
         ],
     ],
@@ -48,68 +40,48 @@ return [
     'Assets' => [
         [
             'permission' => 'assets.view',
-            'label'      => 'View ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'assets.create',
-            'label'      => 'Create ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'assets.edit',
-            'label'      => 'Edit  ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'assets.delete',
-            'label'      => 'Delete ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'assets.checkout',
-            'label'      => 'Checkout ',
-            'note'       => '',
             'display'    => false,
         ],
 
         [
             'permission' => 'assets.checkin',
-            'label'      => 'Checkin ',
-            'note'       => '',
             'display'    => true,
         ],
 
         [
             'permission' => 'assets.checkout',
-            'label'      => 'Checkout ',
-            'note'       => '',
             'display'    => true,
         ],
 
         [
             'permission' => 'assets.audit',
-            'label'      => 'Audit ',
-            'note'       => 'Allows the user to mark an asset as physically inventoried.',
             'display'    => true,
         ],
 
 
         [
             'permission' => 'assets.view.requestable',
-            'label'      => 'View Requestable Assets',
-            'note'       => '',
             'display'    => true,
         ],
 
         [
             'permission' => 'assets.view.encrypted_custom_fields',
-            'label'      => 'View and Modify Encrypted Custom Fields',
-            'note'       => '',
             'display'    => true,
         ],
 
@@ -118,44 +90,30 @@ return [
     'Accessories' => [
         [
             'permission' => 'accessories.view',
-            'label'      => 'View ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'accessories.create',
-            'label'      => 'Create ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'accessories.edit',
-            'label'      => 'Edit ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'accessories.delete',
-            'label'      => 'Delete ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'accessories.checkout',
-            'label'      => 'Checkout ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'accessories.checkin',
-            'label'      => 'Checkin ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'accessories.files',
-            'label'      => 'View and Modify Accessory Files',
-            'note'       => '',
             'display'    => true,
         ],
 
@@ -164,38 +122,26 @@ return [
     'Consumables' => [
         [
             'permission' => 'consumables.view',
-            'label'      => 'View',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'consumables.create',
-            'label'      => 'Create ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'consumables.edit',
-            'label'      => 'Edit ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'consumables.delete',
-            'label'      => 'Delete ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'consumables.checkout',
-            'label'      => 'Checkout ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'consumables.files',
-            'label'      => 'View and Modify Consumable Files',
-            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -204,50 +150,34 @@ return [
     'Licenses' => [
         [
             'permission' => 'licenses.view',
-            'label'      => 'View',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'licenses.create',
-            'label'      => 'Create ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'licenses.edit',
-            'label'      => 'Edit ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'licenses.delete',
-            'label'      => 'Delete ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'licenses.checkout',
-            'label'      => 'Checkout ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'licenses.checkin',
-            'label'      => 'Checkin ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'licenses.keys',
-            'label'      => 'View License Keys',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'licenses.files',
-            'label'      => 'View and Modify License Files',
-            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -256,44 +186,30 @@ return [
     'Components' => [
         [
             'permission' => 'components.view',
-            'label'      => 'View',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'components.create',
-            'label'      => 'Create ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'components.edit',
-            'label'      => 'Edit ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'components.delete',
-            'label'      => 'Delete ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'components.checkout',
-            'label'      => 'Checkout ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'components.checkin',
-            'label'      => 'Checkin ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'components.files',
-            'label'      => 'View and Modify Component Files',
-            'note'       => '',
             'display'    => true,
         ],
 
@@ -302,26 +218,18 @@ return [
     'Kits' => [
         [
             'permission' => 'kits.view',
-            'label'      => 'View ',
-            'note'       => 'These are predefined kits that can be used to quickly checkout assets, licenses, etc.',
             'display'    => true,
         ],
         [
             'permission' => 'kits.create',
-            'label'      => 'Create ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'kits.edit',
-            'label'      => 'Edit  ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'kits.delete',
-            'label'      => 'Delete ',
-            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -329,26 +237,18 @@ return [
     'Users' => [
         [
             'permission' => 'users.view',
-            'label'      => 'View ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'users.create',
-            'label'      => 'Create Users',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'users.edit',
-            'label'      => 'Edit Users',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'users.delete',
-            'label'      => 'Delete Users',
-            'note'       => '',
             'display'    => true,
         ],
 
@@ -357,26 +257,18 @@ return [
     'Models' => [
         [
             'permission' => 'models.view',
-            'label'      => 'View ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'models.create',
-            'label'      => 'Create ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'models.edit',
-            'label'      => 'Edit  ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'models.delete',
-            'label'      => 'Delete ',
-            'note'       => '',
             'display'    => true,
         ],
 
@@ -385,26 +277,18 @@ return [
     'Categories' => [
         [
             'permission' => 'categories.view',
-            'label'      => 'View ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'categories.create',
-            'label'      => 'Create ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'categories.edit',
-            'label'      => 'Edit  ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'categories.delete',
-            'label'      => 'Delete ',
-            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -412,26 +296,18 @@ return [
     'Departments' => [
         [
             'permission' => 'departments.view',
-            'label'      => 'View ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'departments.create',
-            'label'      => 'Create ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'departments.edit',
-            'label'      => 'Edit  ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'departments.delete',
-            'label'      => 'Delete ',
-            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -439,26 +315,18 @@ return [
     'Status Labels' => [
         [
             'permission' => 'statuslabels.view',
-            'label'      => 'View ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'statuslabels.create',
-            'label'      => 'Create ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'statuslabels.edit',
-            'label'      => 'Edit  ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'statuslabels.delete',
-            'label'      => 'Delete ',
-            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -466,26 +334,18 @@ return [
     'Custom Fields' => [
         [
             'permission' => 'customfields.view',
-            'label'      => 'View',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'customfields.create',
-            'label'      => 'Create',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'customfields.edit',
-            'label'      => 'Edit',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'customfields.delete',
-            'label'      => 'Delete',
-            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -493,26 +353,18 @@ return [
     'Suppliers' => [
         [
             'permission' => 'suppliers.view',
-            'label'      => 'View ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'suppliers.create',
-            'label'      => 'Create ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'suppliers.edit',
-            'label'      => 'Edit  ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'suppliers.delete',
-            'label'      => 'Delete ',
-            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -521,26 +373,18 @@ return [
     'Manufacturers' => [
         [
             'permission' => 'manufacturers.view',
-            'label'      => 'View ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'manufacturers.create',
-            'label'      => 'Create ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'manufacturers.edit',
-            'label'      => 'Edit  ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'manufacturers.delete',
-            'label'      => 'Delete ',
-            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -548,26 +392,18 @@ return [
     'Depreciations' => [
         [
             'permission' => 'depreciations.view',
-            'label'      => 'View ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'depreciations.create',
-            'label'      => 'Create ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'depreciations.edit',
-            'label'      => 'Edit  ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'depreciations.delete',
-            'label'      => 'Delete ',
-            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -575,26 +411,18 @@ return [
     'Locations' => [
         [
             'permission' => 'locations.view',
-            'label'      => 'View ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'locations.create',
-            'label'      => 'Create ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'locations.edit',
-            'label'      => 'Edit  ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'locations.delete',
-            'label'      => 'Delete ',
-            'note'       => '',
             'display'    => true,
         ],
     ],
@@ -602,66 +430,46 @@ return [
     'Companies' => [
         [
             'permission' => 'companies.view',
-            'label'      => 'View ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'companies.create',
-            'label'      => 'Create ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'companies.edit',
-            'label'      => 'Edit  ',
-            'note'       => '',
             'display'    => true,
         ],
         [
             'permission' => 'companies.delete',
-            'label'      => 'Delete ',
-            'note'       => '',
             'display'    => true,
         ],
     ],
 
 
-
-
-    'Self' => [
+    'User (Self) Accounts' => [
         [
             'permission' => 'self.two_factor',
-            'label'      => 'Two-Factor Authentication',
-            'note'       => 'The user may disable/enable two-factor authentication themselves if two-factor is enabled and set to selective.',
             'display'    => true,
         ],
 
         [
             'permission' => 'self.api',
-            'label'      => 'Create API Keys',
-            'note'       => 'The user create personal API keys to utilize the REST API.',
             'display'    => true,
         ],
 
         [
             'permission' => 'self.edit_location',
-            'label'      => 'Profile Edit Location',
-            'note'       => 'The user may update their own location in their profile. Note that this is not affected by any additional Users permissions you grant to this user or group.',
             'display'    => true,
         ],
 
         [
             'permission' => 'self.checkout_assets',
-            'label'      => 'Self-Checkout',
-            'note'       => 'This user may check out assets that are marked for self-checkout.',
             'display'    => true,
         ],
 
         [
             'permission' => 'self.view_purchase_cost',
-            'label'      => 'View Purchase-Cost Column',
-            'note'       => 'This user can see the purchase cost column of items assigned to them.',
             'display'    => true,
         ],
 

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v8.3.4',
-  'full_app_version' => 'v8.3.4 - build 20218-g3ab2e2011',
-  'build_version' => '20218',
+  'app_version' => 'v8.3.5',
+  'full_app_version' => 'v8.3.5 - build 20406-gf92f76b48',
+  'build_version' => '20406',
   'prerelease_version' => '',
-  'hash_version' => 'g3ab2e2011',
-  'full_hash' => 'v8.3.4-149-g3ab2e2011',
+  'hash_version' => 'gf92f76b48',
+  'full_hash' => 'v8.3.5-183-gf92f76b48',
   'branch' => 'develop',
 );

database/migrations/2025_10_22_144927_migrate_incorrect_action_types.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+
+        /**
+         * We actually *do* have an index on action_type, so this query shouldn't take too terribly long. I don't know
+         * that we have a ton of people canceling requests (and only certain types of request-cancellation use this
+         * erroneous action_type), so I feel pretty comfortable with this fixup. Fingers crossed!
+         * */
+
+        DB::table('action_logs')->where('action_type', 'request_canceled')->update(['action_type' => 'request canceled']);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        // no down migration for this one
+    }
+};

database/migrations/2025_11_04_173713_add_2d_label_prefix.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            if (!Schema::hasColumn('settings', 'label2_2d_prefix')) {
+                $table->char('label2_2d_prefix', 191)->after('label2_2d_type')->nullable()->default(null);
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            if (Schema::hasColumn('settings', 'label2_2d_prefix')) {
+                $table->dropColumn('label2_2d_prefix');
+            }
+        });
+    }
+};

database/migrations/2025_11_10_205136_change_suppliers_notes_to_text.php

@@ -0,0 +1,26 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('suppliers', function (Blueprint $table) {
+            $table->text('notes')->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+
+    }
+};

database/migrations/2025_11_10_211219_change_suppliers_notes_to_nullable.php

@@ -0,0 +1,26 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('suppliers', function (Blueprint $table) {
+            $table->text('notes')->nullable()->default(null)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+
+    }
+};

database/seeders/UserSeeder.php

@@ -68,7 +68,7 @@ class UserSeeder extends Seeder
             ]))
             ->create();
 
-        User::factory()->count(50)->viewAssets()
+        User::factory()->count(2000)->viewAssets()
             ->state(new Sequence(fn($sequence) => [
                 'company_id' => $companyIds->random(),
                 'department_id' => $departmentIds->random(),

public/css/build/app.css

@@ -1433,9 +1433,6 @@ input[type="radio"]:checked::before {
 .bootstrap-table .fixed-table-container .table tbody tr .card-view {
   display: table-row !important;
 }
-.form-control-static {
-  padding-top: 0px;
-}
 td.text-right.text-padding-number-cell {
   padding-right: 30px !important;
   white-space: nowrap;
@@ -1512,6 +1509,7 @@ input[name="columnsSearch"] {
   border-radius: 0px;
 }
 .callout.callout-legend h4 {
+  color: #333;
   font-size: 16px;
   font-weight: bold;
   margin-top: 5px;
@@ -1523,6 +1521,7 @@ input[name="columnsSearch"] {
   cursor: pointer;
 }
 p.callout-subtext {
+  color: #333;
   margin-top: 5px;
 }
 p.callout-subtext a:hover,
@@ -1537,6 +1536,67 @@ This just hides the padding on the right side of the mark tag for a less weird v
 mark {
   padding-right: 0px;
 }
+/**
+Radio toggle styles for permission settings and check/uncheck all
+ */
+.radio-toggle-wrapper {
+  display: flex;
+  padding: 2px;
+  background-color: #e9e9e9;
+  margin-bottom: 3px;
+  border-radius: 4px;
+  border: 1px #d6d6d6 solid;
+}
+.radio-slider-inputs {
+  flex-grow: 1;
+}
+.radio-slider-inputs input[type=radio] {
+  display: none;
+}
+.radio-slider-inputs label {
+  display: block;
+  margin-bottom: 0px;
+  padding: 6px 8px;
+  color: #fff;
+  font-weight: bold;
+  text-align: center;
+  transition: all 0.4s 0s ease;
+  cursor: pointer;
+}
+.radio-slider-inputs label {
+  color: #9a9999;
+  border-radius: 4px;
+  border: 1px transparent solid;
+}
+.radio-slider-inputs .allow:checked + label {
+  background-color: green;
+  color: white;
+  border-radius: 4px;
+  border: 1px transparent solid;
+}
+.radio-slider-inputs .inherit:checked + label {
+  background-color: rgba(255, 204, 51, 0.11);
+  color: #9a9999;
+  border-radius: 4px;
+  border: 1px white solid;
+}
+.radio-slider-inputs .deny:checked + label {
+  background-color: #a94442;
+  color: white;
+  border-radius: 4px;
+  border: 1px transparent solid;
+}
+.remember-toggle {
+  cursor: pointer;
+}
+.js-copy-link {
+  color: grey;
+}
+.label {
+  font-size: 11px;
+  line-height: 22px;
+  margin-left: 5px;
+}
 
 
 /*# sourceMappingURL=app.css.map*/

public/css/build/overrides.css

@@ -1057,9 +1057,6 @@ input[type="radio"]:checked::before {
 .bootstrap-table .fixed-table-container .table tbody tr .card-view {
   display: table-row !important;
 }
-.form-control-static {
-  padding-top: 0px;
-}
 td.text-right.text-padding-number-cell {
   padding-right: 30px !important;
   white-space: nowrap;
@@ -1136,6 +1133,7 @@ input[name="columnsSearch"] {
   border-radius: 0px;
 }
 .callout.callout-legend h4 {
+  color: #333;
   font-size: 16px;
   font-weight: bold;
   margin-top: 5px;
@@ -1147,6 +1145,7 @@ input[name="columnsSearch"] {
   cursor: pointer;
 }
 p.callout-subtext {
+  color: #333;
   margin-top: 5px;
 }
 p.callout-subtext a:hover,
@@ -1161,6 +1160,67 @@ This just hides the padding on the right side of the mark tag for a less weird v
 mark {
   padding-right: 0px;
 }
+/**
+Radio toggle styles for permission settings and check/uncheck all
+ */
+.radio-toggle-wrapper {
+  display: flex;
+  padding: 2px;
+  background-color: #e9e9e9;
+  margin-bottom: 3px;
+  border-radius: 4px;
+  border: 1px #d6d6d6 solid;
+}
+.radio-slider-inputs {
+  flex-grow: 1;
+}
+.radio-slider-inputs input[type=radio] {
+  display: none;
+}
+.radio-slider-inputs label {
+  display: block;
+  margin-bottom: 0px;
+  padding: 6px 8px;
+  color: #fff;
+  font-weight: bold;
+  text-align: center;
+  transition: all 0.4s 0s ease;
+  cursor: pointer;
+}
+.radio-slider-inputs label {
+  color: #9a9999;
+  border-radius: 4px;
+  border: 1px transparent solid;
+}
+.radio-slider-inputs .allow:checked + label {
+  background-color: green;
+  color: white;
+  border-radius: 4px;
+  border: 1px transparent solid;
+}
+.radio-slider-inputs .inherit:checked + label {
+  background-color: rgba(255, 204, 51, 0.11);
+  color: #9a9999;
+  border-radius: 4px;
+  border: 1px white solid;
+}
+.radio-slider-inputs .deny:checked + label {
+  background-color: #a94442;
+  color: white;
+  border-radius: 4px;
+  border: 1px transparent solid;
+}
+.remember-toggle {
+  cursor: pointer;
+}
+.js-copy-link {
+  color: grey;
+}
+.label {
+  font-size: 11px;
+  line-height: 22px;
+  margin-left: 5px;
+}
 
 
 /*# sourceMappingURL=overrides.css.map*/

public/css/dist/all.css

@@ -22769,9 +22769,6 @@ input[type="radio"]:checked::before {
 .bootstrap-table .fixed-table-container .table tbody tr .card-view {
   display: table-row !important;
 }
-.form-control-static {
-  padding-top: 0px;
-}
 td.text-right.text-padding-number-cell {
   padding-right: 30px !important;
   white-space: nowrap;
@@ -22848,6 +22845,7 @@ input[name="columnsSearch"] {
   border-radius: 0px;
 }
 .callout.callout-legend h4 {
+  color: #333;
   font-size: 16px;
   font-weight: bold;
   margin-top: 5px;
@@ -22859,6 +22857,7 @@ input[name="columnsSearch"] {
   cursor: pointer;
 }
 p.callout-subtext {
+  color: #333;
   margin-top: 5px;
 }
 p.callout-subtext a:hover,
@@ -22873,6 +22872,67 @@ This just hides the padding on the right side of the mark tag for a less weird v
 mark {
   padding-right: 0px;
 }
+/**
+Radio toggle styles for permission settings and check/uncheck all
+ */
+.radio-toggle-wrapper {
+  display: flex;
+  padding: 2px;
+  background-color: #e9e9e9;
+  margin-bottom: 3px;
+  border-radius: 4px;
+  border: 1px #d6d6d6 solid;
+}
+.radio-slider-inputs {
+  flex-grow: 1;
+}
+.radio-slider-inputs input[type=radio] {
+  display: none;
+}
+.radio-slider-inputs label {
+  display: block;
+  margin-bottom: 0px;
+  padding: 6px 8px;
+  color: #fff;
+  font-weight: bold;
+  text-align: center;
+  transition: all 0.4s 0s ease;
+  cursor: pointer;
+}
+.radio-slider-inputs label {
+  color: #9a9999;
+  border-radius: 4px;
+  border: 1px transparent solid;
+}
+.radio-slider-inputs .allow:checked + label {
+  background-color: green;
+  color: white;
+  border-radius: 4px;
+  border: 1px transparent solid;
+}
+.radio-slider-inputs .inherit:checked + label {
+  background-color: rgba(255, 204, 51, 0.11);
+  color: #9a9999;
+  border-radius: 4px;
+  border: 1px white solid;
+}
+.radio-slider-inputs .deny:checked + label {
+  background-color: #a94442;
+  color: white;
+  border-radius: 4px;
+  border: 1px transparent solid;
+}
+.remember-toggle {
+  cursor: pointer;
+}
+.js-copy-link {
+  color: grey;
+}
+.label {
+  font-size: 11px;
+  line-height: 22px;
+  margin-left: 5px;
+}
 
 
 /*# sourceMappingURL=app.css.map*/
@@ -24417,9 +24477,6 @@ input[type="radio"]:checked::before {
 .bootstrap-table .fixed-table-container .table tbody tr .card-view {
   display: table-row !important;
 }
-.form-control-static {
-  padding-top: 0px;
-}
 td.text-right.text-padding-number-cell {
   padding-right: 30px !important;
   white-space: nowrap;
@@ -24496,6 +24553,7 @@ input[name="columnsSearch"] {
   border-radius: 0px;
 }
 .callout.callout-legend h4 {
+  color: #333;
   font-size: 16px;
   font-weight: bold;
   margin-top: 5px;
@@ -24507,6 +24565,7 @@ input[name="columnsSearch"] {
   cursor: pointer;
 }
 p.callout-subtext {
+  color: #333;
   margin-top: 5px;
 }
 p.callout-subtext a:hover,
@@ -24521,6 +24580,67 @@ This just hides the padding on the right side of the mark tag for a less weird v
 mark {
   padding-right: 0px;
 }
+/**
+Radio toggle styles for permission settings and check/uncheck all
+ */
+.radio-toggle-wrapper {
+  display: flex;
+  padding: 2px;
+  background-color: #e9e9e9;
+  margin-bottom: 3px;
+  border-radius: 4px;
+  border: 1px #d6d6d6 solid;
+}
+.radio-slider-inputs {
+  flex-grow: 1;
+}
+.radio-slider-inputs input[type=radio] {
+  display: none;
+}
+.radio-slider-inputs label {
+  display: block;
+  margin-bottom: 0px;
+  padding: 6px 8px;
+  color: #fff;
+  font-weight: bold;
+  text-align: center;
+  transition: all 0.4s 0s ease;
+  cursor: pointer;
+}
+.radio-slider-inputs label {
+  color: #9a9999;
+  border-radius: 4px;
+  border: 1px transparent solid;
+}
+.radio-slider-inputs .allow:checked + label {
+  background-color: green;
+  color: white;
+  border-radius: 4px;
+  border: 1px transparent solid;
+}
+.radio-slider-inputs .inherit:checked + label {
+  background-color: rgba(255, 204, 51, 0.11);
+  color: #9a9999;
+  border-radius: 4px;
+  border: 1px white solid;
+}
+.radio-slider-inputs .deny:checked + label {
+  background-color: #a94442;
+  color: white;
+  border-radius: 4px;
+  border: 1px transparent solid;
+}
+.remember-toggle {
+  cursor: pointer;
+}
+.js-copy-link {
+  color: grey;
+}
+.label {
+  font-size: 11px;
+  line-height: 22px;
+  margin-left: 5px;
+}
 
 
 /*# sourceMappingURL=overrides.css.map*/

public/css/dist/skins/_all-skins.css

@@ -378,6 +378,9 @@ a.btn-danger:visited {
   background-color: #000000;
   color: #fff;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */
@@ -1181,6 +1184,9 @@ a.label.label-default:hover {
   background-color: #173648;
   color: #fff;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */
@@ -2171,6 +2177,9 @@ a:visited {
   background-color: #000d07;
   color: #FFF;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */
@@ -2696,6 +2705,9 @@ a:visited {
   background-color: #663800;
   color: #fff;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */
@@ -3427,6 +3439,9 @@ a.btn-danger:visited {
   background-color: #272546;
   color: #fff;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */
@@ -4175,6 +4190,9 @@ a.btn-danger:visited {
   background-color: #6b1c12;
   color: #fff;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */
@@ -5113,6 +5131,9 @@ a:visited {
   background-color: var(--hover-link);
   color: #545454;
 }
+.btn-info {
+  border-color: #fff;
+}
 a.actions {
   color: #fff !important;
 }

public/css/dist/skins/_all-skins.min.css

@@ -378,6 +378,9 @@ a.btn-danger:visited {
   background-color: #000000;
   color: #fff;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */
@@ -1181,6 +1184,9 @@ a.label.label-default:hover {
   background-color: #173648;
   color: #fff;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */
@@ -2171,6 +2177,9 @@ a:visited {
   background-color: #000d07;
   color: #FFF;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */
@@ -2696,6 +2705,9 @@ a:visited {
   background-color: #663800;
   color: #fff;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */
@@ -3427,6 +3439,9 @@ a.btn-danger:visited {
   background-color: #272546;
   color: #fff;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */
@@ -4175,6 +4190,9 @@ a.btn-danger:visited {
   background-color: #6b1c12;
   color: #fff;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */
@@ -5113,6 +5131,9 @@ a:visited {
   background-color: var(--hover-link);
   color: #545454;
 }
+.btn-info {
+  border-color: #fff;
+}
 a.actions {
   color: #fff !important;
 }

public/css/dist/skins/skin-black-dark.css

@@ -160,6 +160,9 @@
   background-color: #000000;
   color: #fff;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */

public/css/dist/skins/skin-black-dark.min.css

@@ -160,6 +160,9 @@
   background-color: #000000;
   color: #fff;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */

public/css/dist/skins/skin-blue-dark.css

@@ -155,6 +155,9 @@
   background-color: #173648;
   color: #fff;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */

public/css/dist/skins/skin-blue-dark.min.css

@@ -155,6 +155,9 @@
   background-color: #173648;
   color: #fff;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */

public/css/dist/skins/skin-green-dark.css

@@ -155,6 +155,9 @@
   background-color: #000d07;
   color: #FFF;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */

public/css/dist/skins/skin-green-dark.min.css

@@ -155,6 +155,9 @@
   background-color: #000d07;
   color: #FFF;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */

public/css/dist/skins/skin-orange-dark.css

@@ -155,6 +155,9 @@
   background-color: #663800;
   color: #fff;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */

public/css/dist/skins/skin-orange-dark.min.css

@@ -155,6 +155,9 @@
   background-color: #663800;
   color: #fff;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */

public/css/dist/skins/skin-purple-dark.css

@@ -155,6 +155,9 @@
   background-color: #272546;
   color: #fff;
 }
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
  */