diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php index e1305bd068..117486a8e5 100644 --- a/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php +++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php @@ -49,13 +49,6 @@ class LabelWriter_2112283 extends LabelWriter ); $currentX += $barcodeSize + self::BARCODE_MARGIN; $usableWidth -= $barcodeSize + self::BARCODE_MARGIN; - } else { - static::writeText( - $pdf, $record->get('tag'), - $pa->x1, $pa->y2 - self::TAG_SIZE, - 'freesans', 'b', self::TAG_SIZE, 'R', - $usableWidth, self::TAG_SIZE, true, 0 - ); } if ($record->has('title')) { diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_30252.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_30252.php index d5f0e8d122..ed8074547b 100644 --- a/app/Models/Labels/Tapes/Dymo/LabelWriter_30252.php +++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_30252.php @@ -50,13 +50,6 @@ class LabelWriter_30252 extends LabelWriter ); $currentX += $barcodeSize + self::BARCODE_MARGIN; $usableWidth -= $barcodeSize + self::BARCODE_MARGIN; - } else { - static::writeText( - $pdf, $record->get('tag'), - $pa->x1, $pa->y2 - self::TAG_SIZE, - 'freemono', 'b', self::TAG_SIZE, 'R', - $usableWidth, self::TAG_SIZE, true, 0 - ); } if ($record->has('title')) { diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index 08062e29a5..b03069d45b 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -380,13 +380,8 @@
@if ($user->id)
-
-

{{ trans('admin/users/general.assets_user', array('name' => $user->first_name)) }}

-
@endif - -
@@ -421,10 +416,15 @@ {{ trans('admin/hardware/table.asset_tag') }} - {{ trans('general.name') }} + + {{ trans('general.name') }} + {{ trans('admin/hardware/table.asset_model') }} + + {{ trans('general.model_no') }} + {{ trans('admin/hardware/table.serial') }} @@ -482,9 +482,10 @@ {{ $asset->name }} - @if ($asset->physical=='1') {{ $asset->model->name }} - @endif + + + {{ $asset->model->model_number }} {{ $asset->serial }} @@ -528,7 +529,6 @@
-