Bumped version

Merge remote-tracking branch 'origin/develop'
Updated language files
2025-11-10 13:49:26 +00:00 · 2025-11-07 13:42:04 +00:00 · 2025-11-07 13:41:46 +00:00 · 2025-11-07 13:26:23 +00:00 · 2025-11-07 13:25:45 +00:00 · 2025-11-07 13:21:52 +00:00
881 changed files with 37809 additions and 3481 deletions
@@ -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
@@ -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: |
@@ -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: |
@@ -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: |
@@ -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');
@@ -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.');
+        }
+
+
+
    }
 }
@@ -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');

@@ -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':
@@ -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') {


@@ -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()));
@@ -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',
                ];

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

@@ -45,6 +45,7 @@ abstract class Controller extends BaseController
        'accessories' => Accessory::class,
        'maintenances' => Maintenance::class,
        'assets' => Asset::class,
+        'audits' => Asset::class,
        'components' => Component::class,
        'consumables' => Consumable::class,
        'hardware' => Asset::class,
@@ -58,6 +59,7 @@ abstract class Controller extends BaseController
        'accessories' => 'private_uploads/accessories/',
        'maintenances' => 'private_uploads/maintenances/',
        'assets' => 'private_uploads/assets/',
+        'audits' => 'private_uploads/audits/',
        'components' => 'private_uploads/components/',
        'consumables' => 'private_uploads/consumables/',
        'hardware' => 'private_uploads/assets/',
@@ -71,6 +73,7 @@ abstract class Controller extends BaseController
        'accessories' => 'accessory',
        'maintenances' => 'maintenance',
        'assets' => 'asset',
+        'audits' => 'audits',
        'components' => 'component',
        'consumables' => 'consumable',
        'hardware' => 'asset',
@@ -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'));
            }

@@ -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');
@@ -109,7 +109,7 @@ class SettingsSamlRequest extends FormRequest
                ];

                $pkey = openssl_pkey_new([
-                    'private_key_bits' => config('app.saml_key_size'),
+                    'private_key_bits' => (int) config('app.saml_key_size'),
                    'private_key_type' => OPENSSL_KEYTYPE_RSA,
                ]);

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

@@ -149,6 +149,7 @@ class ActionlogsTransformer
                    'filename' => $actionlog->filename,
                    'inlineable' => StorageHelper::allowSafeInline($actionlog->uploads_file_path()),
                    'exists_on_disk' => Storage::exists($actionlog->uploads_file_path()) ? true : false,
+                    'mediatype' => StorageHelper::getMediaType($actionlog->uploads_file_path()),
                ] : null,

            'item' => ($actionlog->item) ? [
@@ -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,
@@ -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'),
@@ -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) ? [
@@ -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));
@@ -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;
-    }
 }
@@ -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]));
@@ -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
@@ -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,
            ],
        );
    }
@@ -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;
@@ -360,7 +360,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;

@@ -478,6 +478,10 @@ class Actionlog extends SnipeModel
            $object = 'models';
        }

+        if ($this->action_type == 'audit') {
+            $object = 'audits';
+        }
+
        return route('ui.files.show', [
            'object_type' => $object,
            'id' => $this->item_id,
@@ -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();
    }


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

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

@@ -152,17 +153,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');
            }
        );

@@ -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;
@@ -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;
@@ -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;
@@ -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)
@@ -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,6 +225,29 @@ 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
     *
@@ -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'),
            ])
@@ -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]),
            ])
