diff --git a/public/css/build/app.css b/public/css/build/app.css index 060421ac6f..3363e79c3c 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -1435,4 +1435,8 @@ code.single-line { overflow: hidden; max-width: 400px; } +p.monospace, +span.monospace { + font-family: monospace, monospace; +} diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index fb5c19221c..fd9959721c 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -1066,4 +1066,8 @@ code.single-line { overflow: hidden; max-width: 400px; } +p.monospace, +span.monospace { + font-family: monospace, monospace; +} diff --git a/public/css/dist/all.css b/public/css/dist/all.css index 2708d3e646..497fb7d13c 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -22770,6 +22770,10 @@ code.single-line { overflow: hidden; max-width: 400px; } +p.monospace, +span.monospace { + font-family: monospace, monospace; +} .select2-container { @@ -24322,4 +24326,8 @@ code.single-line { overflow: hidden; max-width: 400px; } +p.monospace, +span.monospace { + font-family: monospace, monospace; +} diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 2951264696..004dbb85bb 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -2,8 +2,8 @@ "/js/build/app.js": "/js/build/app.js?id=607de09b70b83ef82a427e4b36341682", "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=06c13e817cc022028b3f4a33c0ca303a", "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=79aa889a1a6691013be6c342ca7391cd", - "/css/build/overrides.css": "/css/build/overrides.css?id=4d62149a0ee9dc139bdf03ff2f83930d", - "/css/build/app.css": "/css/build/app.css?id=d47ce0dc14671bb4e462e111001488e5", + "/css/build/overrides.css": "/css/build/overrides.css?id=f13e3ea204d73f94d3a448bef8e42fdc", + "/css/build/app.css": "/css/build/app.css?id=4ad0f7a9e40f2dc2f191454b0c5fa697", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=4ea0068716c1bb2434d87a16d51b98c9", "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=7b315b9612b8fde8f9c5b0ddb6bba690", "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=ea22079836a432d7f46a5d390c445e13", @@ -19,7 +19,7 @@ "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=a82b065847bf3cd5d713c04ee8dc86c6", "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=6ea836d8126de101081c49abbdb89417", "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb", - "/css/dist/all.css": "/css/dist/all.css?id=7c861c2086473c513fe26c21e3c4d433", + "/css/dist/all.css": "/css/dist/all.css?id=e3039439091c414e7ce77471bcad921c", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde", diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index 8c8b80e462..7a594ae498 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -1183,3 +1183,7 @@ code.single-line { overflow: hidden; max-width: 400px; } + +p.monospace, span.monospace { + font-family: monospace, monospace; +} diff --git a/resources/views/consumables/checkout.blade.php b/resources/views/consumables/checkout.blade.php index 8e73bdeedf..1245497a7e 100644 --- a/resources/views/consumables/checkout.blade.php +++ b/resources/views/consumables/checkout.blade.php @@ -36,6 +36,15 @@ @endif + @if ($consumable->category) + +
+ +
+

{{ $consumable->category->name }}

+
+
+ @endif
diff --git a/resources/views/users/print.blade.php b/resources/views/users/print.blade.php index b186e9d17a..d251d3c3d3 100644 --- a/resources/views/users/print.blade.php +++ b/resources/views/users/print.blade.php @@ -123,7 +123,7 @@ {{ trans('general.location') }} {{ trans('admin/hardware/form.serial') }} {{ trans('admin/hardware/table.checkout_date') }} - {{ trans('general.signature') }} + {{ trans('general.signature') }} @foreach ($show_user->assets as $asset) @@ -172,7 +172,8 @@ {{ ($asset->location) ? $asset->location->name : '' }} {{ $asset->serial }} - {{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }} + {{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }} + @if (($asset->assetlog->firstWhere('action_type', 'accepted')) && ($asset->assetlog->firstWhere('action_type', 'accepted')->accept_signature!='')) @@ -213,10 +214,11 @@ data-cookie-id-table="licensessAssigned"> - # - {{ trans('general.name') }} - {{ trans('admin/licenses/form.license_key') }} - {{ trans('admin/hardware/table.checkout_date') }} + # + {{ trans('general.name') }} + {{ trans('admin/licenses/form.license_key') }} + {{ trans('admin/hardware/table.checkout_date') }} + {{ trans('general.signature') }} @php @@ -232,12 +234,19 @@ {{ $license->name }} @can('viewKeys', $license) - {{ $license->serial }} +

{{ $license->serial }}

@else {{ str_repeat('x', 15) }} @endcan - {{ $license->pivot->updated_at }} + + {{ Helper::getFormattedDateObject($license->pivot->updated_at, 'datetime', false) }} + + + @if (($license->assetlog->firstWhere('action_type', 'accepted')) && ($license->assetlog->firstWhere('action_type', 'accepted')->accept_signature!='')) + + @endif + @php $lcounter++ @@ -294,7 +303,9 @@ {{ ($accessory->manufacturer) ? $accessory->manufacturer->name : '' }} {{ $accessory->name }} {{ $accessory->model_number }} {{ $accessory->category->name }} - {{ $accessory->pivot->created_at }} + + {{ Helper::getFormattedDateObject($accessory->pivot->created_at, 'datetime', false) }} + @if (($accessory->assetlog->first()) && ($accessory->assetlog->first()->accept_signature!='')) @@ -358,7 +369,9 @@ @endif {{ ($consumable->category) ? $consumable->category->name : ' invalid/deleted category' }} - {{ $consumable->pivot->created_at }} + + {{ Helper::getFormattedDateObject($consumable->pivot->created_at, 'datetime', false) }} + @if (($consumable->assetlog->first()) && ($consumable->assetlog->first()->accept_signature!=''))