Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Convert to Symfony Mailer

Browse Source
This commit is contained in:
Shift 2022-06-21 09:59:02 +00:00
parent 0ac6c4c4d2
commit a1403b62da
No known key found for this signature in database
GPG Key ID: 5A96F038425C5A1C
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/Mail/NinjaMailer.php
View File

@ -43,7 +43,7 @@ class NinjaMailer extends Mailable
$ninja_mailable = $this->from(config('mail.from.address'), $from_name) $ninja_mailable = $this->from(config('mail.from.address'), $from_name)
->subject($this->mail_obj->subject) ->subject($this->mail_obj->subject)
->view($this->mail_obj->markdown, $this->mail_obj->data) ->view($this->mail_obj->markdown, $this->mail_obj->data)
->withSwiftMessage(function ($message) { ->withSymfonyMessage(function ($message) {
$message->getHeaders()->addTextHeader('Tag', $this->mail_obj->tag); $message->getHeaders()->addTextHeader('Tag', $this->mail_obj->tag);
}); });

4
app/Jobs/Mail/NinjaMailerJob.php
View File

@ -212,7 +212,7 @@ class NinjaMailerJob implements ShouldQueue
$this->nmo $this->nmo
->mailable ->mailable
->from($user->email, $user->name()) ->from($user->email, $user->name())
->withSwiftMessage(function ($message) use ($token) { ->withSymfonyMessage(function ($message) use ($token) {
$message->getHeaders()->addTextHeader('GmailToken', $token); $message->getHeaders()->addTextHeader('GmailToken', $token);
}); });
@ -277,7 +277,7 @@ class NinjaMailerJob implements ShouldQueue
$this->nmo $this->nmo
->mailable ->mailable
->from($user->email, $user->name()) ->from($user->email, $user->name())
->withSwiftMessage(function ($message) use ($token) { ->withSymfonyMessage(function ($message) use ($token) {
$message->getHeaders()->addTextHeader('GmailToken', $token); $message->getHeaders()->addTextHeader('GmailToken', $token);
}); });
} }

2
app/Mail/Admin/EntityNotificationMailer.php
View File

@ -37,7 +37,7 @@ class EntityNotificationMailer extends Mailable
return $this->from(config('mail.from.address'), config('mail.from.name')) return $this->from(config('mail.from.address'), config('mail.from.name'))
->subject($this->mail_obj->subject) ->subject($this->mail_obj->subject)
->markdown($this->mail_obj->markdown, $this->mail_obj->data) ->markdown($this->mail_obj->markdown, $this->mail_obj->data)
->withSwiftMessage(function ($message) { ->withSymfonyMessage(function ($message) {
$message->getHeaders()->addTextHeader('Tag', $this->mail_obj->tag); $message->getHeaders()->addTextHeader('Tag', $this->mail_obj->tag);
}); });
} }

2
app/Mail/TemplateEmail.php
View File

@ -114,7 +114,7 @@ class TemplateEmail extends Mailable
'whitelabel' => $this->client->user->account->isPaid() ? true : false, 'whitelabel' => $this->client->user->account->isPaid() ? true : false,
'logo' => $this->company->present()->logo($settings), 'logo' => $this->company->present()->logo($settings),
]) ])
->withSwiftMessage(function ($message) use ($company) { ->withSymfonyMessage(function ($message) use ($company) {
$message->getHeaders()->addTextHeader('Tag', $company->company_key); $message->getHeaders()->addTextHeader('Tag', $company->company_key);
$message->invitation = $this->invitation; $message->invitation = $this->invitation;
}); });

2
app/Mail/User/UserNotificationMailer.php
View File

@ -42,7 +42,7 @@ class UserNotificationMailer extends Mailable
'body' => $this->mail_obj->data['message'], 'body' => $this->mail_obj->data['message'],
]) ])
->view($this->mail_obj->markdown, $this->mail_obj->data) ->view($this->mail_obj->markdown, $this->mail_obj->data)
->withSwiftMessage(function ($message) { ->withSymfonyMessage(function ($message) {
$message->getHeaders()->addTextHeader('Tag', $this->mail_obj->tag); $message->getHeaders()->addTextHeader('Tag', $this->mail_obj->tag);
}); });
} }

2
app/Mail/VendorTemplateEmail.php
View File

@ -108,7 +108,7 @@ class VendorTemplateEmail extends Mailable
'whitelabel' => $this->vendor->user->account->isPaid() ? true : false, 'whitelabel' => $this->vendor->user->account->isPaid() ? true : false,
'logo' => $this->company->present()->logo($settings), 'logo' => $this->company->present()->logo($settings),
]) ])
->withSwiftMessage(function ($message) { ->withSymfonyMessage(function ($message) {
$message->getHeaders()->addTextHeader('Tag', $this->company->company_key); $message->getHeaders()->addTextHeader('Tag', $this->company->company_key);
$message->invitation = $this->invitation; $message->invitation = $this->invitation;
}); });

2
app/Notifications/BaseNotification.php
View File

@ -98,7 +98,7 @@ class BaseNotification extends Notification
$mail_message->attachData($ubl_string, $this->entity->getFileName('xml')); $mail_message->attachData($ubl_string, $this->entity->getFileName('xml'));
} }
return $mail_message->withSwiftMessage(function ($message) { return $mail_message->withSymfonyMessage(function ($message) {
$message->getHeaders()->addTextHeader('Tag', $this->invitation->company->company_key); $message->getHeaders()->addTextHeader('Tag', $this->invitation->company->company_key);
}); });
} }

2
app/Providers/MailServiceProvider.php
View File

@ -28,7 +28,7 @@ class MailServiceProvider extends MailProvider
public function boot() public function boot()
{ {
app('mail.manager')->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class)); app('mail.manager')->getSymfonyTransport()->registerPlugin($this->app->make(CssInlinerPlugin::class));
} }
protected function registerIlluminateMailer() protected function registerIlluminateMailer()

4
composer.json
View File

@ -85,13 +85,13 @@
"socialiteproviders/microsoft": "^4.1", "socialiteproviders/microsoft": "^4.1",
"square/square": "13.0.0.20210721", "square/square": "13.0.0.20210721",
"stripe/stripe-php": "^7.50", "stripe/stripe-php": "^7.50",
"symfony/http-client": "^5.2", "symfony/http-client": "^6.0",
"tijsverkoyen/css-to-inline-styles": "^2.2", "tijsverkoyen/css-to-inline-styles": "^2.2",
"turbo124/beacon": "^1.0", "turbo124/beacon": "^1.0",
"turbo124/laravel-gmail": "^5", "turbo124/laravel-gmail": "^5",
"webpatser/laravel-countries": "dev-master#75992ad", "webpatser/laravel-countries": "dev-master#75992ad",
"wepay/php-sdk": "^0.3", "wepay/php-sdk": "^0.3",
"wildbit/swiftmailer-postmark": "^3.3" "symfony/postmark-mailer": "^6.0"
}, },
"require-dev": { "require-dev": {
"php": "^7.4|^8.0", "php": "^7.4|^8.0",