From f4be5ffb5d3da675000e84d4b62ec38491bef520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=93=D0=B5=D1=80=D1=85=D0=B0=D1=80=D0=B4=20PICCORO=20Len?= =?UTF-8?q?z=20McKAY?= Date: Thu, 7 Aug 2025 11:42:17 -0400 Subject: [PATCH 1/3] Fix workaround for #17491 log error on failed response for mail sending * Part of bunch of fixes, this fix #17491 where admins at test install cannot see the log of errors for UI test mail button, we can just see that this is the correct form cos other parts of the code manage the exception inside the catch using log interface class --- app/Http/Controllers/Api/SettingsController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php index 7eb28a4815..286d5a8df6 100644 --- a/app/Http/Controllers/Api/SettingsController.php +++ b/app/Http/Controllers/Api/SettingsController.php @@ -150,8 +150,11 @@ class SettingsController extends Controller if (!config('app.lock_passwords')) { try { Notification::send(Setting::first(), new MailTest()); + Log::debug('Mail sending to '.config('mail.reply_to.address')); return response()->json(['message' => 'Mail sent to '.config('mail.reply_to.address')], 200); } catch (\Exception $e) { + Log::debug($e); + Log::error('Mail sent to '.config('mail.reply_to.address') . $e->getMessage()); return response()->json(['message' => $e->getMessage()], 500); } } @@ -315,4 +318,4 @@ class SettingsController extends Controller } -} \ No newline at end of file +} From 0fdbdfd5c291fe88b098459a147413b60ed023b0 Mon Sep 17 00:00:00 2001 From: mckaygerhard Date: Fri, 8 Aug 2025 12:15:05 -0400 Subject: [PATCH 2/3] Improve log error handling regarding notification sending for issue #17491 * when an error is generated when denying checkouts, there are not enough logs to determine the problem from the email provider * missing handling of log test mail config, there is none of logs cos there is no log handling on test email, becouse all the results are just sent to the http response and no log were writen. --- app/Http/Controllers/Account/AcceptanceController.php | 4 ++++ app/Http/Controllers/Api/SettingsController.php | 4 ++-- app/Http/Controllers/SettingsController.php | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php index 75ccd5004f..c273d36e3a 100644 --- a/app/Http/Controllers/Account/AcceptanceController.php +++ b/app/Http/Controllers/Account/AcceptanceController.php @@ -347,6 +347,7 @@ class AcceptanceController extends Controller $acceptance->decline($sig_filename, $request->input('note')); $acceptance->notify(new AcceptanceAssetDeclinedNotification($data)); + Log::debug('New event acceptance.'); event(new CheckoutDeclined($acceptance)); $return_msg = trans('admin/users/message.declined'); } @@ -356,13 +357,16 @@ class AcceptanceController extends Controller $recipient = User::find($acceptance->alert_on_response_id); if ($recipient) { + Log::debug('Attempting to send email acceptance.'); Mail::to($recipient)->send(new CheckoutAcceptanceResponseMail( $acceptance, $recipient, $request->input('asset_acceptance') === 'accepted', )); + Log::debug('Send email notification sucess on checkout acceptance response.'); } } catch (Exception $e) { + Log::error($e->getMessage()); Log::warning($e); } } diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php index 286d5a8df6..134d24ef2a 100644 --- a/app/Http/Controllers/Api/SettingsController.php +++ b/app/Http/Controllers/Api/SettingsController.php @@ -150,11 +150,11 @@ class SettingsController extends Controller if (!config('app.lock_passwords')) { try { Notification::send(Setting::first(), new MailTest()); - Log::debug('Mail sending to '.config('mail.reply_to.address')); + Log::debug('Attempting to sending to '.config('mail.reply_to.address')); return response()->json(['message' => 'Mail sent to '.config('mail.reply_to.address')], 200); } catch (\Exception $e) { + Log::error('Mail sent error using '.config('mail.reply_to.address') .': '. $e->getMessage()); Log::debug($e); - Log::error('Mail sent to '.config('mail.reply_to.address') . $e->getMessage()); return response()->json(['message' => $e->getMessage()], 500); } } diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 32d3205886..5725ed3513 100644 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -1339,9 +1339,11 @@ class SettingsController extends Controller 'name' => config('mail.from.name'), 'email' => config('mail.from.address'), ])->notify(new MailTest()); - + Log::debug('Attempting to send mail to '.config('mail.from.address')); return response()->json(Helper::formatStandardApiResponse('success', null, trans('mail_sent.mail_sent'))); } catch (\Exception $e) { + Log::error('Mail sent from '.config('mail.from.address') .' with errors '. $e->getMessage()); + Log::debug($e); return response()->json(Helper::formatStandardApiResponse('success', null, $e->getMessage())); } } From 1f55a8b6e3486672e3bc89bd4b11fd24e1438aa4 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 11 Aug 2025 13:06:34 +0100 Subject: [PATCH 3/3] Added icon and tooltip Signed-off-by: snipe --- app/Presenters/LocationPresenter.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Presenters/LocationPresenter.php b/app/Presenters/LocationPresenter.php index 9f6addd7fc..31d2f05f77 100644 --- a/app/Presenters/LocationPresenter.php +++ b/app/Presenters/LocationPresenter.php @@ -67,7 +67,9 @@ class LocationPresenter extends Presenter 'sortable' => true, 'switchable' => true, 'title' => trans('admin/locations/message.current_location'), + 'titleTooltip' => trans('admin/locations/message.current_location'), 'visible' => true, + 'class' => 'css-house-laptop', ], [ 'field' => 'rtd_assets_count', 'searchable' => false,