mirror of
https://github.com/snipe/snipe-it.git
synced 2025-02-02 08:21:09 -08:00
Merge pull request #15817 from Godmartinz/label_fix
Removes asset tag if 2D code is not present
This commit is contained in:
commit
f2faf58786
|
@ -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')) {
|
||||||
|
|
|
@ -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')) {
|
||||||
|
|
Loading…
Reference in a new issue