From caef98d36d55800a3b3070bfd00327caec5c9999 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 6 May 2022 02:06:12 -0700 Subject: [PATCH] Patched #11025 to develop Signed-off-by: snipe --- resources/lang/en/general.php | 5 +- resources/views/users/print.blade.php | 360 +++++++++++++------------- 2 files changed, 183 insertions(+), 182 deletions(-) diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index a22145fa57..5140861fc4 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -1,6 +1,6 @@ 'Accessories', 'activated' => 'Activated', 'accessory' => 'Accessory', @@ -26,6 +26,7 @@ 'audit' => 'Audit', 'audit_report' => 'Audit Log', 'assets' => 'Assets', + 'assigned_to' => 'Assigned to :name', 'avatar_delete' => 'Delete Avatar', 'avatar_upload' => 'Upload Avatar', 'back' => 'Back', @@ -352,4 +353,4 @@ 'checkout_tooltip' => 'Check this item out', 'checkin_tooltip' => 'Check this item in', 'checkout_user_tooltip' => 'Check this item out to a user', -]; +]; \ No newline at end of file diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php index 15605db64a..ec15e1dc03 100644 --- a/resources/views/users/print.blade.php +++ b/resources/views/users/print.blade.php @@ -2,7 +2,7 @@ - Assigned to {{ $show_user->present()->fullName() }} + {{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }} + @if ($snipeSettings->logo_print_assets=='1') @if ($snipeSettings->brand == '3')

- @if ($snipeSettings->logo!='') - - @endif - {{ $snipeSettings->site_name }} + @if ($snipeSettings->logo!='') + + @endif + {{ $snipeSettings->site_name }}

@elseif ($snipeSettings->brand == '2') @if ($snipeSettings->logo!='') @endif @else -

{{ $snipeSettings->site_name }}

+

{{ $snipeSettings->site_name }}

@endif @endif -

Assigned to {{ $show_user->present()->fullName() }}

+

{{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }}

-@if ($assets->count() > 0) - @php - $counter = 1; - @endphp - - - - - - - + @if ($assets->count() > 0) + @php + $counter = 1; + @endphp +
{{ trans('general.assets') }}
+ + + + + + - + - + - + - + - @foreach ($assets as $asset) + @foreach ($assets as $asset) - - - - - - - - - - - @if($settings->show_assigned_assets) - @php - $assignedCounter = 1; - @endphp - @foreach ($asset->assignedAssets as $asset) - - - - - - - - - - - + + + + + + + + + + + @if($settings->show_assigned_assets) @php - $assignedCounter++ + $assignedCounter = 1; @endphp - @endforeach - @endif - @php - $counter++ - @endphp - @endforeach -
{{ trans('general.assets') }}
{{ trans('general.asset_tag') }}{{ trans('admin/hardware/table.asset_tag') }} {{ trans('general.name') }} {{ trans('general.category') }}{{ trans('general.asset_model') }}{{ trans('admin/hardware/form.model') }} {{ trans('admin/hardware/form.serial') }}{{ trans('general.checked_out') }}{{ trans('admin/hardware/table.checkout_date') }} {{ trans('general.signature') }}
{{ $counter }}{{ $asset->asset_tag }}{{ $asset->name }}{{ $asset->model->category->name }}{{ $asset->model->name }}{{ $asset->serial }} - {{ $asset->last_checkout }} - @if ($asset->assetlog->first()) - - @endif -
{{ $counter }}.{{ $assignedCounter }}{{ $asset->asset_tag }}{{ $asset->name }}{{ $asset->model->category->name }}{{ $asset->model->name }}{{ $asset->serial }} - {{ $asset->last_checkout }}
{{ $counter }}{{ $asset->asset_tag }}{{ $asset->name }}{{ $asset->model->category->name }}{{ $asset->model->name }}{{ $asset->serial }} + {{ $asset->last_checkout }} + @if ($asset->assetlog->first()) + + @endif +
-@endif + @foreach ($asset->assignedAssets as $asset) -@if ($licenses->count() > 0) -

- - - - - - - + + + + + + + + + + + @php + $assignedCounter++ + @endphp + @endforeach + @endif + @php + $counter++ + @endphp + @endforeach +
{{ trans('general.licenses') }}
{{ $counter }}.{{ $assignedCounter }}{{ $asset->asset_tag }}{{ $asset->name }}{{ $asset->model->category->name }}{{ $asset->model->name }}{{ $asset->serial }}{{ $asset->last_checkout }}
+ @endif + + @if ($licenses->count() > 0) +

