From 20ad4fb681e128a6f2f73ec4e3c558473da1bb18 Mon Sep 17 00:00:00 2001
From: Robert-Azelis <82208283+Robert-Azelis@users.noreply.github.com>
Date: Wed, 23 Nov 2022 18:42:38 +0100
Subject: [PATCH 1/4] Update CategoryPresenter.php

Fix snipe#12153
---
 app/Presenters/CategoryPresenter.php | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/Presenters/CategoryPresenter.php b/app/Presenters/CategoryPresenter.php
index 92905a68e3..43422bd0e3 100644
--- a/app/Presenters/CategoryPresenter.php
+++ b/app/Presenters/CategoryPresenter.php
@@ -70,39 +70,33 @@ class CategoryPresenter extends Presenter
                 'visible' => true,
                 'formatter' => 'trueFalseFormatter',
             ], [
-                'field' => 'actions',
-                'searchable' => false,
-                'sortable' => false,
-                'switchable' => false,
-                'title' => trans('table.actions'),
-            ],[
                 "field" => "use_default_eula",
                 "searchable" => false,
                 "sortable" => true,
                 "title" => trans('admin/categories/general.use_default_eula_column'),
                 'visible' => true,
                 "formatter" => 'trueFalseFormatter',
-            ],[
-                "field" => "require_acceptance",
-                "searchable" => false,
-                "sortable" => true,
-                'formatter' => 'categoriesActionsFormatter',
-            ],
-            [
+            ], [
                 'field' => 'created_at',
                 'searchable' => true,
                 'sortable' => true,
                 'visible' => false,
                 'title' => trans('general.created_at'),
                 'formatter' => 'dateDisplayFormatter',
-            ],
-            [
+            ], [
                 'field' => 'updated_at',
                 'searchable' => true,
                 'sortable' => true,
                 'visible' => false,
                 'title' => trans('general.updated_at'),
                 'formatter' => 'dateDisplayFormatter',
+            ], [
+                'field' => 'actions',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => false,
+                'title' => trans('table.actions'),
+				'formatter' => 'categoriesActionsFormatter',
             ],
         ];
 

From c2cfd8ff5377174a48dd73d304d76d568f4aa504 Mon Sep 17 00:00:00 2001
From: Robert-Azelis <82208283+Robert-Azelis@users.noreply.github.com>
Date: Wed, 23 Nov 2022 19:00:08 +0100
Subject: [PATCH 2/4] Update CategoryPresenter.php

---
 app/Presenters/CategoryPresenter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Presenters/CategoryPresenter.php b/app/Presenters/CategoryPresenter.php
index 43422bd0e3..e9276a3417 100644
--- a/app/Presenters/CategoryPresenter.php
+++ b/app/Presenters/CategoryPresenter.php
@@ -96,7 +96,7 @@ class CategoryPresenter extends Presenter
                 'sortable' => false,
                 'switchable' => false,
                 'title' => trans('table.actions'),
-				'formatter' => 'categoriesActionsFormatter',
+		'formatter' => 'categoriesActionsFormatter',
             ],
         ];
 

From 9bafe795b092ebb5fc92bf06f348b4898f4f2dd9 Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Wed, 23 Nov 2022 16:34:29 -0600
Subject: [PATCH 3/4] Corrected the view when editing custom fields values

---
 resources/views/models/custom_fields_form.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index a95ddd978a..70f1f85374 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -19,7 +19,7 @@
                   @foreach ($field->formatFieldValuesAsArray() as $key => $value)
                       <div>
                           <label>
-                              <input type="checkbox" value="{{ $value }}" name="{{ $field->db_column_name() }}[]" class="minimal" {{  isset($item) ? (in_array($value, preg_split('/[, |,]/', $item->{$field->db_column_name()})) ? ' checked="checked"' : '') : (Request::old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($key, preg_split('/[, |,]/', $field->defaultValue($model->id))) ? ' checked="checked"' : '')) }}>
+                              <input type="checkbox" value="{{ $value }}" name="{{ $field->db_column_name() }}[]" class="minimal" {{ isset($item) ? (in_array($value, array_map('trim', explode(',', $item->{$field->db_column_name()}))) ? ' checked="checked"' : '') : (Request::old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($key, array_map('trim', explode(',', $field->defaultValue($model->id)))) ? ' checked="checked"' : '')) }}>
                               {{ $value }}
                           </label>
                       </div>

From c082d8b90eeae545f1b747c2041bc204c96bc69d Mon Sep 17 00:00:00 2001
From: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Wed, 23 Nov 2022 18:22:31 -0600
Subject: [PATCH 4/4] Return empty string if no MAIL_REPLYTO_ADDR var set

---
 app/Models/CheckoutAcceptance.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/CheckoutAcceptance.php b/app/Models/CheckoutAcceptance.php
index e0833f3240..79a6da5415 100644
--- a/app/Models/CheckoutAcceptance.php
+++ b/app/Models/CheckoutAcceptance.php
@@ -21,7 +21,7 @@ class CheckoutAcceptance extends Model
     {
         // At this point the endpoint is the same for everything.
         //  In the future this may want to be adapted for individual notifications.
-        return config('mail.reply_to.address');
+        return (config('mail.reply_to.address')) ? config('mail.reply_to.address') : '' ;
     }
 
     /**