DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'
Some checks are pending
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Details
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details

Browse source
This commit is contained in:
snipe 2024-08-16 16:44:02 +01:00
parent bb1385369c ad6d09b6ad
commit c30c649aaa
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resources/views/settings/labels.blade.php
View file

@ -147,14 +147,13 @@
<div class="col-md-7"> <div class="col-md-7">
@php @php
$select1DValues = [ $select1DValues = [
'default' => trans('admin/settings/general.default').' [ '.$setting->alt_barcode.' ]',
'none' => trans('admin/settings/general.none'),
'C128' => 'C128', 'C128' => 'C128',
'C39' => 'C39', 'C39' => 'C39',
'EAN5' => 'EAN5', 'EAN5' => 'EAN5',
'EAN13' => 'EAN13', 'EAN13' => 'EAN13',
'UPCA' => 'UPCA', 'UPCA' => 'UPCA',
'UPCE' => 'UPCE' 'UPCE' => 'UPCE',
'none' => trans('admin/settings/general.none'),
]; ];
@endphp @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' ]) }} {{ Form::select('label2_1d_type', $select1DValues, old('label2_1d_type', $setting->label2_1d_type), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_1d_type' ]) }}
@ -179,11 +178,10 @@
<div class="col-md-7"> <div class="col-md-7">
@php @php
$select2DValues = [ $select2DValues = [
'default' => trans('admin/settings/general.default').' [ '.$setting->barcode_type.' ]',
'none' => trans('admin/settings/general.none'),
'QRCODE' => 'QRCODE', 'QRCODE' => 'QRCODE',
'DATAMATRIX' => 'DATAMATRIX', 'DATAMATRIX' => 'DATAMATRIX',
'PDF417' => 'PDF417', 'PDF417' => 'PDF417',
'none' => trans('admin/settings/general.none'),
]; ];
@endphp @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' ]) }} {{ Form::select('label2_2d_type', $select2DValues, old('label2_2d_type', $setting->label2_2d_type), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_type' ]) }}