Fix login URL retrieval in email templates to ensure correct frontend URL is used
This commit is contained in:
@@ -35,7 +35,7 @@ class PasswordResetByAdmin extends Mailable
|
|||||||
'fullName' => $data['fullname'] ?? 'Quý khách',
|
'fullName' => $data['fullname'] ?? 'Quý khách',
|
||||||
'email' => $data['email'] ?? '',
|
'email' => $data['email'] ?? '',
|
||||||
'password' => $data['password'] ?? '',
|
'password' => $data['password'] ?? '',
|
||||||
'loginUrl' => $data['login_url'] ?? rtrim((string) env('FRONTEND_URL', config('app.url')), '/') . '/dang-nhap',
|
'loginUrl' => $data['login_url'] ?? rtrim((string) env('FRONTEND_URL', ''), '/') . '/dang-nhap',
|
||||||
'supportEmail' => $data['support_email'] ?? config('mail.support_email', 'support@thegioiso.com'),
|
'supportEmail' => $data['support_email'] ?? config('mail.support_email', 'support@thegioiso.com'),
|
||||||
'supportPhone' => $data['support_phone'] ?? config('mail.support_phone', '1900.xxxx'),
|
'supportPhone' => $data['support_phone'] ?? config('mail.support_phone', '1900.xxxx'),
|
||||||
],
|
],
|
||||||
@@ -60,7 +60,7 @@ class PasswordResetByAdmin extends Mailable
|
|||||||
'company_name' => $settingValue['company'] ?? config('app.name', 'The Gioi So'),
|
'company_name' => $settingValue['company'] ?? config('app.name', 'The Gioi So'),
|
||||||
'support_email' => $settingValue['email'] ?? config('mail.support_email', 'support@thegioiso.com'),
|
'support_email' => $settingValue['email'] ?? config('mail.support_email', 'support@thegioiso.com'),
|
||||||
'support_phone' => $settingValue['hotline'] ?? ($settingValue['phone'] ?? config('mail.support_phone', '1900.xxxx')),
|
'support_phone' => $settingValue['hotline'] ?? ($settingValue['phone'] ?? config('mail.support_phone', '1900.xxxx')),
|
||||||
'login_url' => rtrim((string) env('FRONTEND_URL', config('app.url')), '/') . '/dang-nhap',
|
'login_url' => rtrim((string) env('FRONTEND_URL', ''), '/') . '/dang-nhap',
|
||||||
], $this->data);
|
], $this->data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
$fullName = $fullName ?? 'Quý khách';
|
$fullName = $fullName ?? 'Quý khách';
|
||||||
$email = $email ?? '';
|
$email = $email ?? '';
|
||||||
$password = $password ?? '';
|
$password = $password ?? '';
|
||||||
$loginUrl = $loginUrl ?? rtrim((string) env('FRONTEND_URL', config('app.url')), '/') . '/dang-nhap';
|
$loginUrl = $loginUrl ?? rtrim((string) env('FRONTEND_URL', ''), '/') . '/dang-nhap';
|
||||||
$supportEmail = $supportEmail ?? 'support@tgs.com.vn';
|
$supportEmail = $supportEmail ?? 'support@tgs.com.vn';
|
||||||
$supportPhone = $supportPhone ?? '1900. 6119';
|
$supportPhone = $supportPhone ?? '1900. 6119';
|
||||||
@endphp
|
@endphp
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
@php
|
@php
|
||||||
$appName = $appName ?? config('app.name', 'Thế Giới Số');
|
$appName = $appName ?? config('app.name', 'Thế Giới Số');
|
||||||
$fullName = $fullName ?? 'Quý khách';
|
$fullName = $fullName ?? 'Quý khách';
|
||||||
$loginUrl = $loginUrl ?? rtrim((string) env('FRONTEND_URL', config('app.url')), '/') . '/dang-nhap';
|
$loginUrl = $loginUrl ?? rtrim((string) env('FRONTEND_URL', ''), '/') . '/dang-nhap';
|
||||||
$supportEmail = $supportEmail ?? 'support@tgs.com.vn';
|
$supportEmail = $supportEmail ?? 'support@tgs.com.vn';
|
||||||
$supportPhone = $supportPhone ?? '1900. 6119';
|
$supportPhone = $supportPhone ?? '1900. 6119';
|
||||||
@endphp
|
@endphp
|
||||||
|
|||||||
Reference in New Issue
Block a user