From ce987b4f6d171a83d7ea5a7f8d38ffc490e4f0f2 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 17 Sep 2024 11:23:38 -0700 Subject: [PATCH] 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');