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 #6060 from turbo124/v5-develop

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

8
app/Providers/MailCssInlinerServiceProvider.php
View File

@ -42,9 +42,9 @@ class MailCssInlinerServiceProvider extends ServiceProvider
return new CssInlinerPlugin([]); return new CssInlinerPlugin([]);
}); });
$this->app->afterResolving('mail.manager', function (MailManager $mailManager) { // $this->app->afterResolving('mail.manager', function (MailManager $mailManager) {
$mailManager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class)); // $mailManager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
return $mailManager; // return $mailManager;
}); // });
} }
} }

5
app/Providers/MailServiceProvider.php
View File

@ -51,6 +51,11 @@ class MailServiceProvider extends MailProvider
}); });
$this->app->afterResolving('mail.manager', function (MailManager $mailManager) {
$mailManager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
return $mailManager;
});
} }
protected function guzzle(array $config): HttpClient protected function guzzle(array $config): HttpClient