Skip to content

Commit ca0f5df

Browse files
committed
Reverting Pull Request #138
1 parent 57e903a commit ca0f5df

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

app/controllers/admin/AssetsController.php

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -576,19 +576,10 @@ public function getQrCode($assetId = null)
576576
$asset = Asset::find($assetId);
577577
if (isset($asset->id)) {
578578

579-
$qr_text = !empty($settings->qr_text) ?
580-
$settings->qr_text : $settings->site_name;
581-
582-
$text = new QrImage\Decorator\Text;
583-
$text->setText($asset->asset_tag, 'top')
584-
->setText($qr_text, 'bottom');
585-
586-
$renderer = new QrImage\Png;
587-
$renderer->setRoundDimensions(true)
588-
->setWidth($this->qrCodeDimensions['width'])
589-
->setHeight($this->qrCodeDimensions['height'])
590-
->setMargin(0)
591-
->addDecorator($text);
579+
580+
$renderer = new \BaconQrCode\Renderer\Image\Png;
581+
$renderer->setWidth($this->qrCodeDimensions['height'])
582+
->setHeight($this->qrCodeDimensions['height']);
592583

593584
$writer = new \BaconQrCode\Writer($renderer);
594585
$content = $writer->writeString(route('view/hardware', $asset->id));

0 commit comments

Comments
 (0)