From 890702f66d009921e82cf25b47cfdc0cbcab3a6e Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 8 Apr 2025 17:47:39 +0100 Subject: [PATCH] A few more display tweaks Signed-off-by: snipe --- app/Console/Commands/TestLocationsFMCS.php | 2 +- app/Helpers/Helper.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Console/Commands/TestLocationsFMCS.php b/app/Console/Commands/TestLocationsFMCS.php index 908057565a..f14c78063a 100644 --- a/app/Console/Commands/TestLocationsFMCS.php +++ b/app/Console/Commands/TestLocationsFMCS.php @@ -41,7 +41,7 @@ class TestLocationsFMCS extends Command $this->newLine(); $this->info('Edit your locations to associate them with the correct company.'); - $header = ['ID', 'Type', 'Name', 'Checkout Type', 'Company ID', 'Item Company','Item Location', 'Location Company', 'Location Company ID']; + $header = ['Type', 'ID', 'Name', 'Checkout Type', 'Company ID', 'Item Company', 'Item Location', 'Location Company', 'Location Company ID']; sort($mismatched); $this->table($header, $mismatched); diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 75bcc6d01d..27a1f99c01 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -1597,12 +1597,16 @@ class Helper if ($item && $item->company_id != $location_company) { $mismatched[] = [ - $item->id, class_basename(get_class($item)), + $item->id, $item->name ?? $item->asset_tag ?? $item->serial ?? $item->username, str_replace('App\\Models\\', '', $item->assigned_type) ?? null, $item->company_id ?? null, $item->company->name ?? null, +// $item->defaultLoc->id ?? null, +// $item->defaultLoc->name ?? null, +// $item->defaultLoc->company->id ?? null, +// $item->defaultLoc->company->name ?? null, $item->location->name ?? null, $item->location->company->name ?? null, $location_company ?? null,