A free open source IT asset/license management system
replaced extracted variables with array
Godfrey M1dab36da2d81
diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_11354.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_11354.phpindex edbdb99d9f..50957f446b 100644--- a/app/Models/Labels/Tapes/Dymo/LabelWriter_11354.php+++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_11354.php@@ -127,16 +127,15 @@ class LabelWriter_11354 extends LabelWritermaxScale: 1.8,labelFont: 'freesans',);- extract($field_layout);- if ($hasTitle) {+ if ($field_layout['hasTitle']) {static::writeText($pdf, $title,$currentX, $currentY,- 'freesans', 'b', $titleSize, 'L',- $usableWidth, $titleSize, true, 0+ 'freesans', 'b', $field_layout['titleSize'], 'L',+ $usableWidth, $field_layout['titleSize'], true, 0);- $currentY += $titleAdvance;+ $currentY += $field_layout['titleAdvance'];}foreach ($fields as $field) {$rawLabel = $field['label'] ?? null;@@ -147,11 +146,11 @@ class LabelWriter_11354 extends LabelWriterstatic::writeText($pdf, $value,$currentX, $currentY,- 'freemono', 'B', $fieldSize, 'L',- $usableWidth, $rowAdvance, true, 0, 0.01+ 'freemono', 'B', $field_layout['fieldSize'], 'L',+ $usableWidth, $field_layout['rowAdvance'], true, 0, 0.01);- $currentY += $rowAdvance;+ $currentY += $field_layout['rowAdvance'];continue;}@@ -160,17 +159,17 @@ class LabelWriter_11354 extends LabelWriterstatic::writeText($pdf, $labelText,$currentX, $currentY,- 'freesans', '', $labelSize, 'L',- $labelWidth, $rowAdvance, true, 0+ 'freesans', '', $field_layout['labelSize'], 'L',+ $field_layout['labelWidth'], $field_layout['rowAdvance'], true,);static::writeText($pdf, $field['value'],$field_layout['valueX'], $currentY,- 'freemono', 'B', $fieldSize, 'L',- $valueWidth, $rowAdvance, true, 0, 0.01+ 'freemono', 'B', $field_layout['fieldSize'], 'L',+ $field_layout['valueWidth'], $field_layout['rowAdvance'], true, 0, 0.01);- $currentY += $rowAdvance;+ $currentY += $field_layout['rowAdvance'];;}}diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.phpindex f69ba44889..c84bdd8299 100644--- a/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php+++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php@@ -114,16 +114,15 @@ class LabelWriter_1933081 extends LabelWritermaxScale: 1.8,labelFont: 'freesans',);- extract($field_layout);- if ($hasTitle) {+ if ($field_layout['hasTitle']) {static::writeText($pdf, $title,$currentX, $currentY,- 'freesans', 'b', $titleSize, 'L',- $usableWidth, $titleSize, true, 0+ 'freesans', 'b', $field_layout['titleSize'], 'L',+ $usableWidth, $field_layout['titleSize'], true, 0);- $currentY += $titleAdvance;+ $currentY += $field_layout['titleAdvance'];}foreach ($fields as $field) {$rawLabel = $field['label'] ?? null;@@ -134,11 +133,11 @@ class LabelWriter_1933081 extends LabelWriterstatic::writeText($pdf, $value,$currentX, $currentY,- 'freemono', 'B', $fieldSize, 'L',- $usableWidth, $rowAdvance, true, 0, 0.01+ 'freemono', 'B', $field_layout['fieldSize'], 'L',+ $usableWidth, $field_layout['rowAdvance'], true, 0, 0.01);- $currentY += $rowAdvance;+ $currentY += $field_layout['rowAdvance'];continue;}@@ -147,17 +146,17 @@ class LabelWriter_1933081 extends LabelWriterstatic::writeText($pdf, $labelText,$currentX, $currentY,- 'freesans', '', $labelSize, 'L',- $labelWidth, $rowAdvance, true, 0+ 'freesans', '', $field_layout['labelSize'], 'L',+ $field_layout['labelWidth'], $field_layout['rowAdvance'], true,);static::writeText($pdf, $field['value'],$field_layout['valueX'], $currentY,- 'freemono', 'B', $fieldSize, 'L',- $valueWidth, $rowAdvance, true, 0, 0.01+ 'freemono', 'B', $field_layout['fieldSize'], 'L',+ $field_layout['valueWidth'], $field_layout['rowAdvance'], true, 0, 0.01);- $currentY += $rowAdvance;+ $currentY += $field_layout['rowAdvance'];;}if ($record->has('barcode1d')) {diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.phpindex 5a8d154461..305693ea74 100644--- a/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php+++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php@@ -114,16 +114,15 @@ class LabelWriter_2112283 extends LabelWritermaxScale: 1.8,labelFont: 'freesans',);- extract($field_layout);- if ($hasTitle) {+ if ($field_layout['hasTitle']) {static::writeText($pdf, $title,$currentX, $currentY,- 'freesans', 'b', $titleSize, 'L',- $usableWidth, $titleSize, true, 0+ 'freesans', 'b', $field_layout['titleSize'], 'L',+ $usableWidth, $field_layout['titleSize'], true, 0);- $currentY += $titleAdvance;+ $currentY += $field_layout['titleAdvance'];}foreach ($fields as $field) {$rawLabel = $field['label'] ?? null;@@ -134,11 +133,11 @@ class LabelWriter_2112283 extends LabelWriterstatic::writeText($pdf, $value,$currentX, $currentY,- 'freemono', 'B', $fieldSize, 'L',- $usableWidth, $rowAdvance, true, 0, 0.01+ 'freemono', 'B', $field_layout['fieldSize'], 'L',+ $usableWidth, $field_layout['rowAdvance'], true, 0, 0.01);- $currentY += $rowAdvance;+ $currentY += $field_layout['rowAdvance'];continue;}@@ -147,17 +146,17 @@ class LabelWriter_2112283 extends LabelWriterstatic::writeText($pdf, $labelText,$currentX, $currentY,- 'freesans', '', $labelSize, 'L',- $labelWidth, $rowAdvance, true, 0+ 'freesans', '', $field_layout['labelSize'], 'L',+ $field_layout['labelWidth'], $field_layout['rowAdvance'], true,);static::writeText($pdf, $field['value'],$field_layout['valueX'], $currentY,- 'freemono', 'B', $fieldSize, 'L',- $valueWidth, $rowAdvance, true, 0, 0.01+ 'freemono', 'B', $field_layout['fieldSize'], 'L',+ $field_layout['valueWidth'], $field_layout['rowAdvance'], true, 0, 0.01);- $currentY += $rowAdvance;+ $currentY += $field_layout['rowAdvance'];;}if ($record->has('barcode1d')) {static::write1DBarcode(