@@ -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'));
@@ -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) {
@@ -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;
    }

    /**
@@ -49,7 +49,8 @@ class UserObserver
            'end_date',
            'autoassign_licenses',
            'vip',
-            'password'
+            'password',
+            'permissions'
        ];
        
        $changed = [];
@@ -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,
@@ -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);
        });
@@ -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
@@ -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';
 }


@@ -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,
        ],

@@ -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' => 'master',
 );
@@ -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');
+            }
+        });
+    }
+};
@@ -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(),
@@ -1,25 +1,25 @@
 {
-    "/js/dist/all.js": "/js/dist/all.js?id=5c191843e0bb9292ec6b7f0a3c5765b3",
-    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=bf1a348eae3e60c62b8879953f7df14c",
-    "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=f712d11cfca345b58c1d8a35df03d38d",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=fec94887d3bd4899176e7172e315c961",
-    "/css/build/app.css": "/css/build/app.css?id=1b2aad9b78c526c9ac324a147a4848e6",
+    "/js/dist/all.js": "/js/dist/all.js?id=a84550e1cfe57870332e6a2e1b605707",
+    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=8d861085664e18a1407cce2d29762fa4",
+    "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=2fea629e70002a51fb241703dd09371c",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=dee88c73824aa75c0a01ecdc744b3095",
+    "/css/build/app.css": "/css/build/app.css?id=de48355100918a6ea593b6152964f15e",
    "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=bdf169bc2141f453390614c138cdce95",
    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=e1e6e1c64cf14fc350585aaeb0e42f6b",
-    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=08ae1b3e66008966ce5d600ea3ad04a2",
+    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=69b5b9e2ae359f2871b8d6676d0a63f1",
    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=fe8365eda6947fae76b6891d8de23e57",
-    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=4177acfe78a6a808fa7054cf99a93387",
+    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=ed73641edda768c85446aef73246e636",
    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=0853b7f7da3d6bfda0738df5574d9892",
-    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=4bf29ed9f4b511b23eb9f5647371622c",
+    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=02ce0e67061be4447046ecb16301050f",
    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=23f6b19fc0add02e020cbb9e4f6f9272",
-    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=71905ff04c78d92dc6f0b8354b458ffd",
+    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=90f07fa679d35cf937ac5009000f60c7",
    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=d68df5bc23ddddc710f7acf2201b2caf",
-    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=436c77b84b2797f9683a7cdc4f8f6b8d",
+    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=7e4bd59d35004cb255983e8b282f2870",
    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=fbd34e1e2d119358e781195c3fe26b69",
    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=68a92d85c8e351dfb38a835307f126ec",
-    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=cbb20ad6182b658f34117bf96a621b63",
+    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=ed9df5188fc923bf67fa194b5dcf5c0c",
    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=84e2ee950ae04444988b37038e5a3951",
-    "/css/dist/all.css": "/css/dist/all.css?id=ebce085e83406391a6003079f8a304b0",
+    "/css/dist/all.css": "/css/dist/all.css?id=09fd1dac7d534c75004d7cd15382f756",
    "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
    "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
    "/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",
@@ -93,21 +93,21 @@
    "/js/dist/bootstrap-table-locale-all.min.js": "/js/dist/bootstrap-table-locale-all.min.js?id=d300041b9e5038b45b68e036add83be4",
    "/js/dist/bootstrap-table-en-US.min.js": "/js/dist/bootstrap-table-en-US.min.js?id=6d0de12d91548ba2cd80b868838ce5fa",
    "/js/dist/Chart.min.js": "/js/dist/Chart.min.js?id=9b1ae20c4c7048d6e4a1b2e1aee7fb31",
-    "/css/dist/skins/_all-skins.min.css": "/css/dist/skins/_all-skins.min.css?id=f712d11cfca345b58c1d8a35df03d38d",
-    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=bf1a348eae3e60c62b8879953f7df14c",
+    "/css/dist/skins/_all-skins.min.css": "/css/dist/skins/_all-skins.min.css?id=2fea629e70002a51fb241703dd09371c",
+    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=8d861085664e18a1407cce2d29762fa4",
    "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=84e2ee950ae04444988b37038e5a3951",
-    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=cbb20ad6182b658f34117bf96a621b63",
+    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=ed9df5188fc923bf67fa194b5dcf5c0c",
    "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=68a92d85c8e351dfb38a835307f126ec",
    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=fbd34e1e2d119358e781195c3fe26b69",
-    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=436c77b84b2797f9683a7cdc4f8f6b8d",
+    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=7e4bd59d35004cb255983e8b282f2870",
    "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=d68df5bc23ddddc710f7acf2201b2caf",
-    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=71905ff04c78d92dc6f0b8354b458ffd",
+    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=90f07fa679d35cf937ac5009000f60c7",
    "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=23f6b19fc0add02e020cbb9e4f6f9272",
-    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=4bf29ed9f4b511b23eb9f5647371622c",
+    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=02ce0e67061be4447046ecb16301050f",
    "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=0853b7f7da3d6bfda0738df5574d9892",
-    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=4177acfe78a6a808fa7054cf99a93387",
+    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=ed73641edda768c85446aef73246e636",
    "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=fe8365eda6947fae76b6891d8de23e57",
-    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=08ae1b3e66008966ce5d600ea3ad04a2",
+    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=69b5b9e2ae359f2871b8d6676d0a63f1",
    "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=e1e6e1c64cf14fc350585aaeb0e42f6b",
    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=9def0b5d3b891ac3669b3b7aa7e805ce",
    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=ed9dc2e13cf495675067c4c7091b325a"
@@ -579,6 +579,8 @@ function htmlEntities(str) {
    
 })(jQuery);

+
+
 /**
 * Universal Livewire Select2 integration
 *
@@ -610,3 +612,176 @@ document.addEventListener('livewire:init', () => {
        });
    });
 });
+
+
+
+
+// Check/Uncheck all radio buttons in the permissions group
+$('.header-row input:radio').change(function() {
+    value = $(this).attr('value');
+    area = $(this).data('checker-group');
+    $('.radiochecker-'+area+'[value='+value+']').prop('checked', true);
+});
+
+// Generic toggleable callouts with remember state
+$(".remember-toggle").on("click",function(){
+
+    var toggleable_callout_id = $(this).attr('id');
+    var toggle_content_class = 'toggle-content-'+$(this).attr('id');
+    var toggle_arrow = '#toggle-arrow-' + toggleable_callout_id;
+    var toggle_cookie_name='toggle_state_'+toggleable_callout_id;
+
+    $('.'+toggle_content_class).fadeToggle(100);
+    $(toggle_arrow).toggleClass('fa-caret-right fa-caret-down');
+    var toggle_open = $(toggle_arrow).hasClass('fa-caret-down');
+    document.cookie=toggle_cookie_name+"="+toggle_open+';path=/';
+});
+
+var all_cookies = document.cookie.split(';')
+for (var i in all_cookies) {
+    var trimmed_cookie = all_cookies[i].trim(' ')
+    elems = trimmed_cookie.split('=', 2);
+
+    // We have to do more here since we don't know the name of the selector
+    if (trimmed_cookie.startsWith('toggle_state_')) {
+
+        var toggle_selector_name = elems[0].replace('toggle_state_','');
+
+        if (elems[1] != "true") {
+            $('#'+toggle_selector_name+'.remember-toggle').trigger('click')
+        }
+    }
+
+}
+
+
+/**
+ * This handles the show/hide of superuser and admin specific permissions
+ * on the group edit and user edit pages
+ */
+if ($("#superuser_allow").is(':checked')) {
+
+    // Hide here instead of fadeout on pageload to prevent what looks like Flash Of Unstyled Content (FOUC)
+    $(".nonsuperuser").hide();
+    $(".nonsuperuser").attr('display','none');
+}
+
+
+$(".superuser").change(function() {
+    if ($(this).val() == '1') {
+        $(".nonsuperuser").fadeOut();
+        $(".nonsuperuser").attr('display','none');
+        $(".nonadmin").fadeOut();
+        $(".nonadmin").attr('display','none');
+    } else if ($(this).val() != '1') {
+        $(".nonsuperuser").fadeIn();
+        $(".nonsuperuser").attr('display','block');
+
+        // If the superuser button has been set to deny, we need to
+        // check that the admin button isn't set to allow, before we show non-admin stuff
+        if ($("#admin_allow").is(':checked')) {
+
+            // Hide here instead of fadeout on pageload to prevent what looks like Flash Of Unstyled Content (FOUC)
+            $(".nonadmin").hide();
+            $(".nonadmin").attr('display','none');
+        }
+
+    }
+});
+
+
+
+if ($("#admin_allow").is(':checked')) {
+
+    // Hide here instead of fadeout on pageload to prevent what looks like Flash Of Unstyled Content (FOUC)
+    $(".nonadmin").hide();
+    $(".nonadmin").attr('display','none');
+}
+
+$(".admin").change(function() {
+    if ($(this).val() == '1') {
+        $(".nonadmin").fadeOut();
+        $(".nonadmin").attr('display','none');
+    } else if ($(this).val() != '1') {
+        $(".nonadmin").fadeIn();
+        $(".nonadmin").attr('display','block');
+    }
+});
+
+// Handle the select/deselect of the select boxes with the button from right to left
+
+$(function () {
+
+    function moveItems(origin, dest) {
+        $(origin).find(':selected').appendTo(dest);
+        $(dest).attr('selected', true);
+        $(dest).sort_select_box();
+    }
+
+    function moveAllItems(origin, dest) {
+        $(origin).children("option:visible").appendTo(dest);
+        $(dest).attr('selected', true);
+        $(dest).sort_select_box();
+    }
+
+    $('.left').on('click', function () {
+        var container = $(this).closest('.addremove-multiselect');
+        moveItems($(container).find('select.multiselect.selected'), $(container).find('select.multiselect.available'));
+    });
+
+    $('.right').on('click', function () {
+        var container = $(this).closest('.addremove-multiselect');
+        moveItems($(container).find('select.multiselect.available'), $(container).find('select.multiselect.selected'));
+
+    });
+
+    $('.leftall').on('click', function () {
+        var container = $(this).closest('.addremove-multiselect');
+        moveAllItems($(container).find('select.multiselect.selected'), $(container).find('select.multiselect.available'));
+    });
+
+    $('.rightall').on('click', function () {
+        var container = $(this).closest('.addremove-multiselect');
+        moveAllItems($(container).find('select.multiselect.available'), $(container).find('select.multiselect.selected'));
+    });
+
+    $('select.multiselect.selected').on('dblclick keyup',function(e){
+        if(e.which == 13 || e.type == 'dblclick') {
+            var container = $(this).closest('.addremove-multiselect');
+            moveItems($(container).find('select.multiselect.selected'), $(container).find('select.multiselect.available'));
+        }
+    });
+
+    $('select.multiselect.available').on('dblclick keyup',function(e){
+        if(e.which == 13 || e.type == 'dblclick') {
+            var container = $(this).closest('.addremove-multiselect');
+            moveItems($(container).find('select.multiselect.available'), $(container).find('select.multiselect.selected'));
+            $('#hidden_ids_box').val($('#selected-select').val());
+        }
+    });
+
+
+});
+
+$.fn.sort_select_box = function(){
+    // Get options from select box
+    var selected_options = $(this).children('option');
+    // sort alphabetically
+    selected_options.sort(function(a,b) {
+        if (a.text > b.text) return 1;
+        else if (a.text < b.text) return -1;
+        else return 0
+    })
+    //replace with sorted my_options;
+    $(this).empty().append(selected_options);
+
+    var selected_in_box =  $('#selected-select option').toArray().map(item => item.value).join();
+
+    $('#hidden_ids_box').empty().val(selected_in_box);
+
+    $('#count_selected_box').html($('#selected-select option').length);
+    $('#count_unselected_box').html($('#available-select option').length);
+
+    // clearing any selections
+    $("#"+this.attr('id')+" option").attr('selected', true);
+}
@@ -1175,11 +1175,6 @@ input[type="radio"]:checked::before {
  display: table-row !important;
 }

