mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-09 23:24:06 -08:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
0dd0baa511
|
@ -296,9 +296,14 @@
|
|||
</li>
|
||||
@endif
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@endif
|
||||
@if ($snipeSettings->qr_code=='1')
|
||||
<div class="col-md-12 text-center" style="padding-top: 15px;">
|
||||
<img src="{{ config('app.url') }}/hardware/{{ $asset->id }}/qr_code" class="img-thumbnail" style="height: 150px; width: 150px; margin-right: 10px;" alt="QR code for {{ $asset->getDisplayNameAttribute() }}">
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<br><br>
|
||||
</div>
|
||||
|
||||
|
|
Loading…
Reference in a new issue