DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-22 00:37:39 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-10-17 16:23:59 -07:00
parent 78d5d3947f dea42db18b
commit 8efb02a0ee
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/AssetsController.php
View file

@ -637,7 +637,7 @@ class AssetsController extends Controller
$settings = Setting::getSettings(); $settings = Setting::getSettings();
if ($settings->qr_code == '1') { if ($settings->qr_code == '1') {
$asset = Asset::find($assetId)->withTrashed(); $asset = Asset::withTrashed()->find($assetId);
$size = Helper::barcodeDimensions($settings->barcode_type); $size = Helper::barcodeDimensions($settings->barcode_type);
$qr_file = public_path().'/uploads/barcodes/qr-'.str_slug($asset->asset_tag).'-'.str_slug($asset->id).'.png'; $qr_file = public_path().'/uploads/barcodes/qr-'.str_slug($asset->asset_tag).'-'.str_slug($asset->id).'.png';