Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Http/Controllers/Api/ProfileController.php

@@ -69,7 +69,7 @@ public function requestedAssets() :  array
             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,

app/Http/Controllers/ReportsController.php

@@ -159,7 +159,7 @@ public function exportDeprecationReport() : Response
             $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 @@ public function postCustom(CustomAssetReportRequest $request) : StreamedResponse
                     }
 
                     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 @@ public function postAssetAcceptanceReport($deleted = false) : Response
                 $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);
             }
         }

app/Models/CheckoutRequest.php

@@ -46,7 +46,7 @@ public function location()
     public function name()
     {
         if ($this->itemType() == 'asset') {
-            return $this->itemRequested()->present()->name();
+            return $this->itemRequested()->display_name;
         }
 
         return $this->itemRequested()->name;

app/Notifications/ExpectedCheckinNotification.php

@@ -50,11 +50,11 @@ public function toMail()
         $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;
     }

app/Presenters/ActionlogPresenter.php

@@ -145,7 +145,7 @@ public function target()
                 return $target->present()->nameUrl();
             }
 
-            return '<del>'.$target->present()->name().'</del>';
+            return '<del>'.$target->display_name.'</del>';
         }
 
         return '';

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