From 23038ab209a494b22133c0bb46bee93b4cd4bfe0 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 14 Nov 2024 08:54:12 -0800 Subject: [PATCH 1/2] removes tag if qr code is not present --- app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php index 9b56012f7a..eeaa23c3f5 100644 --- a/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php +++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php @@ -49,13 +49,6 @@ class LabelWriter_1933081 extends LabelWriter ); $currentX += $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')) { From 0f1f6bc6a50e1709b4b3e69717fa92b2d93ac064 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 14 Nov 2024 09:45:52 -0800 Subject: [PATCH 2/2] fixed rest of dymos --- app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php | 7 +++++++ app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php | 7 ------- app/Models/Labels/Tapes/Dymo/LabelWriter_30252.php | 7 ------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php index eeaa23c3f5..9b56012f7a 100644 --- a/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php +++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php @@ -49,6 +49,13 @@ class LabelWriter_1933081 extends LabelWriter ); $currentX += $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')) { diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php index e1305bd068..117486a8e5 100644 --- a/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php +++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php @@ -49,13 +49,6 @@ class LabelWriter_2112283 extends LabelWriter ); $currentX += $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')) { diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_30252.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_30252.php index d5f0e8d122..ed8074547b 100644 --- a/app/Models/Labels/Tapes/Dymo/LabelWriter_30252.php +++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_30252.php @@ -50,13 +50,6 @@ class LabelWriter_30252 extends LabelWriter ); $currentX += $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')) {