1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00

Merge pull request #4917 from turbo124/v5-develop

Wire up settings in mailer job
This commit is contained in:
David Bomba 2021-02-16 22:00:46 +11:00 committed by GitHub
commit 648e6b3252
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -47,14 +47,11 @@ class NinjaMailerJob implements ShouldQueue
public $nmo;
public $settings;
public function __construct(NinjaMailerObject $nmo)
{
$this->nmo = $nmo;
$this->settings = $nmo->settings;
}
public function handle()
@ -104,7 +101,7 @@ class NinjaMailerJob implements ShouldQueue
private function setGmailMailer()
{
$sending_user = $this->settings->gmail_sending_user_id;
$sending_user = $this->nmo->settings->gmail_sending_user_id;
$user = User::find($this->decodePrimaryKey($sending_user));
@ -143,7 +140,7 @@ class NinjaMailerJob implements ShouldQueue
);
}
private function failed($exception = null)
public function failed($exception = null)
{
nlog('mailer job failed');
nlog($exception->getMessage());