-.form-control-static {
-  padding-top: 0px;
-}
-
-
 td.text-right.text-padding-number-cell {
  padding-right: 30px !important;
  white-space: nowrap;
@@ -1275,6 +1270,7 @@ input[name="columnsSearch"] {
 }

 .callout.callout-legend h4 {
+  color: #333;
  font-size: 16px;
  font-weight: bold;
  margin-top: 5px;
@@ -1288,7 +1284,8 @@ input[name="columnsSearch"] {
 }

 p.callout-subtext {
- margin-top: 5px;
+  color:#333;
+  margin-top: 5px;
 }

 p.callout-subtext a:hover, p.callout-subtext a:visited, p.callout-subtext a:link {
@@ -1301,4 +1298,70 @@ 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 .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;
 }
@@ -91,7 +91,9 @@
    color: #fff;
  }
 }
-
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
 */
@@ -86,6 +86,9 @@
    color: #fff;
  }
 }
+.btn-info {
+  border-color: #fff;
+}

 /**
 The dropdown is white, so use a darker color
@@ -86,7 +86,9 @@
    color: #FFF;
  }
 }
-
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
 */
@@ -86,7 +86,9 @@
    color: #fff;
  }
 }
-
+.btn-info {
+  border-color: #fff;
+}
 /**
 The dropdown is white, so use a darker color
 */
@@ -86,7 +86,9 @@
    color: #fff;
  }
 }
-
+.btn-info {
+  border-color: #fff;
+}

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

 /**
 The dropdown is white, so use a darker color
--- a/Show More
+++ b/Show More