diff --git a/app/Models/Labels/DefaultLabel.php b/app/Models/Labels/DefaultLabel.php index f4b480eb4d..9f7059bcd5 100644 --- a/app/Models/Labels/DefaultLabel.php +++ b/app/Models/Labels/DefaultLabel.php @@ -160,18 +160,21 @@ class DefaultLabel extends RectangleSheet $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++; } diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index e69e525e2b..430f9566c2 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -411,13 +411,11 @@ // add some stuff to get the value of the select2 option here? if ((row.available_actions) && (row.available_actions.bulk_selectable) && (row.available_actions.bulk_selectable.delete !== true)) { - console.log('value for ID ' + row.id + ' is NOT true:' + row.available_actions.bulk_selectable.delete); return { disabled:true, //checked: false, <-- not sure this will work the way we want? } } - console.log('value for ID ' + row.id + ' IS true:' + row.available_actions.bulk_selectable.delete); }