From df8b1c0240233d0972e005684b38aac2c1d52612 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 3 Sep 2024 12:29:52 -0700 Subject: [PATCH 01/57] hides barcode settings if new label engine enabled --- resources/views/settings/index.blade.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index 5a4c91c446..ecaf6daaa7 100755 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -186,7 +186,7 @@ - + @if($settings->label2_enable == 0)
@@ -201,6 +201,7 @@
+ @endif
From ce987b4f6d171a83d7ea5a7f8d38ffc490e4f0f2 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 17 Sep 2024 11:23:38 -0700 Subject: [PATCH 02/57] added front end barcodes to labels --- app/Http/Controllers/SettingsController.php | 3 + resources/views/settings/index.blade.php | 4 +- resources/views/settings/labels.blade.php | 112 +++++++++++++++++++- routes/web.php | 2 +- 4 files changed, 117 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 31b4179b4a..685e91e30e 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -769,8 +769,11 @@ class SettingsController extends Controller */ public function getLabels() : View { + $is_gd_installed = extension_loaded('gd'); + return view('settings.labels') ->with('setting', Setting::getSettings()) + ->with('is_gd_installed', $is_gd_installed) ->with('customFields', CustomField::where('field_encrypted', '=', 0)->get()); } diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index ecaf6daaa7..8834b21d90 100755 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -186,7 +186,7 @@
- @if($settings->label2_enable == 0) +
@@ -201,7 +201,7 @@
- @endif +
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index 33640edbf2..e7f352c01b 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -138,7 +138,7 @@
- + @endif
@@ -197,7 +197,52 @@

+ @if($setting->label2_enable == 0) + +
+
+ {{ Form::label('qr_text', trans('admin/settings/general.qr_text'), ['class'=>'control-label']) }} +
+
+ @if ($setting->qr_code == 1) + {{ Form::text('qr_text', old('qr_text', $setting->qr_text), array( + 'class' => 'form-control', + 'placeholder' => 'Property of Your Company', + 'rel' => 'txtTooltip', + 'title' =>'Extra text that you would like to display on your labels.', + 'data-toggle' =>'tooltip', + 'data-placement'=>'top' + )) }} + @else + {{ Form::text('qr_text', old('qr_text', $setting->qr_text), array( + 'class' => 'form-control', + 'disabled' => 'disabled', + 'placeholder' => 'Property of Your Company' + )) }} +

{{ trans('admin/settings/general.qr_help') }}

+ @endif + {!! $errors->first('qr_text', '') !!} +
+
+ +
+
+ {{ Form::label('purge_barcodes', 'Purge Barcodes', ['class'=>'control-label']) }} +
+
+ + {{ trans('admin/settings/general.barcode_delete_cache') }} + + + + + {!! $errors->first('purgebarcodes', '') !!} +

{{ trans('admin/settings/general.barcodes_help') }}

