DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-03-15 12:55:55 -07:00
parent f463c02783 fdacd5d5b5
commit b89dcfbb8e
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/lang/en/admin/users/general.php
View file

@ -50,4 +50,5 @@ return [
'email_credentials' => 'Email credentials', 'email_credentials' => 'Email credentials',
'email_credentials_text' => 'Email my credentials to the email address above', 'email_credentials_text' => 'Email my credentials to the email address above',
'next_save_user' => 'Next: Save User', 'next_save_user' => 'Next: Save User',
'all_assigned_list_generation' => 'Generated on:'
]; ];

8
resources/views/users/print.blade.php
View file

@ -2,7 +2,7 @@
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}"> <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>{{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }}</title> <title>{{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }} - {{ date('Y-m-d H:i', time()) }}</title>
<style> <style>
body { body {
font-family: "Arial, Helvetica", sans-serif; font-family: "Arial, Helvetica", sans-serif;
@ -49,8 +49,8 @@
@endif @endif
@endif @endif
<h3>{{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }} {{ ($show_user->jobtitle!='' ? ' - '.$show_user->jobtitle : '') }}</h3> <h3>{{ trans('general.assigned_to', ['name' => $show_user->present()->fullName()]) }} {{ ($show_user->jobtitle!='' ? ' - '.$show_user->jobtitle : '') }}
</h3>
@if ($assets->count() > 0) @if ($assets->count() > 0)
@php @php
$counter = 1; $counter = 1;
@ -243,6 +243,8 @@
<br> <br>
<br> <br>
{{ trans('admin/users/general.all_assigned_list_generation')}} {{ Helper::getFormattedDateObject(now(), 'datetime', false) }}
<br>
<br> <br>
<table> <table>
<tr> <tr>