From cced7a93a5ddc4407679231c22970aabb9526df9 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Wed, 29 Jul 2015 14:25:49 -0400 Subject: [PATCH] Update AssetsController.php --- app/controllers/admin/AssetsController.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index 2ad9f0a760..f2ffec806e 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -33,6 +33,7 @@ use Manufacturer; //for embedded-create class AssetsController extends AdminController { protected $qrCodeDimensions = array( 'height' => 3.5, 'width' => 3.5); + protected $barCodeDimensions = array( 'height' => 2, 'width' => 22); /** * Show a list of all the assets. @@ -691,6 +692,11 @@ class AssetsController extends AdminController if (isset($asset->id,$asset->asset_tag)) { + if ($settings->barcode_type == 'C128'){ + $content = DNS1D::getBarcodePNG(route('view/hardware', $asset->id), $settings->barcode_type, + $this->barCodeDimensions['height'],$this->barCodeDimensions['width']); + } + else{ $content = DNS2D::getBarcodePNG(route('view/hardware', $asset->id), $settings->barcode_type, $this->qrCodeDimensions['height'],$this->qrCodeDimensions['width']);