DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-05 19:07:30 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2024-11-14 20:53:17 +00:00
parent 96a4391d5c add3edba20
commit 5381c4e1e3
3 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php
View file

@ -49,13 +49,6 @@ class LabelWriter_2112283 extends LabelWriter
); );
$currentX += $barcodeSize + self::BARCODE_MARGIN; $currentX += $barcodeSize + self::BARCODE_MARGIN;
$usableWidth -= $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')) { if ($record->has('title')) {

7
app/Models/Labels/Tapes/Dymo/LabelWriter_30252.php
View file

@ -50,13 +50,6 @@ class LabelWriter_30252 extends LabelWriter
); );
$currentX += $barcodeSize + self::BARCODE_MARGIN; $currentX += $barcodeSize + self::BARCODE_MARGIN;
$usableWidth -= $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')) { if ($record->has('title')) {

18
resources/views/account/view-assets.blade.php
View file

@ -380,13 +380,8 @@
<div class="table table-responsive"> <div class="table table-responsive">
@if ($user->id) @if ($user->id)
<div class="box-header with-border"> <div class="box-header with-border">
<div class="box-heading">
<h2 class="box-title"> {{ trans('admin/users/general.assets_user', array('name' => $user->first_name)) }}</h2>
</div>
</div><!-- /.box-header --> </div><!-- /.box-header -->
@endif @endif
<div class="box-body">
<!-- checked out assets table --> <!-- checked out assets table -->
<div class="table-responsive"> <div class="table-responsive">
@ -421,10 +416,15 @@
<th class="col-md-2" data-switchable="true" data-visible="true"> <th class="col-md-2" data-switchable="true" data-visible="true">
{{ trans('admin/hardware/table.asset_tag') }} {{ trans('admin/hardware/table.asset_tag') }}
</th> </th>
<th class="col-md-2" data-switchable="true" data-visible="false">{{ trans('general.name') }}</th> <th class="col-md-2" data-switchable="true" data-visible="false">
{{ trans('general.name') }}
</th>
<th class="col-md-2" data-switchable="true" data-visible="true"> <th class="col-md-2" data-switchable="true" data-visible="true">
{{ trans('admin/hardware/table.asset_model') }} {{ trans('admin/hardware/table.asset_model') }}
</th> </th>
<th class="col-md-2" data-switchable="true" data-visible="false">
{{ trans('general.model_no') }}
</th>
<th class="col-md-3" data-switchable="true" data-visible="true"> <th class="col-md-3" data-switchable="true" data-visible="true">
{{ trans('admin/hardware/table.serial') }} {{ trans('admin/hardware/table.serial') }}
</th> </th>
@ -482,9 +482,10 @@
{{ $asset->name }} {{ $asset->name }}
</td> </td>
<td> <td>
@if ($asset->physical=='1')
{{ $asset->model->name }} {{ $asset->model->name }}
@endif </td>
<td>
{{ $asset->model->model_number }}
</td> </td>
<td> <td>
{{ $asset->serial }} {{ $asset->serial }}
@ -528,7 +529,6 @@
</table> </table>
</div> </div>
</div> <!-- .table-responsive--> </div> <!-- .table-responsive-->
</div>
</div><!-- /asset --> </div><!-- /asset -->
<div class="tab-pane" id="licenses"> <div class="tab-pane" id="licenses">