Skip to content

A free open source IT asset/license management system

slight adjustments to label content sizing"

Godfrey M47529ef5a50d
diff --git a/app/Models/Labels/CustomLabels/CustomTapeLabel.php b/app/Models/Labels/CustomLabels/CustomTapeLabel.php
index b771686da6..b737d4d14c 100644
--- a/app/Models/Labels/CustomLabels/CustomTapeLabel.php
+++ b/app/Models/Labels/CustomLabels/CustomTapeLabel.php
@@ -438,7 +438,7 @@ abstract class CustomTapeLabel extends Label
protected function renderTag($pdf, $record, array $layout): void
{
- if ($this->getTextRenderMode() === 'block') {
+ if (in_array($this->getTextRenderMode(), ['block', 'vertical_stack'], true)) {
$this->renderBlockTag($pdf, $record, $layout);
return;
}
diff --git a/app/Models/Labels/Sheets/Avery/L4736_A.php b/app/Models/Labels/Sheets/Avery/L4736_A.php
index 4690615bbe..c38fed86fe 100644
--- a/app/Models/Labels/Sheets/Avery/L4736_A.php
+++ b/app/Models/Labels/Sheets/Avery/L4736_A.php
@@ -89,7 +89,7 @@ class L4736_A extends L4736
public function getSupportAssetTag()
{
- return true;
+ return false;
}
public function getSupport1DBarcode()
@@ -121,12 +121,15 @@ class L4736_A extends L4736
{
return [
'barcode_margin' => $this->getBarcodeMargin(),
+ 'barcode_2d_size' => 15,
'tag_font_size' => $this->getTagSize(),
'title_font_size' => $this->getTitleSize(),
'title_margin' => $this->getTitleMargin(),
- 'field_label_font_size' => $this->getLabelSize(),
+ 'title_position' => 'top',
+ 'title_offset_x' => 7,
+ 'field_label_font_size' => 1.8,
'field_label_margin' => $this->getLabelMargin(),
- 'field_value_font_size' => $this->getFieldSize(),
+ 'field_value_font_size' => 2.8,
'field_value_margin' => $this->getFieldMargin(),
];
}
diff --git a/app/Models/Labels/Sheets/Avery/_3490_A.php b/app/Models/Labels/Sheets/Avery/_3490_A.php
index fd8e98e463..1fe61d2a61 100644
--- a/app/Models/Labels/Sheets/Avery/_3490_A.php
+++ b/app/Models/Labels/Sheets/Avery/_3490_A.php
@@ -146,6 +146,8 @@ class _3490_A extends _3490
'tag_font_size' => $this->getTagSize(),
'title_font_size' => $this->getTitleSize(),
'title_margin' => $this->getTitleMargin(),
+ 'title_position' => 'top',
+ 'title_offset_x' => 0.669291,
'field_label_font_size' => $this->getLabelSize(),
'field_label_margin' => $this->getLabelMargin(),
'field_value_font_size' => $this->getFieldSize(),
diff --git a/app/Models/Labels/Sheets/Avery/_5520_B.php b/app/Models/Labels/Sheets/Avery/_5520_B.php
index b347d71c19..d69eef98c4 100644
--- a/app/Models/Labels/Sheets/Avery/_5520_B.php
+++ b/app/Models/Labels/Sheets/Avery/_5520_B.php
@@ -125,15 +125,17 @@ class _5520_B extends _5520
protected function getContentEditorConfig(): array
{
return [
- 'barcode_size' => $this->getBarcodeSize(),
+ 'barcode_size' => .15,
'barcode_margin' => .025,
'tag_font_size' => $this->getTagSize(),
- 'title_font_size' => $this->getTitleSize(),
+ 'title_font_size' => 0.0826772,
'title_margin' => $this->getTitleMargin(),
- 'field_label_font_size' => $this->getLabelSize(),
+ 'title_offset_x' => 0.629921,
+ 'field_label_font_size' => 0.09,
'field_label_margin' => $this->getLabelMargin(),
- 'field_value_font_size' => $this->getFieldSize(),
+ 'field_value_font_size' => 0.1106299,
'field_value_margin' => $this->getFieldMargin(),
+ 'text_render_mode' => 'vertical_stack'
];
}
diff --git a/app/Models/Labels/Tapes/Brother/TZe_12mm_A.php b/app/Models/Labels/Tapes/Brother/TZe_12mm_A.php
index 615a814a48..60c493e849 100644
--- a/app/Models/Labels/Tapes/Brother/TZe_12mm_A.php
+++ b/app/Models/Labels/Tapes/Brother/TZe_12mm_A.php
@@ -72,6 +72,9 @@ class TZe_12mm_A extends TZe_12mm
'barcode_size' => $this->getBarcodeSize(),
'barcode_margin' => $this->getBarcodeMargin(),
'text_size_mod' => $this->getTextSizeMod(),
+ 'field_label_font_size' => 0.1,
+ 'field_value_font_size' => 0,
+ 'tag_font_size' => 3.5,
];
}
diff --git a/app/Models/Labels/Tapes/Brother/TZe_18mm_A.php b/app/Models/Labels/Tapes/Brother/TZe_18mm_A.php
index 927dfd05e5..1128e0fec7 100644
--- a/app/Models/Labels/Tapes/Brother/TZe_18mm_A.php
+++ b/app/Models/Labels/Tapes/Brother/TZe_18mm_A.php
@@ -70,6 +70,10 @@ class TZe_18mm_A extends TZe_18mm
'barcode_size' => $this->getBarcodeSize(),
'barcode_margin' => $this->getBarcodeMargin(),
'text_size_mod' => $this->getTextSizeMod(),
+ 'tag_font_size' => 5.5,
+ 'field_value_font_size' => 5.5,
+ 'field_label_font_size' => 0.1,
+ 'tag_offset_y' => -3,
];
}
diff --git a/app/Models/Labels/Tapes/Brother/TZe_24mm_A.php b/app/Models/Labels/Tapes/Brother/TZe_24mm_A.php
index 12494e6bff..aebe626664 100644
--- a/app/Models/Labels/Tapes/Brother/TZe_24mm_A.php
+++ b/app/Models/Labels/Tapes/Brother/TZe_24mm_A.php
@@ -101,15 +101,17 @@ class TZe_24mm_A extends TZe_24mm
public function getTextRenderMode(): string
{
- return 'block';
+ return 'vertical_stack';
}
protected function getContentEditorConfig(): array
{
return [
'barcode_margin' => $this->getBarcodeMargin(),
+ 'barcode_2d_size' => 15,
'tag_font_size' => $this->getTagSize(),
+ 'tag_offset_x' => 2,
'title_font_size' => $this->getTitleSize(),
'title_margin' => $this->getTitleMargin(),