Merge pull request #14404 from snipe/fixes/Uninitialized-string-offse…

…t-0-in-labels Fixed uninitialized offset in labels in new label engine
snipe · Mar 10, 2024 · 3fdee88 · 3fdee88
2 parents 28ec0b8 + a289dfa
commit 3fdee88
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/app/Models/Labels/DefaultLabel.php b/app/Models/Labels/DefaultLabel.php
@@ -160,18 +160,21 @@ public function write($pdf, $record) {
             $textY += $this->textSize + self::TEXT_MARGIN;
         }
 
-        // Fields
+        // Render the selected fields with their labels
         $fieldsDone = 0;
         if ($fieldsDone < $this->getSupportFields()) {
-//            dd($record->get('fields'));
+
             foreach ($record->get('fields') as $field) {
+
+                // Actually write the selected fields and their matching values
                 static::writeText(
-                    $pdf, $field['label'][0]. ': ' . $field['value'],
+                    $pdf, (($field['label']) ? $field['label'].' ' : '') . $field['value'],
                     $textX1, $textY,
                     'freesans', '', $this->textSize, 'L',
                     $textW, $this->textSize,
                     true, 0
                 );
+
                 $textY += $this->textSize + self::TEXT_MARGIN;
                 $fieldsDone++;
             }