mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-25 05:34:06 -08:00
Merge remote-tracking branch 'origin/develop'
Some checks are pending
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Some checks are pending
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
This commit is contained in:
commit
c30c649aaa
|
@ -147,14 +147,13 @@
|
|||
<div class="col-md-7">
|
||||
@php
|
||||
$select1DValues = [
|
||||
'default' => trans('admin/settings/general.default').' [ '.$setting->alt_barcode.' ]',
|
||||
'none' => trans('admin/settings/general.none'),
|
||||
'C128' => 'C128',
|
||||
'C39' => 'C39',
|
||||
'EAN5' => 'EAN5',
|
||||
'EAN13' => 'EAN13',
|
||||
'UPCA' => 'UPCA',
|
||||
'UPCE' => 'UPCE'
|
||||
'UPCE' => 'UPCE',
|
||||
'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' ]) }}
|
||||
|
@ -179,11 +178,10 @@
|
|||
<div class="col-md-7">
|
||||
@php
|
||||
$select2DValues = [
|
||||
'default' => trans('admin/settings/general.default').' [ '.$setting->barcode_type.' ]',
|
||||
'none' => trans('admin/settings/general.none'),
|
||||
'QRCODE' => 'QRCODE',
|
||||
'DATAMATRIX' => 'DATAMATRIX',
|
||||
'PDF417' => 'PDF417',
|
||||
'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' ]) }}
|
||||
|
|
Loading…
Reference in a new issue