+
+
+ @endif + @if ($setting->label2_enable)
@@ -227,6 +272,7 @@ @include('partials.bootstrap-table') @else + {{ Form::hidden('label2_template', old('label2_template', $setting->label2_template)) }} {{ Form::hidden('label2_title', old('label2_title', $setting->label2_title)) }} @@ -258,6 +304,17 @@ {{ Form::hidden('labels_display_company_name', old('labels_display_company_name', $setting->labels_display_company_name)) }} @else + + + + {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }} + + {{csrf_field()}} +
{{ Form::label('labels_per_page', trans('admin/settings/general.labels_per_page'), ['class'=>'control-label']) }} @@ -430,6 +487,59 @@ @stop @push('js') + {{-- Can't use @script here because we're not in a livewire component so let's manually load --}} @livewireScripts @endpush diff --git a/routes/web.php b/routes/web.php index f3ba8350f2..a05b7aba63 100644 --- a/routes/web.php +++ b/routes/web.php @@ -204,7 +204,7 @@ Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser Route::get('barcodes', [SettingsController::class, 'getBarcodes'])->name('settings.barcodes.index'); Route::post('barcodes', [SettingsController::class, 'postBarcodes'])->name('settings.barcodes.save'); - Route::get('labels', [SettingsController::class, 'getLabels'])->name('settings.labels.index'); + Route::get('labels', [SettingsController::class, 'getLabels', 'getBarcodes'])->name('settings.labels.index'); Route::post('labels', [SettingsController::class, 'postLabels'])->name('settings.labels.save'); Route::get('ldap', [SettingsController::class, 'getLdapSettings'])->name('settings.ldap.index'); From 3682d9fa6cd78ee6ca17136b7d31dbde2c61fc76 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 17 Sep 2024 11:23:59 -0700 Subject: [PATCH 03/57] removed duplicate line from post labels --- app/Http/Controllers/SettingsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 685e91e30e..a39e65b3af 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -809,7 +809,7 @@ class SettingsController extends Controller $setting->labels_pagewidth = $request->input('labels_pagewidth'); $setting->labels_pageheight = $request->input('labels_pageheight'); $setting->labels_display_company_name = $request->input('labels_display_company_name', '0'); - $setting->labels_display_company_name = $request->input('labels_display_company_name', '0'); + From 033a56fe6d6a3a316b6935c086f2cce15ebfb3c8 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 17 Sep 2024 12:22:05 -0700 Subject: [PATCH 04/57] change variables in hardware labels edit post methods --- app/Http/Controllers/Assets/AssetsController.php | 4 ++-- app/Http/Controllers/SettingsController.php | 12 +++++++----- resources/views/hardware/labels.blade.php | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index 59b22b386d..2a15747d33 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -508,7 +508,7 @@ class AssetsController extends Controller if ($settings->qr_code == '1') { $asset = Asset::withTrashed()->find($assetId); if ($asset) { - $size = Helper::barcodeDimensions($settings->barcode_type); + $size = Helper::barcodeDimensions($settings->label2_2d_type); $qr_file = public_path().'/uploads/barcodes/qr-'.str_slug($asset->asset_tag).'-'.str_slug($asset->id).'.png'; if (isset($asset->id, $asset->asset_tag)) { @@ -518,7 +518,7 @@ class AssetsController extends Controller return response()->file($qr_file, $header); } else { $barcode = new \Com\Tecnick\Barcode\Barcode(); - $barcode_obj = $barcode->getBarcodeObj($settings->barcode_type, route('hardware.show', $asset->id), $size['height'], $size['width'], 'black', [-2, -2, -2, -2]); + $barcode_obj = $barcode->getBarcodeObj($settings->label2_2d_type, route('hardware.show', $asset->id), $size['height'], $size['width'], 'black', [-2, -2, -2, -2]); file_put_contents($qr_file, $barcode_obj->getPngData()); return response($barcode_obj->getPngData())->header('Content-type', 'image/png'); diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index a39e65b3af..3000ec7f14 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -730,11 +730,7 @@ class SettingsController extends Controller return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error')); } - $setting->qr_code = $request->input('qr_code', '0'); - $setting->alt_barcode = $request->input('alt_barcode'); - $setting->alt_barcode_enabled = $request->input('alt_barcode_enabled', '0'); - $setting->barcode_type = $request->input('barcode_type'); - $setting->qr_text = $request->input('qr_text'); + if ($setting->save()) { return redirect()->route('settings.index') @@ -810,6 +806,12 @@ class SettingsController extends Controller $setting->labels_pageheight = $request->input('labels_pageheight'); $setting->labels_display_company_name = $request->input('labels_display_company_name', '0'); + //Barcodes + $setting->qr_code = $request->input('qr_code', '0'); + //1D-Barcode + $setting->alt_barcode_enabled = $request->input('alt_barcode_enabled', '0'); + //QR-Code + $setting->qr_text = $request->input('qr_text'); diff --git a/resources/views/hardware/labels.blade.php b/resources/views/hardware/labels.blade.php index ab4cb5e339..0d675d3beb 100644 --- a/resources/views/hardware/labels.blade.php +++ b/resources/views/hardware/labels.blade.php @@ -11,7 +11,7 @@ $settings->labels_width = $settings->labels_width - $settings->labels_display_sgutter; $settings->labels_height = $settings->labels_height - $settings->labels_display_bgutter; // Leave space on bottom for 1D barcode if necessary -$qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->alt_barcode!='') ? $settings->labels_height - .3 : $settings->labels_height - 0.1; +$qr_size = ($settings->alt_barcode_enabled=='1') && ($settings->label2_1d_type!='') ? $settings->labels_height - .3 : $settings->labels_height - 0.1; ?> - - - {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }} - - {{csrf_field()}} - -
-
- - -
-
-

- - {{ trans('admin/settings/general.barcodes') }} -

-
-
- - -
- - @if ($is_gd_installed) - -
-
- -
-
- - -
-
- {{ Form::label('barcode_type', trans('admin/settings/general.barcode_type')) }} -
-
- {!! Form::barcode_types('barcode_type', old('barcode_type', $setting->barcode_type), 'select2 col-md-4') !!} - {!! $errors->first('barcode_type', '') !!} -
-
- - -
- -
- -
-
- - -
-
- {{ Form::label('alt_barcode', trans('admin/settings/general.alt_barcode_type')) }} -
-
- {!! Form::alt_barcode_types('alt_barcode', old('alt_barcode', $setting->alt_barcode), 'select2 col-md-4') !!} - {!! $errors->first('barcode_type', '') !!} -
-
- @else - - {{ trans('admin/settings/general.php_gd_warning') }} -
- {{ trans('admin/settings/general.php_gd_info') }} -
- @endif - - -
-
- {{ Form::label('qr_text', trans('admin/settings/general.qr_text')) }} -
-
- @if ($setting->qr_code == 1) - {{ Form::text('qr_text', old('qr_text', $setting->qr_text), array('class' => 'form-control','placeholder' => 'Property of Your Company', - 'rel' => 'txtTooltip', - 'title' =>'Extra text that you would like to display on your labels. ', - 'data-toggle' =>'tooltip', - 'data-placement'=>'top')) }} - {!! $errors->first('qr_text', '') !!} - @else - {{ Form::text('qr_text', old('qr_text', $setting->qr_text), array('class' => 'form-control', 'disabled'=>'disabled','placeholder' => 'Property of Your Company')) }} -

{{ trans('admin/settings/general.qr_help') }}

- @endif -
-
- - -
-
- {{ Form::label('purge_barcodes', 'Purge Barcodes') }} -
- -
-
-
-
-

{{ trans('admin/settings/general.barcodes_help') }}

-
- -
- - -
- -
- -
-
-
- - {{Form::close()}} - -@stop - -@push('js') - - - -@endpush diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index 8834b21d90..bf22638adf 100755 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -187,22 +187,6 @@
-
-
-
-
- - -

- {{ trans('admin/settings/general.barcodes') }} -
-
-

{!! trans('admin/settings/general.barcodes_help_overview') !!}

-
-
-
- -
diff --git a/routes/web.php b/routes/web.php index a05b7aba63..c7fecb86a0 100644 --- a/routes/web.php +++ b/routes/web.php @@ -201,10 +201,7 @@ Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser Route::get('asset_tags', [SettingsController::class, 'getAssetTags'])->name('settings.asset_tags.index'); Route::post('asset_tags', [SettingsController::class, 'postAssetTags'])->name('settings.asset_tags.save'); - Route::get('barcodes', [SettingsController::class, 'getBarcodes'])->name('settings.barcodes.index'); - Route::post('barcodes', [SettingsController::class, 'postBarcodes'])->name('settings.barcodes.save'); - - Route::get('labels', [SettingsController::class, 'getLabels', 'getBarcodes'])->name('settings.labels.index'); + Route::get('labels', [SettingsController::class, 'getLabels'])->name('settings.labels.index'); Route::post('labels', [SettingsController::class, 'postLabels'])->name('settings.labels.save'); Route::get('ldap', [SettingsController::class, 'getLdapSettings'])->name('settings.ldap.index'); From 87c72953b279312b1f201ab472a439a71a17a29a Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 17 Sep 2024 16:37:17 -0700 Subject: [PATCH 07/57] udpated translation --- resources/lang/en-US/admin/settings/general.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php index 9a81886ae8..2589d23f3b 100644 --- a/resources/lang/en-US/admin/settings/general.php +++ b/resources/lang/en-US/admin/settings/general.php @@ -55,7 +55,7 @@ return [ 'display_asset_name' => 'Display Asset Name', 'display_checkout_date' => 'Display Checkout Date', 'display_eol' => 'Display EOL in table view', - 'display_qr' => 'Display Square Codes', + 'display_qr' => 'Display 2D BarCode', 'display_alt_barcode' => 'Display 1D barcode', 'email_logo' => 'Email Logo', 'barcode_type' => '2D Barcode Type', From e5daf35f6505f28644023a93e79d6e5077c73a27 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 17 Sep 2024 16:39:55 -0700 Subject: [PATCH 08/57] fat finger fix --- resources/lang/en-US/admin/settings/general.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php index 2589d23f3b..07e0bb886a 100644 --- a/resources/lang/en-US/admin/settings/general.php +++ b/resources/lang/en-US/admin/settings/general.php @@ -55,7 +55,7 @@ return [ 'display_asset_name' => 'Display Asset Name', 'display_checkout_date' => 'Display Checkout Date', 'display_eol' => 'Display EOL in table view', - 'display_qr' => 'Display 2D BarCode', + 'display_qr' => 'Display 2D Barcode', 'display_alt_barcode' => 'Display 1D barcode', 'email_logo' => 'Email Logo', 'barcode_type' => '2D Barcode Type', From bbb9babf278e8990ef51071d72a7cf37712c7180 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 17 Sep 2024 16:40:18 -0700 Subject: [PATCH 09/57] one more finger --- resources/lang/en-US/admin/settings/general.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php index 07e0bb886a..f893ca7e08 100644 --- a/resources/lang/en-US/admin/settings/general.php +++ b/resources/lang/en-US/admin/settings/general.php @@ -55,7 +55,7 @@ return [ 'display_asset_name' => 'Display Asset Name', 'display_checkout_date' => 'Display Checkout Date', 'display_eol' => 'Display EOL in table view', - 'display_qr' => 'Display 2D Barcode', + 'display_qr' => 'Display 2D barcode', 'display_alt_barcode' => 'Display 1D barcode', 'email_logo' => 'Email Logo', 'barcode_type' => '2D Barcode Type', From 04708ae2b26662563713921bfe5196c75674258a Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 17 Sep 2024 16:54:50 -0700 Subject: [PATCH 10/57] only allows PDF417 for new label engine --- resources/views/settings/labels.blade.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index 6746f3626f..9b9dca86ab 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -205,9 +205,11 @@ $select2DValues = [ 'QRCODE' => 'QRCODE', 'DATAMATRIX' => 'DATAMATRIX', - 'PDF417' => 'PDF417', 'none' => trans('admin/settings/general.none'), ]; + if ($setting->label2_enable == 1) { + $select2DValues['PDF417'] = 'PDF417'; + } @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', '') !!} From c9854d43a58bf5db190dcc7867dd6dc68ad8fb73 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 17 Sep 2024 16:56:02 -0700 Subject: [PATCH 11/57] fixes selection order --- resources/views/settings/labels.blade.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index 9b9dca86ab..403e2c4bf9 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -204,12 +204,14 @@ @php $select2DValues = [ 'QRCODE' => 'QRCODE', - 'DATAMATRIX' => 'DATAMATRIX', - 'none' => trans('admin/settings/general.none'), ]; if ($setting->label2_enable == 1) { $select2DValues['PDF417'] = 'PDF417'; } + $select2DValues = array_merge($select2DValues, [ + 'DATAMATRIX' => 'DATAMATRIX', + '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', '') !!} From ae3cb7b37ba3abd8f6689a7313fd52a63353ab1b Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 31 Oct 2024 14:35:13 -0700 Subject: [PATCH 12/57] adds migration to update new with old if blank and remove old barcod variables --- ...date_new_and_drop_old_barcode_settings.php | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 database/migrations/2024_10_31_212512_update_new_and_drop_old_barcode_settings.php diff --git a/database/migrations/2024_10_31_212512_update_new_and_drop_old_barcode_settings.php b/database/migrations/2024_10_31_212512_update_new_and_drop_old_barcode_settings.php new file mode 100644 index 0000000000..a802f04290 --- /dev/null +++ b/database/migrations/2024_10_31_212512_update_new_and_drop_old_barcode_settings.php @@ -0,0 +1,46 @@ +whereNull('label2_2d_type')->orWhere('label2_2d_type', '')->update([ + 'label2_2d_type' => DB::raw('barcode_type') + ]); + + DB::table('settings')->whereNull('label2_1d_type')->orWhere('label2_1d_type', '')->update([ + 'label2_1d_type' => DB::raw('alt_barcode') + ]); + + + Schema::table('settings', function (Blueprint $table) { + $table->dropColumn(['barcode_type', 'alt_barcode']); + }); + } + + public function down() + { + Schema::table('settings', function (Blueprint $table) { + // Re-add the columns that were dropped in case of rollback + $table->string('barcode_type')->nullable(); + $table->string('alt_barcode')->nullable(); + }); + + DB::table('settings')->whereNull('barcode_type')->orWhere('barcode_type', '')->update([ + 'barcode_type' => DB::raw('label2_2d_type') + ]); + + DB::table('settings')->whereNull('alt_barcode')->orWhere('alt_barcode', '')->update([ + 'alt_barcode' => DB::raw('label2_1d_type') + ]); + } +}; From ee58fcc8984f6c253c639c8998688f2b993dbfa0 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 31 Oct 2024 14:37:08 -0700 Subject: [PATCH 13/57] moved lines in for labels --- resources/views/settings/labels.blade.php | 26 +++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index 403e2c4bf9..d1499b7d6c 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -139,20 +139,20 @@
@endif - @if($setting->label2_enable == 0) - @if ($is_gd_installed) - -
+ @if($setting->label2_enable == 0) + @if ($is_gd_installed) + +
-
- -
-
- @endif - @endif +
+ +
+
+ @endif + @endif
From de77eda33d4a3d24842b18b567a417a5b62b4e21 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 31 Oct 2024 14:38:32 -0700 Subject: [PATCH 14/57] another line indent --- resources/views/settings/labels.blade.php | 84 +++++++++++------------ 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index d1499b7d6c..46212b790d 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -227,51 +227,51 @@
- @if($setting->label2_enable == 0) - -
-
- {{ Form::label('qr_text', trans('admin/settings/general.qr_text'), ['class'=>'control-label']) }} + @if($setting->label2_enable == 0) + +
+
+ {{ Form::label('qr_text', trans('admin/settings/general.qr_text'), ['class'=>'control-label']) }} +
+
+ @if ($setting->qr_code == 1) + {{ Form::text('qr_text', old('qr_text', $setting->qr_text), array( + 'class' => 'form-control', + 'placeholder' => 'Property of Your Company', + 'rel' => 'txtTooltip', + 'title' =>'Extra text that you would like to display on your labels.', + 'data-toggle' =>'tooltip', + 'data-placement'=>'top' + )) }} + @else + {{ Form::text('qr_text', old('qr_text', $setting->qr_text), array( + 'class' => 'form-control', + 'disabled' => 'disabled', + 'placeholder' => 'Property of Your Company' + )) }} +

{{ trans('admin/settings/general.qr_help') }}

+ @endif + {!! $errors->first('qr_text', '') !!} +
-
- @if ($setting->qr_code == 1) - {{ Form::text('qr_text', old('qr_text', $setting->qr_text), array( - 'class' => 'form-control', - 'placeholder' => 'Property of Your Company', - 'rel' => 'txtTooltip', - 'title' =>'Extra text that you would like to display on your labels.', - 'data-toggle' =>'tooltip', - 'data-placement'=>'top' - )) }} - @else - {{ Form::text('qr_text', old('qr_text', $setting->qr_text), array( - 'class' => 'form-control', - 'disabled' => 'disabled', - 'placeholder' => 'Property of Your Company' - )) }} -

{{ trans('admin/settings/general.qr_help') }}

- @endif - {!! $errors->first('qr_text', '') !!} -
-
- -
-
- {{ Form::label('purge_barcodes', 'Purge Barcodes', ['class'=>'control-label']) }} + +
+
+ {{ Form::label('purge_barcodes', 'Purge Barcodes', ['class'=>'control-label']) }} +
+
+ + {{ trans('admin/settings/general.barcode_delete_cache') }} + + + + + {!! $errors->first('purgebarcodes', '') !!} +

{{ trans('admin/settings/general.barcodes_help') }}

+
-
- - {{ trans('admin/settings/general.barcode_delete_cache') }} - - - - - {!! $errors->first('purgebarcodes', '') !!} -

{{ trans('admin/settings/general.barcodes_help') }}

-
-
- @endif + @endif @if ($setting->label2_enable)
From b71a90a3c537b862c55e28d5921dffa35de262d8 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Mon, 18 Nov 2024 12:44:24 -0600 Subject: [PATCH 15/57] this should be all it takes to fix this, i think --- app/Http/Controllers/Auth/ForgotPasswordController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index a7322e7e59..8e6ff46fde 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -57,7 +57,7 @@ class ForgotPasswordController extends Controller * payloads through. */ $request->validate([ - 'username' => ['required', 'max:255'], + 'username' => ['required', 'max:255', 'string'], ]); /** From 03c90d7b607eebbbaa506f8dad3953debcd2ab21 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Mon, 9 Dec 2024 13:29:06 -0600 Subject: [PATCH 16/57] note, will come back to this once question is answered --- resources/views/partials/bootstrap-table.blade.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index f24552d753..0d64095235 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -279,8 +279,8 @@ element_name = ''; } - return function (value,row) { + return function (value,row) { var actions = ''; // Add some overrides for any funny urls we have @@ -442,6 +442,7 @@ function genericCheckinCheckoutFormatter(destination) { return function (value,row) { + // some extra logic for kits needs to go here // The user is allowed to check items out, AND the item is deployable if ((row.available_actions.checkout == true) && (row.user_can_checkout == true) && ((!row.asset_id) && (!row.assigned_to))) { From 10a7ae8d47fbf3b6674f78439dab9eed7d024201 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 9 Dec 2024 16:09:51 -0800 Subject: [PATCH 17/57] Show frontend "required" validation for model and status selects --- resources/views/partials/forms/edit/model-select.blade.php | 7 ++++++- resources/views/partials/forms/edit/status.blade.php | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/resources/views/partials/forms/edit/model-select.blade.php b/resources/views/partials/forms/edit/model-select.blade.php index db62a34fd4..0db00d0ae1 100644 --- a/resources/views/partials/forms/edit/model-select.blade.php +++ b/resources/views/partials/forms/edit/model-select.blade.php @@ -3,7 +3,12 @@ {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }} -
+
isset($field_req) || (isset($required) && ($required =='true')) + ]) + > @if ($model_id = old($fieldname, ($item->{$fieldname} ?? request($fieldname) ?? '')))