diff --git a/app/Http/Controllers/Api/ProfileController.php b/app/Http/Controllers/Api/ProfileController.php
index 69db8aae04..315c74a20d 100644
--- a/app/Http/Controllers/Api/ProfileController.php
+++ b/app/Http/Controllers/Api/ProfileController.php
@@ -69,7 +69,7 @@ class ProfileController extends Controller
if ($checkoutRequest && $checkoutRequest->itemRequested()) {
$assets = [
'image' => e($checkoutRequest->itemRequested()->present()->getImageUrl()),
- 'name' => e($checkoutRequest->itemRequested()->present()->name()),
+ 'name' => e($checkoutRequest->itemRequested()->display_name),
'type' => e($checkoutRequest->itemType()),
'qty' => (int) $checkoutRequest->quantity,
'location' => ($checkoutRequest->location()) ? e($checkoutRequest->location()->name) : null,
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 4dce536f91..1d7715484b 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -159,7 +159,7 @@ class ReportsController extends Controller
$row[] = e($asset->serial);
if ($target = $asset->assignedTo) {
- $row[] = e($target->present()->name());
+ $row[] = e($target->display_name);
} else {
$row[] = ''; // Empty string if unassigned
}
@@ -856,8 +856,8 @@ class ReportsController extends Controller
}
if ($request->filled('assigned_to')) {
- $row[] = ($asset->checkedOutToUser() && $asset->assigned) ? $asset->assigned->display_name : '';
- $row[] = ($asset->checkedOutToUser() && $asset->assigned) ? 'user' : $asset->assignedType();
+ $row[] = ($asset->assigned) ? $asset->assigned->display_name : '';
+ $row[] = ($asset->assigned) ? $asset->assignedType() : '';
}
if ($request->filled('username')) {
@@ -1260,7 +1260,7 @@ class ReportsController extends Controller
$row[] = str_replace(',', '', e($item['assetItem']->model->name));
$row[] = str_replace(',', '', e($item['assetItem']->name));
$row[] = str_replace(',', '', e($item['assetItem']->asset_tag));
- $row[] = str_replace(',', '', e(($item['acceptance']->assignedTo) ? $item['acceptance']->assignedTo->present()->name() : trans('admin/reports/general.deleted_user')));
+ $row[] = str_replace(',', '', e(($item['acceptance']->assignedTo) ? $item['acceptance']->assignedTo->display_name : trans('admin/reports/general.deleted_user')));
$rows[] = implode(',', $row);
}
}
diff --git a/app/Models/CheckoutRequest.php b/app/Models/CheckoutRequest.php
index 42512d8fda..b651275dd8 100644
--- a/app/Models/CheckoutRequest.php
+++ b/app/Models/CheckoutRequest.php
@@ -46,7 +46,7 @@ class CheckoutRequest extends Model
public function name()
{
if ($this->itemType() == 'asset') {
- return $this->itemRequested()->present()->name();
+ return $this->itemRequested()->display_name;
}
return $this->itemRequested()->name;
diff --git a/app/Notifications/ExpectedCheckinNotification.php b/app/Notifications/ExpectedCheckinNotification.php
index 6248b72779..cf8d71f131 100644
--- a/app/Notifications/ExpectedCheckinNotification.php
+++ b/app/Notifications/ExpectedCheckinNotification.php
@@ -50,11 +50,11 @@ class ExpectedCheckinNotification extends Notification
$message = (new MailMessage)->markdown('notifications.markdown.expected-checkin',
[
'date' => Helper::getFormattedDateObject($this->params->expected_checkin, 'date', false),
- 'asset' => $this->params->present()->name(),
+ 'asset' => $this->params->display_name,
'serial' => $this->params->serial,
'asset_tag' => $this->params->asset_tag,
])
- ->subject(trans('mail.Expected_Checkin_Notification', ['name' => $this->params->present()->name()]));
+ ->subject(trans('mail.Expected_Checkin_Notification', ['name' => $this->params->display_name]));
return $message;
}
diff --git a/app/Presenters/ActionlogPresenter.php b/app/Presenters/ActionlogPresenter.php
index 7ab022138b..0f82d1f667 100644
--- a/app/Presenters/ActionlogPresenter.php
+++ b/app/Presenters/ActionlogPresenter.php
@@ -145,7 +145,7 @@ class ActionlogPresenter extends Presenter
return $target->present()->nameUrl();
}
- return ''.$target->present()->name().'';
+ return ''.$target->display_name.'';
}
return '';
diff --git a/resources/views/mail/markdown/checkout-acceptance-response.blade.php b/resources/views/mail/markdown/checkout-acceptance-response.blade.php
index a2a0b0461c..fb7f63b803 100644
--- a/resources/views/mail/markdown/checkout-acceptance-response.blade.php
+++ b/resources/views/mail/markdown/checkout-acceptance-response.blade.php
@@ -11,7 +11,7 @@
| | |
| ------------- | ------------- |
| **{{ trans('mail.user') }}** | {{ $assignedTo->display_name }} |
-| **{{ trans('mail.name') }}** | {{ $item->present()->name() }} |
+| **{{ trans('mail.name') }}** | {{ $item->display_name }} |
@if (isset($item->asset_tag))
| **{{ trans('mail.asset_tag') }}** | {{ $item->asset_tag }} |
@endif