ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #564 from splaer/barcode-1

Browse Source 
Barcode 1
This commit is contained in:
snipe
2015-02-25 12:56:26 -08:00
parent fc4f1fd7fc 7808039d0d
commit df448f0c35
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/AssetsController.php
+3 -3
View File
@@ -26,7 +26,7 @@ use Mail;
class AssetsController extends AdminController
{
protected $qrCodeDimensions = array( 'height' => 4, 'width' => 4);
protected $qrCodeDimensions = array( 'height' => 3.5, 'width' => 3.5);
/**
* Show a list of all the assets.
@@ -577,9 +577,9 @@ class AssetsController extends AdminController
if ($settings->qr_code == '1') {
$asset = Asset::find($assetId);
if (isset($asset->asset_tag)) {
if (isset($asset->id,$asset->asset_tag)) {
$content = DNS2D::getBarcodePNG($asset->asset_tag, "QRCODE",
$content = DNS2D::getBarcodePNG(route('view/hardware', $asset->id), "QRCODE",
$this->qrCodeDimensions['height'],$this->qrCodeDimensions['width']);
$img = imagecreatefromstring(base64_decode($content));