diff --git a/app/Models/Labels/DefaultLabel.php b/app/Models/Labels/DefaultLabel.php index b7440e7d3b..8e9273e769 100644 --- a/app/Models/Labels/DefaultLabel.php +++ b/app/Models/Labels/DefaultLabel.php @@ -165,7 +165,7 @@ class DefaultLabel extends RectangleSheet if ($settings->labels_display_name && $fieldsDone < $this->getSupportFields()) { foreach ($record->get('fields') as $field) { static::writeText( - $pdf, $field['label'][0] . ': ' . $field['value'], + $pdf, $field['label'][0]. ': ' . $field['value'], $textX1, $textY, 'freesans', '', $this->textSize, 'L', $textW, $this->textSize, diff --git a/app/View/Label.php b/app/View/Label.php index fd6b172550..0d2a00e8c8 100644 --- a/app/View/Label.php +++ b/app/View/Label.php @@ -79,7 +79,6 @@ class Label implements View $fieldDefinitions = collect(explode(';', $settings->label2_fields)) ->filter(fn($fieldString) => !empty($fieldString)) ->map(fn($fieldString) => Field::fromString($fieldString)); - // Prepare data $data = $assets ->map(function ($asset) use ($template, $settings, $fieldDefinitions) { @@ -154,7 +153,6 @@ class Label implements View return $toAdd ? $myFields->push($toAdd) : $myFields; }, new Collection()); - $assetData->put('fields', $fields->take($template->getSupportFields())); return $assetData; diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index 50d81a8883..1877b763e0 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -255,7 +255,6 @@ {{ Form::hidden('labels_display_model', old('labels_display_model', $setting->labels_display_model)) }} {{ Form::hidden('labels_display_company_name', old('labels_display_company_name', $setting->labels_display_company_name)) }} @else -
@@ -378,8 +377,7 @@ {!! $errors->first('labels_pageheight', '') !!}
- @endif - @if(!$setting->label2_enable) +
{{ Form::label('labels_display', trans('admin/settings/general.label_fields'), ['class' => 'control-label']) }} @@ -405,13 +403,9 @@ {{ Form::checkbox('labels_display_company_name', '1', old('labels_display_company_name', $setting->labels_display_company_name),['class' => 'minimal', 'aria-label'=>'labels_display_company_name']) }} {{ trans('admin/companies/table.name') }} -
- @endif - -