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

Browse Source 
Fixes for tests
This commit is contained in:
David Bomba 2022-07-01 21:09:27 +10:00 committed by GitHub
commit 9e76188b17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,7 +310,7 @@ class NinjaMailerJob implements ShouldQueue
{ {
/* If we are migrating data we don't want to fire any emails */ /* If we are migrating data we don't want to fire any emails */
if($this->nmo->company->is_disabled && !$this->override) if($this->company->is_disabled && !$this->override)
return true; return true;
/* On the hosted platform we set default contacts a @example.com email address - we shouldn't send emails to these types of addresses */ /* On the hosted platform we set default contacts a @example.com email address - we shouldn't send emails to these types of addresses */
@ -326,7 +326,7 @@ class NinjaMailerJob implements ShouldQueue
return true; return true;
/* To handle spam users we drop all emails from flagged accounts */ /* To handle spam users we drop all emails from flagged accounts */
if(Ninja::isHosted() && $this->company->account && $this->nmo->company->account->is_flagged) if(Ninja::isHosted() && $this->company->account && $this->company->account->is_flagged)
return true; return true;
/* Ensure the user has a valid email address */ /* Ensure the user has a valid email address */
@ -334,8 +334,8 @@ class NinjaMailerJob implements ShouldQueue
return true; return true;
/* On the hosted platform we actively scan all outbound emails to ensure outbound email quality remains high */ /* On the hosted platform we actively scan all outbound emails to ensure outbound email quality remains high */
if(Ninja::isHosted()) // if(Ninja::isHosted())
return (new \Modules\Admin\Jobs\Account\EmailQuality($this->nmo, $this->company))->run(); // return (new \Modules\Admin\Jobs\Account\EmailQuality($this->nmo, $this->company))->run();
return false; return false;
} }