update
This commit is contained in:
@@ -57,6 +57,8 @@ class SettingController extends Controller
|
|||||||
'smtp.port' => 'sometimes|integer',
|
'smtp.port' => 'sometimes|integer',
|
||||||
'smtp.user' => 'sometimes|email',
|
'smtp.user' => 'sometimes|email',
|
||||||
'smtp.encryption' => 'sometimes|in:ssl,tls,starttls,',
|
'smtp.encryption' => 'sometimes|in:ssl,tls,starttls,',
|
||||||
|
'smtp.from_name' => 'sometimes|string|nullable',
|
||||||
|
'smtp.from_address' => 'sometimes|email|nullable',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if ($validator->fails()) {
|
if ($validator->fails()) {
|
||||||
|
|||||||
@@ -62,8 +62,8 @@ class MailConfigServiceProvider extends ServiceProvider
|
|||||||
$config = config('mail');
|
$config = config('mail');
|
||||||
$config['default'] = $transport;
|
$config['default'] = $transport;
|
||||||
$config['from'] = [
|
$config['from'] = [
|
||||||
'address' => $mail->user ?? config('mail.from.address', 'no-reply@example.com'),
|
'address' => $mail->from_address ?? $mail->user ?? config('mail.from.address', 'no-reply@example.com'),
|
||||||
'name' => $company,
|
'name' => $mail->from_name ?? $company,
|
||||||
];
|
];
|
||||||
$config['mailers'][$transport] = array_merge($config['mailers'][$transport] ?? [], [
|
$config['mailers'][$transport] = array_merge($config['mailers'][$transport] ?? [], [
|
||||||
'transport' => $transport,
|
'transport' => $transport,
|
||||||
|
|||||||
@@ -41,6 +41,8 @@ class Setting extends Seeder
|
|||||||
'password' => env('MAIL_PASSWORD'),
|
'password' => env('MAIL_PASSWORD'),
|
||||||
'encryption' => env('MAIL_ENCRYPTION', 'tls'),
|
'encryption' => env('MAIL_ENCRYPTION', 'tls'),
|
||||||
'port' => env('MAIL_PORT', 465),
|
'port' => env('MAIL_PORT', 465),
|
||||||
|
'from_name' => env('MAIL_FROM_NAME', 'Thế giới số Portal'),
|
||||||
|
'from_address' => env('MAIL_FROM_ADDRESS'),
|
||||||
'status' => 1,
|
'status' => 1,
|
||||||
],
|
],
|
||||||
'banking' => [
|
'banking' => [
|
||||||
|
|||||||
Reference in New Issue
Block a user