diff --git a/app/Mail/Customer/PasswordResetByAdmin.php b/app/Mail/Customer/PasswordResetByAdmin.php index 2f1eecc..635480c 100644 --- a/app/Mail/Customer/PasswordResetByAdmin.php +++ b/app/Mail/Customer/PasswordResetByAdmin.php @@ -35,7 +35,7 @@ class PasswordResetByAdmin extends Mailable 'fullName' => $data['fullname'] ?? 'Quý khách', 'email' => $data['email'] ?? '', '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'), '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'), 'support_email' => $settingValue['email'] ?? config('mail.support_email', 'support@thegioiso.com'), '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); } } diff --git a/resources/views/emails/customer/password-reset-admin.blade.php b/resources/views/emails/customer/password-reset-admin.blade.php index 6b69aec..5bfb40d 100644 --- a/resources/views/emails/customer/password-reset-admin.blade.php +++ b/resources/views/emails/customer/password-reset-admin.blade.php @@ -3,7 +3,7 @@ $fullName = $fullName ?? 'Quý khách'; $email = $email ?? ''; $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'; $supportPhone = $supportPhone ?? '1900. 6119'; @endphp diff --git a/resources/views/emails/customer/welcome.blade.php b/resources/views/emails/customer/welcome.blade.php index ae6a565..04255ea 100644 --- a/resources/views/emails/customer/welcome.blade.php +++ b/resources/views/emails/customer/welcome.blade.php @@ -1,7 +1,7 @@ @php $appName = $appName ?? config('app.name', 'Thế Giới Số'); $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'; $supportPhone = $supportPhone ?? '1900. 6119'; @endphp