DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-03 18:07:41 -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 2023-08-18 18:14:40 +01:00
parent 384428148b 802651a1b4
commit 8e9fa613e3
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/Models/Labels/DefaultLabel.php
View file

@ -37,7 +37,7 @@ class DefaultLabel extends RectangleSheet
private int $columns; private int $columns;
private int $rows; private int $rows;
public function __construct() { public function __construct() {
$settings = Setting::getSettings(); $settings = Setting::getSettings();
@ -62,6 +62,16 @@ class DefaultLabel extends RectangleSheet
$this->columns = ($usableWidth + $this->labelSpacingH) / ($this->labelWidth + $this->labelSpacingH); $this->columns = ($usableWidth + $this->labelSpacingH) / ($this->labelWidth + $this->labelSpacingH);
$this->rows = ($usableHeight + $this->labelSpacingV) / ($this->labelHeight + $this->labelSpacingV); $this->rows = ($usableHeight + $this->labelSpacingV) / ($this->labelHeight + $this->labelSpacingV);
// Make sure the columns and rows are never zero, since that scenario should never happen
if ($this->columns == 0) {
$this->columns = 1;
}
if ($this->rows == 0) {
$this->rows = 1;
}
} }
public function getUnit() { return 'in'; } public function getUnit() { return 'in'; }
@ -85,7 +95,7 @@ class DefaultLabel extends RectangleSheet
public function getLabelMarginBottom() { return 0; } public function getLabelMarginBottom() { return 0; }
public function getLabelMarginLeft() { return 0; } public function getLabelMarginLeft() { return 0; }
public function getLabelMarginRight() { return 0; } public function getLabelMarginRight() { return 0; }
public function getLabelColumnSpacing() { return $this->labelSpacingH; } public function getLabelColumnSpacing() { return $this->labelSpacingH; }
public function getLabelRowSpacing() { return $this->labelSpacingV; } public function getLabelRowSpacing() { return $this->labelSpacingV; }
@ -106,7 +116,7 @@ class DefaultLabel extends RectangleSheet
$textY = 0; $textY = 0;
$textX1 = 0; $textX1 = 0;
$textX2 = $this->getLabelWidth(); $textX2 = $this->getLabelWidth();
// 1D Barcode // 1D Barcode
if ($record->get('barcode1d')) { if ($record->get('barcode1d')) {
static::write1DBarcode( static::write1DBarcode(
@ -115,7 +125,7 @@ class DefaultLabel extends RectangleSheet
$this->getLabelWidth() - 0.1, self::BARCODE1D_SIZE $this->getLabelWidth() - 0.1, self::BARCODE1D_SIZE
); );
} }
// 2D Barcode // 2D Barcode
if ($record->get('barcode2d')) { if ($record->get('barcode2d')) {
static::write2DBarcode( static::write2DBarcode(