+ + + + + + + - - - - - @php - $lcounter = 1; - @endphp - - @foreach ($licenses as $license) - - - - - - + + + @php - $lcounter++ + $lcounter = 1; @endphp - @endforeach -
{{ trans('general.licenses') }}
{{ trans('general.name') }}{{ trans('general.license_serial') }}{{ trans('general.checked_out') }}
{{ $lcounter }}{{ $license->name }} - @can('viewKeys', $license) - {{ $license->serial }} - @else - {{ str_repeat('x', 15) }} - @endcan - {{ $license->pivot->created_at }}{{ trans('admin/licenses/form.license_key') }}{{ trans('admin/hardware/table.checkout_date') }}
-@endif + + @foreach ($licenses as $license) + + + {{ $lcounter }} + {{ $license->name }} + + @can('viewKeys', $license) + {{ $license->serial }} + @else + {{ str_repeat('x', 15) }} + @endcan + + {{ $license->pivot->created_at }} + + @php + $lcounter++ + @endphp + @endforeach + + @endif -@if ($accessories->count() > 0) -

- - - - - - - + @if ($accessories->count() > 0) +

+
{{ trans('general.accessories') }}
+ + + + + + - - @php - $acounter = 1; - @endphp + + @php + $acounter = 1; + @endphp - @foreach ($accessories as $accessory) - @if ($accessory) - - - - - - - @php - $acounter++ - @endphp - @endif - @endforeach -
{{ trans('general.accessories') }}
{{ trans('general.name') }} {{ trans('general.category') }} {{ trans('admin/hardware/table.checkout_date') }}
{{ $acounter }}{{ ($accessory->manufacturer) ? $accessory->manufacturer->name : '' }} {{ $accessory->name }} {{ $accessory->model_number }}{{ $accessory->category->name }}{{ $accessory->pivot->created_at }}
-@endif + @foreach ($accessories as $accessory) + @if ($accessory) + + {{ $acounter }} + {{ ($accessory->manufacturer) ? $accessory->manufacturer->name : '' }} {{ $accessory->name }} {{ $accessory->model_number }} + {{ $accessory->category->name }} + {{ $accessory->pivot->created_at }} + + @php + $acounter++ + @endphp + @endif + @endforeach + + @endif -@if ($consumables->count() > 0) -

- - + @if ($consumables->count() > 0) +

+
+ + + + + + + + + + + + + + @php + $ccounter = 1; + @endphp + + @foreach ($consumables as $consumable) + @if ($consumable) + + + + + + @else + {{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }} {{ $consumable->name }} {{ $consumable->model_number }} + @endif + + + + + @php + $ccounter++ + @endphp + @endif + @endforeach +
{{ trans('general.consumables') }}
{{ trans('general.name') }}{{ trans('general.category') }}{{ trans('admin/hardware/table.checkout_date') }}
{{ $ccounter }} + @if ($consumable->deleted_at!='') + {{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }} {{ $consumable->name }} {{ $consumable->model_number }}{{ ($consumable->category) ? $consumable->category->name : ' invalid/deleted category' }} {{ $consumable->pivot->created_at }}
+ @endif + +
+
+
+ - + + + + + - - - - - - - - - - @php - $ccounter = 1; - @endphp - - @foreach ($consumables as $consumable) - @if ($consumable) - - - - - - @else - {{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }} {{ $consumable->name }} {{ $consumable->model_number }} - @endif - - - - - @php - $ccounter++ - @endphp - @endif - @endforeach
{{ trans('general.consumables') }}{{ trans('general.signed_off_by') }}:________________________________________________________{{ trans('general.date') }}:________________________________________________________
{{ trans('general.name') }}{{ trans('general.category') }}{{ trans('admin/hardware/table.checkout_date') }}
{{ $ccounter }} - @if ($consumable->deleted_at!='') - {{ ($consumable->manufacturer) ? $consumable->manufacturer->name : '' }} {{ $consumable->name }} {{ $consumable->model_number }}{{ ($consumable->category) ? $consumable->category->name : trans('general.invalid_category') }} {{ $consumable->assetlog->first()->created_at }}
-@endif - -
-
-
- - - - - - - - -
{{ trans('general.signed_off_by') }}:________________________________________________________{{ trans('general.date') }}:________________________________________________________
- + \ No newline at end of file