diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 638e94d7f3..adabaa07a9 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -479,7 +479,7 @@ {{ $seat->license->name }} {{ $seat->license->serial }} - {{ trans('general.checkin') }} + {{ trans('general.checkin') }} @endforeach diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php index 4ddfecae4c..2367978336 100644 --- a/resources/views/users/print.blade.php +++ b/resources/views/users/print.blade.php @@ -128,7 +128,7 @@ {{ $acounter }} - {{ $accessory->manufacturer->name }} {{ $accessory->name }} {{ $accessory->model_number }} + {{ ($accessory->manufacturer) ? $accessory->manufacturer->name : '' }} {{ $accessory->name }} {{ $accessory->model_number }} {{ $accessory->category->name }} {{ $accessory->assetlog->first()->created_at }} @@ -163,7 +163,7 @@ {{ $ccounter }} - {{ $consumable->manufacturer->name }} {{ $consumable->name }} {{ $consumable->model_number }} + {{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }} {{ $consumable->name }} {{ $consumable->model_number }} {{ $consumable->category->name }} {{ $consumable->assetlog->first()->created_at }}