diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index 1de5d4035..3a549525d 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -359,9 +359,12 @@
trans('general.pie_chart_type')) }}
- {{ Form::select('dash_chart_type', array(
- 'name' => 'Status Label Name',
- 'type' => 'Status Label Type'), old('dash_chart_type', $setting->dash_chart_type), ['class' =>'select2', 'style' => 'width: 80%']) }}
+
@@ -372,11 +375,13 @@
{{ Form::label('depreciation_method', trans('Depreciation method')) }}
- {{ Form::select('depreciation_method', array(
- 'default' => 'Linear (default)',
- 'half_1' => 'Half-year convention, always applied',
- 'half_2' => 'Half-year convention, applied with condition',
- ), old('username_format', $setting->depreciation_method), ['class' =>'select2', 'style' => 'width: 80%']) }}
+
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index fa8c5dc85..8666ab872 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -170,7 +170,14 @@
'none' => trans('admin/settings/general.none'),
];
@endphp
- {{ Form::select('label2_1d_type', $select1DValues, old('label2_1d_type', $setting->label2_1d_type), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_1d_type' ]) }}
+
{!! $errors->first('label2_1d_type', ' :message') !!}
{{ trans('admin/settings/general.label2_1d_type_help') }}.
@@ -214,7 +221,14 @@
'none' => trans('admin/settings/general.none'),
]);
@endphp
- {{ Form::select('label2_2d_type', $select2DValues, old('label2_2d_type', $setting->label2_2d_type), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_type' ]) }}
+
{!! $errors->first('label2_2d_type', ' :message') !!}
{{ trans('admin/settings/general.label2_2d_type_help', ['current' => $setting->barcode_type]) }}.
@@ -277,13 +291,14 @@
{{ Form::label('label2_2d_target', trans('admin/settings/general.label2_2d_target'), ['class'=>'control-label']) }}
- {{ Form::select('label2_2d_target', [
- 'hardware_id' => trans('general.url') .': /hardware/{id} ('.trans('admin/settings/general.default').')',
- 'ht_tag' => trans('general.url') .': /ht/{asset_tag}',
- 'plain_asset_id' => trans('admin/settings/general.data') .': '. trans('admin/settings/general.asset_id') .' {id}',
- 'plain_asset_tag' => trans('admin/settings/general.data') .': '. trans('general.asset_tag') .' {asset_tag}',
- 'plain_serial_number' => trans('admin/settings/general.data') .': '. trans('general.serial_number') .' {serial}',
- ], old('label2_2d_target', $setting->label2_2d_target), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_target' ]) }}
+
{!! $errors->first('label2_2d_target', '
:message') !!}
{{ trans('admin/settings/general.label2_2d_target_help') }}
diff --git a/resources/views/statuslabels/edit.blade.php b/resources/views/statuslabels/edit.blade.php
index af69f35de..27fb91148 100755
--- a/resources/views/statuslabels/edit.blade.php
+++ b/resources/views/statuslabels/edit.blade.php
@@ -27,7 +27,13 @@
{{ trans('admin/statuslabels/table.status_type') }}
- {{ Form::select('statuslabel_types', $statuslabel_types, $item->getStatuslabelType(), array('class'=>'select2', 'style'=>'width: 100%; min-width:400px', 'aria-label'=>'statuslabel_types')) }}
+
{!! $errors->first('statuslabel_types', ' :message') !!}