Skip to content

A free open source IT asset/license management system

merged develop

Godfrey M199e4d9850a9
diff --git a/app/Models/Labels/CustomLabels/CustomSheetLabel.php b/app/Models/Labels/CustomLabels/CustomSheetLabel.php
index 518d31d0f8..302f21bb99 100644
--- a/app/Models/Labels/CustomLabels/CustomSheetLabel.php
+++ b/app/Models/Labels/CustomLabels/CustomSheetLabel.php
@@ -11,6 +11,7 @@ use App\Models\Labels\CustomLabels\Concerns\HasCustomLabelSupports;
use App\Models\Labels\CustomLabels\Concerns\RenderCustomLabelContent;
use App\Models\Labels\CustomLabels\Concerns\SeedsCustomLabelFromTemplate;
use App\Models\Labels\RectangleSheet;
+use TCPDF;
abstract class CustomSheetLabel extends RectangleSheet
{
@@ -174,7 +175,7 @@ abstract class CustomSheetLabel extends RectangleSheet
return $this->textRenderMode;
}
- public function preparePDF($pdf)
+ public function preparePDF(TCPDF $pdf): void
{
$pdf->SetMargins(0, 0, 0);
$pdf->SetAutoPageBreak(false, 0);
diff --git a/app/Models/Labels/CustomLabels/CustomTapeLabel.php b/app/Models/Labels/CustomLabels/CustomTapeLabel.php
index 10174997bb..017bccbc6e 100644
--- a/app/Models/Labels/CustomLabels/CustomTapeLabel.php
+++ b/app/Models/Labels/CustomLabels/CustomTapeLabel.php
@@ -11,6 +11,7 @@ use App\Models\Labels\CustomLabels\Concerns\RenderCustomLabelContent;
use App\Models\Labels\CustomLabels\Concerns\SeedsCustomLabelFromTemplate;
use App\Models\Labels\Label;
use App\Helpers\Helper;
+use TCPDF;
abstract class CustomTapeLabel extends Label
{
@@ -137,7 +138,7 @@ abstract class CustomTapeLabel extends Label
}
- public function preparePDF($pdf)
+ public function preparePDF(TCPDF $pdf): void
{
$pdf->SetMargins(0, 0, 0);
$pdf->SetAutoPageBreak(false, 0);
diff --git a/app/Models/Labels/Sheets/Avery/L6009_A.php b/app/Models/Labels/Sheets/Avery/L6009_A.php
index ddaa3b5a89..67356cb316 100644
--- a/app/Models/Labels/Sheets/Avery/L6009_A.php
+++ b/app/Models/Labels/Sheets/Avery/L6009_A.php
@@ -147,8 +147,6 @@ class L6009_A extends L6009
];
}
- public function preparePDF($pdf) {}
-
public function write($pdf, $record)
{
$pa = $this->getLabelPrintableArea();
diff --git a/app/Models/Labels/Sheets/Avery/L7162_A.php b/app/Models/Labels/Sheets/Avery/L7162_A.php
index 32a4fd86c2..64f3aa17fc 100644
--- a/app/Models/Labels/Sheets/Avery/L7162_A.php
+++ b/app/Models/Labels/Sheets/Avery/L7162_A.php
@@ -152,9 +152,6 @@ class L7162_A extends L7162
'title' => $this->getSupportTitle(),
];
}
-
- public function preparePDF($pdf) {}
-
public function write($pdf, $record)
{
$pa = $this->getLabelPrintableArea();
diff --git a/app/Models/Labels/Sheets/Avery/L7162_B.php b/app/Models/Labels/Sheets/Avery/L7162_B.php
index 05d694adc0..396450deef 100644
--- a/app/Models/Labels/Sheets/Avery/L7162_B.php
+++ b/app/Models/Labels/Sheets/Avery/L7162_B.php
@@ -168,8 +168,6 @@ class L7162_B extends L7162
];
}
- public function preparePDF($pdf) {}
-
public function write($pdf, $record)
{
$pa = $this->getLabelPrintableArea();
diff --git a/app/Models/Labels/Sheets/Avery/L7163_A.php b/app/Models/Labels/Sheets/Avery/L7163_A.php
index 78abe569a3..0ec0a03891 100644
--- a/app/Models/Labels/Sheets/Avery/L7163_A.php
+++ b/app/Models/Labels/Sheets/Avery/L7163_A.php
@@ -149,8 +149,6 @@ class L7163_A extends L7163
];
}
- public function preparePDF($pdf) {}
-
public function write($pdf, $record)
{
$pa = $this->getLabelPrintableArea();
diff --git a/app/Models/Labels/Sheets/Avery/_3490_A.php b/app/Models/Labels/Sheets/Avery/_3490_A.php
index 1fe61d2a61..2145fa939e 100644
--- a/app/Models/Labels/Sheets/Avery/_3490_A.php
+++ b/app/Models/Labels/Sheets/Avery/_3490_A.php
@@ -171,8 +171,6 @@ class _3490_A extends _3490
];
}
- public function preparePDF($pdf) {}
-
public function write($pdf, $record)
{
$pa = $this->getLabelPrintableArea();
diff --git a/app/Models/Labels/Sheets/Avery/_5267_A.php b/app/Models/Labels/Sheets/Avery/_5267_A.php
index 8d3df6ecfb..ab638abd6e 100644
--- a/app/Models/Labels/Sheets/Avery/_5267_A.php
+++ b/app/Models/Labels/Sheets/Avery/_5267_A.php
@@ -161,8 +161,6 @@ class _5267_A extends _5267
];
}
- public function preparePDF($pdf) {}
-
public function write($pdf, $record)
{
$pa = $this->getLabelPrintableArea();
diff --git a/app/Models/Labels/Sheets/Avery/_5520_A.php b/app/Models/Labels/Sheets/Avery/_5520_A.php
index a05f9f9c7e..728d16e6e3 100644
--- a/app/Models/Labels/Sheets/Avery/_5520_A.php
+++ b/app/Models/Labels/Sheets/Avery/_5520_A.php
@@ -164,9 +164,6 @@ class _5520_A extends _5520
'title_offset_x' => 0.590551,
];
}
-
- public function preparePDF($pdf) {}
-
public function write($pdf, $record)
{
$pa = $this->getLabelPrintableArea();
diff --git a/app/Models/Labels/Sheets/Avery/_5520_B.php b/app/Models/Labels/Sheets/Avery/_5520_B.php
index d69eef98c4..7bfd3a9e88 100644
--- a/app/Models/Labels/Sheets/Avery/_5520_B.php
+++ b/app/Models/Labels/Sheets/Avery/_5520_B.php
@@ -151,8 +151,6 @@ class _5520_B extends _5520
];
}
- public function preparePDF($pdf) {}
-
public function write($pdf, $record)
{
$pa = $this->getLabelPrintableArea();
diff --git a/app/Models/Labels/Sheets/Hema/_14130046.php b/app/Models/Labels/Sheets/Hema/_14130046.php
index 1e3887d2f1..5590d83d10 100644
--- a/app/Models/Labels/Sheets/Hema/_14130046.php
+++ b/app/Models/Labels/Sheets/Hema/_14130046.php
@@ -186,9 +186,6 @@ class _14130046 extends RectangleSheet
'field_value_font' => 'freesans',
];
}
-
- public function preparePDF($pdf) {}
-
public function write($pdf, $record)
{
// The QR code is a square occupying (nearly) the full label height,
diff --git a/app/Models/Labels/Sheets/Hema/_38310012.php b/app/Models/Labels/Sheets/Hema/_38310012.php
index 48868dd981..4ab73791cd 100644
--- a/app/Models/Labels/Sheets/Hema/_38310012.php
+++ b/app/Models/Labels/Sheets/Hema/_38310012.php
@@ -186,8 +186,7 @@ class _38310012 extends RectangleSheet
'field_value_font' => 'freesans',
];
}
- public function preparePDF($pdf) {}
-
+
public function write($pdf, $record)
{
// The QR code is a square occupying (nearly) the full label height,
diff --git a/app/Models/Labels/Tapes/Brother/TZe_12mm_A.php b/app/Models/Labels/Tapes/Brother/TZe_12mm_A.php
index 60c493e849..0630b0d867 100644
--- a/app/Models/Labels/Tapes/Brother/TZe_12mm_A.php
+++ b/app/Models/Labels/Tapes/Brother/TZe_12mm_A.php
@@ -78,8 +78,6 @@ class TZe_12mm_A extends TZe_12mm
];
}
- public function preparePDF($pdf) {}
-
public function write($pdf, $record)
{
$pa = $this->getPrintableArea();
diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php
index 76f23dd974..384fd2ca98 100644
--- a/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php
+++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php
@@ -141,7 +141,6 @@ class LabelWriter_1933081 extends LabelWriter
'text_render_mode' => 'block',
];
}
- public function preparePDF($pdf) {}
public function write($pdf, $record)
{
diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php
index bfe7de2866..8a11c54e17 100644
--- a/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php
+++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php
@@ -141,7 +141,6 @@ class LabelWriter_2112283 extends LabelWriter
'text_render_mode' => 'block',
];
}
- public function preparePDF($pdf) {}
public function write($pdf, $record)
{