From 040f826c521d33d9a95b4c341b9ccb436adf8cee Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 26 Mar 2024 08:57:18 -0700 Subject: [PATCH 1/6] removes encrypted fields as a selectable option for labels --- resources/views/partials/label2-field-definitions.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/views/partials/label2-field-definitions.blade.php b/resources/views/partials/label2-field-definitions.blade.php index 8d8c680c94..c16a09ded1 100644 --- a/resources/views/partials/label2-field-definitions.blade.php +++ b/resources/views/partials/label2-field-definitions.blade.php @@ -348,7 +348,9 @@ @foreach($customFields as $customField) + @if($customField->field_encrypted != 1) + @endif @endforeach From aa8af2220ce9ff40dfabbebcd343ad89bc8cf0f7 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 26 Mar 2024 16:10:08 -0700 Subject: [PATCH 2/6] trying to remove an encrypted field but not all fields --- app/Http/Controllers/LabelsController.php | 25 +++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/LabelsController.php b/app/Http/Controllers/LabelsController.php index 4fe04dc1c5..e1fc55086d 100755 --- a/app/Http/Controllers/LabelsController.php +++ b/app/Http/Controllers/LabelsController.php @@ -14,6 +14,7 @@ use App\Models\Setting; use App\Models\Supplier; use App\Models\User; use App\View\Label as LabelView; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Storage; class LabelsController extends Controller @@ -21,12 +22,13 @@ class LabelsController extends Controller /** * Returns the Label view with test data * - * @author Grant Le Roux - * @param string $labelName + * @param string $labelName * @return \Illuminate\Contracts\View\View + * @author Grant Le Roux */ public function show(string $labelName) { + $this->clearEncryptedLabelOptions(); $labelName = str_replace('/', '\\', $labelName); $template = Label::find($labelName); @@ -95,4 +97,23 @@ class LabelsController extends Controller return redirect()->route('home')->with('error', trans('admin/labels/message.does_not_exist')); } + + private function clearEncryptedLabelOptions() + { + + $customfields = CustomField::where('field_encrypted', 1)->get(); + $selected_label_options = Setting::getSettings()->label2_fields; + if($selected_label_options != '') { + } + collect(explode(';', Setting::getSettings()->label2_fields)) + ->filter() + ->each(function ($item) use ($customfields, $selected_label_options) { + if (!str_contains($item, $customfields->db_column)) { + $selected_label_options .= $item; + } + DB::table('Settings')->update(['label2_fields' => $selected_label_options]); + }); + + } + } From 4327653d705a6375302cbb9fc58a9b9d4bc9c172 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 3 Apr 2024 10:57:41 -0700 Subject: [PATCH 3/6] remove db cleaner for encrypted selections --- app/Http/Controllers/LabelsController.php | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/app/Http/Controllers/LabelsController.php b/app/Http/Controllers/LabelsController.php index e1fc55086d..461d8c4c39 100755 --- a/app/Http/Controllers/LabelsController.php +++ b/app/Http/Controllers/LabelsController.php @@ -28,7 +28,6 @@ class LabelsController extends Controller */ public function show(string $labelName) { - $this->clearEncryptedLabelOptions(); $labelName = str_replace('/', '\\', $labelName); $template = Label::find($labelName); @@ -97,23 +96,4 @@ class LabelsController extends Controller return redirect()->route('home')->with('error', trans('admin/labels/message.does_not_exist')); } - - private function clearEncryptedLabelOptions() - { - - $customfields = CustomField::where('field_encrypted', 1)->get(); - $selected_label_options = Setting::getSettings()->label2_fields; - if($selected_label_options != '') { - } - collect(explode(';', Setting::getSettings()->label2_fields)) - ->filter() - ->each(function ($item) use ($customfields, $selected_label_options) { - if (!str_contains($item, $customfields->db_column)) { - $selected_label_options .= $item; - } - DB::table('Settings')->update(['label2_fields' => $selected_label_options]); - }); - - } - } From bb2c73348d1032ba14f705fc1b44c5a56d83a8bc Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 3 Apr 2024 11:03:58 -0700 Subject: [PATCH 4/6] only grabs custom Fields that are not encrpyted --- app/Http/Controllers/LabelsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/LabelsController.php b/app/Http/Controllers/LabelsController.php index 461d8c4c39..b5b8740a4d 100755 --- a/app/Http/Controllers/LabelsController.php +++ b/app/Http/Controllers/LabelsController.php @@ -67,7 +67,7 @@ class LabelsController extends Controller $exampleAsset->model->category->id = 999999; $exampleAsset->model->category->name = trans('admin/labels/table.example_category'); - $customFieldColumns = CustomField::all()->pluck('db_column'); + $customFieldColumns = CustomField::where('field_encrypted', '=', 0)->pluck('db_column'); collect(explode(';', Setting::getSettings()->label2_fields)) ->filter() From df5cacf8a2814c631f89b94b213a60b5b2789f16 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 3 Apr 2024 11:06:05 -0700 Subject: [PATCH 5/6] removed front end if statement --- resources/views/partials/label2-field-definitions.blade.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/views/partials/label2-field-definitions.blade.php b/resources/views/partials/label2-field-definitions.blade.php index c16a09ded1..8d8c680c94 100644 --- a/resources/views/partials/label2-field-definitions.blade.php +++ b/resources/views/partials/label2-field-definitions.blade.php @@ -348,9 +348,7 @@ @foreach($customFields as $customField) - @if($customField->field_encrypted != 1) - @endif @endforeach From 96b3af7cbc312b02316f156c136225f2fbe362af Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 22 Apr 2024 18:27:34 -0700 Subject: [PATCH 6/6] fixed view from sending all custom fields --- app/Http/Controllers/SettingsController.php | 7 +++---- .../views/partials/label2-field-definitions.blade.php | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index b1cb620a83..ddac876885 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -790,10 +790,9 @@ class SettingsController extends Controller */ public function getLabels() { - return view('settings.labels', [ - 'setting' => Setting::getSettings(), - 'customFields' => CustomField::all(), - ]); + return view('settings.labels') + ->with('setting', Setting::getSettings()) + ->with('customFields', CustomField::where('field_encrypted', '=', 0)->get()); } /** diff --git a/resources/views/partials/label2-field-definitions.blade.php b/resources/views/partials/label2-field-definitions.blade.php index 8d8c680c94..26c1fb43ae 100644 --- a/resources/views/partials/label2-field-definitions.blade.php +++ b/resources/views/partials/label2-field-definitions.blade.php @@ -348,6 +348,7 @@ @foreach($customFields as $customField) + @endforeach