From ca0f5df63a42f4bf0a1375b522172630c57f9cec Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 6 May 2014 00:48:09 -0400 Subject: [PATCH] Reverting Pull Request #138 --- app/controllers/admin/AssetsController.php | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index a087a6a618..e226bd8961 100644 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -576,19 +576,10 @@ class AssetsController extends AdminController { $asset = Asset::find($assetId); if (isset($asset->id)) { - $qr_text = !empty($settings->qr_text) ? - $settings->qr_text : $settings->site_name; - $text = new QrImage\Decorator\Text; - $text->setText($asset->asset_tag, 'top') - ->setText($qr_text, 'bottom'); - - $renderer = new QrImage\Png; - $renderer->setRoundDimensions(true) - ->setWidth($this->qrCodeDimensions['width']) - ->setHeight($this->qrCodeDimensions['height']) - ->setMargin(0) - ->addDecorator($text); + $renderer = new \BaconQrCode\Renderer\Image\Png; + $renderer->setWidth($this->qrCodeDimensions['height']) + ->setHeight($this->qrCodeDimensions['height']); $writer = new \BaconQrCode\Writer($renderer); $content = $writer->writeString(route('view/hardware', $asset->id));