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

Merge pull request #6062 from turbo124/v5-develop

Browse Source 
Fixes for conflicts
This commit is contained in:
David Bomba 2021-06-17 18:39:22 +10:00 committed by GitHub
commit d076027d14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Providers/MailServiceProvider.php
View File

@ -35,7 +35,9 @@ class MailServiceProvider extends MailProvider
{
$this->app->singleton('mail.manager', function($app) {
return new GmailTransportManager($app);
$mailManager = new GmailTransportManager($app);
$mailManager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
return $mailManager;
});
$this->app->bind('mailer', function ($app) {
@ -51,10 +53,10 @@ class MailServiceProvider extends MailProvider
});
$this->app->afterResolving('mail.manager', function (GmailTransportManager $mailManager) {
$mailManager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
return $mailManager;
});
// $this->app->afterResolving('mail.manager', function (GmailTransportManager $mailManager) {
// $mailManager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
// return $mailManager;
// });
}