mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-12 15:35:15 +00:00
Code cleanup.
This commit is contained in:
@@ -29,8 +29,6 @@ use Illuminate\Queue\SerializesModels;
|
||||
|
||||
/**
|
||||
* Class AccessTokenCreatedMail
|
||||
*
|
||||
|
||||
*/
|
||||
class AccessTokenCreatedMail extends Mailable
|
||||
{
|
||||
@@ -51,6 +49,7 @@ class AccessTokenCreatedMail extends Mailable
|
||||
{
|
||||
return $this
|
||||
->markdown('emails.token-created')
|
||||
->subject((string)trans('email.access_token_created_subject'));
|
||||
->subject((string)trans('email.access_token_created_subject'))
|
||||
;
|
||||
}
|
||||
}
|
||||
|
@@ -31,8 +31,6 @@ use Illuminate\Queue\SerializesModels;
|
||||
* Class AdminTestMail.
|
||||
*
|
||||
* Sends a test mail to administrators.
|
||||
*
|
||||
|
||||
*/
|
||||
class AdminTestMail extends Mailable
|
||||
{
|
||||
@@ -55,6 +53,7 @@ class AdminTestMail extends Mailable
|
||||
{
|
||||
return $this
|
||||
->markdown('emails.admin-test')
|
||||
->subject((string)trans('email.admin_test_subject'));
|
||||
->subject((string)trans('email.admin_test_subject'))
|
||||
;
|
||||
}
|
||||
}
|
||||
|
@@ -43,10 +43,6 @@ class BillWarningMail extends Mailable
|
||||
|
||||
/**
|
||||
* ConfirmEmailChangeMail constructor.
|
||||
*
|
||||
* @param Bill $bill
|
||||
* @param string $field
|
||||
* @param int $diff
|
||||
*/
|
||||
public function __construct(Bill $bill, string $field, int $diff)
|
||||
{
|
||||
@@ -69,6 +65,7 @@ class BillWarningMail extends Mailable
|
||||
|
||||
return $this
|
||||
->markdown('emails.bill-warning')
|
||||
->subject($subject);
|
||||
->subject($subject)
|
||||
;
|
||||
}
|
||||
}
|
||||
|
@@ -31,8 +31,6 @@ use Illuminate\Queue\SerializesModels;
|
||||
* Class ConfirmEmailChangeMail
|
||||
*
|
||||
* Sends message to new address to confirm change.
|
||||
*
|
||||
|
||||
*/
|
||||
class ConfirmEmailChangeMail extends Mailable
|
||||
{
|
||||
@@ -45,10 +43,6 @@ class ConfirmEmailChangeMail extends Mailable
|
||||
|
||||
/**
|
||||
* ConfirmEmailChangeMail constructor.
|
||||
*
|
||||
* @param string $newEmail
|
||||
* @param string $oldEmail
|
||||
* @param string $url
|
||||
*/
|
||||
public function __construct(string $newEmail, string $oldEmail, string $url)
|
||||
{
|
||||
@@ -65,9 +59,10 @@ class ConfirmEmailChangeMail extends Mailable
|
||||
public function build(): self
|
||||
{
|
||||
return $this
|
||||
//->view('emails.confirm-email-change-html')
|
||||
//->text('emails.confirm-email-change-text')
|
||||
// ->view('emails.confirm-email-change-html')
|
||||
// ->text('emails.confirm-email-change-text')
|
||||
->markdown('emails.confirm-email-change')
|
||||
->subject((string)trans('email.email_change_subject'));
|
||||
->subject((string)trans('email.email_change_subject'))
|
||||
;
|
||||
}
|
||||
}
|
||||
|
@@ -43,10 +43,6 @@ class InvitationMail extends Mailable
|
||||
|
||||
/**
|
||||
* OAuthTokenCreatedMail constructor.
|
||||
*
|
||||
* @param string $invitee
|
||||
* @param string $admin
|
||||
* @param string $url
|
||||
*/
|
||||
public function __construct(string $invitee, string $admin, string $url)
|
||||
{
|
||||
@@ -65,6 +61,7 @@ class InvitationMail extends Mailable
|
||||
{
|
||||
return $this
|
||||
->markdown('emails.invitation')
|
||||
->subject((string)trans('email.invite_user_subject'));
|
||||
->subject((string)trans('email.invite_user_subject'))
|
||||
;
|
||||
}
|
||||
}
|
||||
|
@@ -43,8 +43,6 @@ class NewIPAddressWarningMail extends Mailable
|
||||
|
||||
/**
|
||||
* OAuthTokenCreatedMail constructor.
|
||||
*
|
||||
* @param string $ipAddress
|
||||
*/
|
||||
public function __construct(string $ipAddress)
|
||||
{
|
||||
@@ -60,6 +58,7 @@ class NewIPAddressWarningMail extends Mailable
|
||||
{
|
||||
$this->time = now(config('app.timezone'))->isoFormat((string)trans('config.date_time_js'));
|
||||
$this->host = '';
|
||||
|
||||
try {
|
||||
$hostName = app('steam')->getHostName($this->ipAddress);
|
||||
} catch (FireflyException $e) {
|
||||
@@ -72,6 +71,7 @@ class NewIPAddressWarningMail extends Mailable
|
||||
|
||||
return $this
|
||||
->markdown('emails.new-ip')
|
||||
->subject((string)trans('email.login_from_new_ip'));
|
||||
->subject((string)trans('email.login_from_new_ip'))
|
||||
;
|
||||
}
|
||||
}
|
||||
|
@@ -30,8 +30,6 @@ use Laravel\Passport\Client;
|
||||
|
||||
/**
|
||||
* Class OAuthTokenCreatedMail
|
||||
*
|
||||
|
||||
*/
|
||||
class OAuthTokenCreatedMail extends Mailable
|
||||
{
|
||||
@@ -42,8 +40,6 @@ class OAuthTokenCreatedMail extends Mailable
|
||||
|
||||
/**
|
||||
* OAuthTokenCreatedMail constructor.
|
||||
*
|
||||
* @param Client $client
|
||||
*/
|
||||
public function __construct(Client $client)
|
||||
{
|
||||
@@ -59,6 +55,7 @@ class OAuthTokenCreatedMail extends Mailable
|
||||
{
|
||||
return $this
|
||||
->markdown('emails.oauth-client-created')
|
||||
->subject((string)trans('email.oauth_created_subject'));
|
||||
->subject((string)trans('email.oauth_created_subject'))
|
||||
;
|
||||
}
|
||||
}
|
||||
|
@@ -31,8 +31,6 @@ use Illuminate\Queue\SerializesModels;
|
||||
* Sends newly registered user an email message.
|
||||
*
|
||||
* Class RegisteredUser
|
||||
*
|
||||
|
||||
*/
|
||||
class RegisteredUser extends Mailable
|
||||
{
|
||||
@@ -43,8 +41,6 @@ class RegisteredUser extends Mailable
|
||||
|
||||
/**
|
||||
* Create a new message instance.
|
||||
*
|
||||
* @param string $address
|
||||
*/
|
||||
public function __construct(string $address)
|
||||
{
|
||||
@@ -60,6 +56,7 @@ class RegisteredUser extends Mailable
|
||||
{
|
||||
return $this
|
||||
->markdown('emails.registered')
|
||||
->subject((string)trans('email.registered_subject'));
|
||||
->subject((string)trans('email.registered_subject'))
|
||||
;
|
||||
}
|
||||
}
|
||||
|
@@ -35,8 +35,6 @@ use Illuminate\Support\Collection;
|
||||
* Class ReportNewJournalsMail.
|
||||
*
|
||||
* Sends a list of newly created journals to the user.
|
||||
*
|
||||
|
||||
*/
|
||||
class ReportNewJournalsMail extends Mailable
|
||||
{
|
||||
@@ -48,8 +46,6 @@ class ReportNewJournalsMail extends Mailable
|
||||
|
||||
/**
|
||||
* ConfirmEmailChangeMail constructor.
|
||||
*
|
||||
* @param Collection $groups
|
||||
*/
|
||||
public function __construct(Collection $groups)
|
||||
{
|
||||
@@ -67,11 +63,11 @@ class ReportNewJournalsMail extends Mailable
|
||||
|
||||
return $this
|
||||
->markdown('emails.report-new-journals')
|
||||
->subject(trans_choice('email.new_journals_subject', $this->groups->count()));
|
||||
->subject(trans_choice('email.new_journals_subject', $this->groups->count()))
|
||||
;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return void
|
||||
* @throws FireflyException
|
||||
*/
|
||||
private function transform(): void
|
||||
|
@@ -30,8 +30,6 @@ use Illuminate\Queue\SerializesModels;
|
||||
/**
|
||||
* Sends user link for new password.
|
||||
* Class RequestedNewPassword
|
||||
*
|
||||
|
||||
*/
|
||||
class RequestedNewPassword extends Mailable
|
||||
{
|
||||
@@ -42,8 +40,6 @@ class RequestedNewPassword extends Mailable
|
||||
|
||||
/**
|
||||
* RequestedNewPassword constructor.
|
||||
*
|
||||
* @param string $url
|
||||
*/
|
||||
public function __construct(string $url)
|
||||
{
|
||||
@@ -59,6 +55,7 @@ class RequestedNewPassword extends Mailable
|
||||
{
|
||||
return $this
|
||||
->markdown('emails.password')
|
||||
->subject((string)trans('email.reset_pw_subject'));
|
||||
->subject((string)trans('email.reset_pw_subject'))
|
||||
;
|
||||
}
|
||||
}
|
||||
|
@@ -29,8 +29,6 @@ use Illuminate\Queue\SerializesModels;
|
||||
|
||||
/**
|
||||
* Class UndoEmailChangeMail
|
||||
*
|
||||
|
||||
*/
|
||||
class UndoEmailChangeMail extends Mailable
|
||||
{
|
||||
@@ -43,10 +41,6 @@ class UndoEmailChangeMail extends Mailable
|
||||
|
||||
/**
|
||||
* UndoEmailChangeMail constructor.
|
||||
*
|
||||
* @param string $newEmail
|
||||
* @param string $oldEmail
|
||||
* @param string $url
|
||||
*/
|
||||
public function __construct(string $newEmail, string $oldEmail, string $url)
|
||||
{
|
||||
@@ -64,6 +58,7 @@ class UndoEmailChangeMail extends Mailable
|
||||
{
|
||||
return $this
|
||||
->markdown('emails.undo-email-change')
|
||||
->subject((string)trans('email.email_change_subject'));
|
||||
->subject((string)trans('email.email_change_subject'))
|
||||
;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user