From ad743d3767fe0550388a07dd2b14eaf0585ace9b Mon Sep 17 00:00:00 2001 From: baodev0 Date: Sat, 25 Jul 2026 16:26:32 +0700 Subject: [PATCH] update --- app/Http/Controllers/Api/Admin/Setting/SettingController.php | 2 ++ app/Providers/MailConfigServiceProvider.php | 4 ++-- database/seeders/Setting.php | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/Admin/Setting/SettingController.php b/app/Http/Controllers/Api/Admin/Setting/SettingController.php index b42f736..6869cc6 100644 --- a/app/Http/Controllers/Api/Admin/Setting/SettingController.php +++ b/app/Http/Controllers/Api/Admin/Setting/SettingController.php @@ -57,6 +57,8 @@ class SettingController extends Controller 'smtp.port' => 'sometimes|integer', 'smtp.user' => 'sometimes|email', 'smtp.encryption' => 'sometimes|in:ssl,tls,starttls,', + 'smtp.from_name' => 'sometimes|string|nullable', + 'smtp.from_address' => 'sometimes|email|nullable', ]); if ($validator->fails()) { diff --git a/app/Providers/MailConfigServiceProvider.php b/app/Providers/MailConfigServiceProvider.php index 5219e65..b86c464 100644 --- a/app/Providers/MailConfigServiceProvider.php +++ b/app/Providers/MailConfigServiceProvider.php @@ -62,8 +62,8 @@ class MailConfigServiceProvider extends ServiceProvider $config = config('mail'); $config['default'] = $transport; $config['from'] = [ - 'address' => $mail->user ?? config('mail.from.address', 'no-reply@example.com'), - 'name' => $company, + 'address' => $mail->from_address ?? $mail->user ?? config('mail.from.address', 'no-reply@example.com'), + 'name' => $mail->from_name ?? $company, ]; $config['mailers'][$transport] = array_merge($config['mailers'][$transport] ?? [], [ 'transport' => $transport, diff --git a/database/seeders/Setting.php b/database/seeders/Setting.php index a1ceac0..8331dd4 100644 --- a/database/seeders/Setting.php +++ b/database/seeders/Setting.php @@ -41,6 +41,8 @@ class Setting extends Seeder 'password' => env('MAIL_PASSWORD'), 'encryption' => env('MAIL_ENCRYPTION', 'tls'), 'port' => env('MAIL_PORT', 465), + 'from_name' => env('MAIL_FROM_NAME', 'Thế giới số Portal'), + 'from_address' => env('MAIL_FROM_ADDRESS'), 'status' => 1, ], 'banking' => [