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

Hosted email quotas

Browse Source
This commit is contained in:
David Bomba 2021-08-09 20:33:59 +10:00
parent c663369d38
commit c2c71ab69c
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,6 +227,10 @@ class NinjaMailerJob implements ShouldQueue
if(Ninja::isHosted() && strpos($this->nmo->to_user->email, '@example.com') !== false) if(Ninja::isHosted() && strpos($this->nmo->to_user->email, '@example.com') !== false)
return true; return true;
/* GMail users are uncapped */
if(Ninja::isHosted() && $this->nmo->settings->email_sending_method == 'gmail')
return false;
/* On the hosted platform, if the user is over the email quotas, we do not send the email. */ /* On the hosted platform, if the user is over the email quotas, we do not send the email. */
if(Ninja::isHosted() && $this->company->account->emailQuotaExceeded()) if(Ninja::isHosted() && $this->company->account->emailQuotaExceeded())
return true; return true;

27
app/Models/Account.php
View File

@ -369,21 +369,26 @@ class Account extends BaseModel
if(is_null(Cache::get($this->key))) if(is_null(Cache::get($this->key)))
return false; return false;
if(Cache::get($this->key) > $this->getDailyEmailLimit()) { try {
if(Cache::get($this->key) > $this->getDailyEmailLimit()) {
if(is_null(Cache::get("throttle_notified:{$this->key}"))) { if(is_null(Cache::get("throttle_notified:{$this->key}"))) {
$nmo = new NinjaMailerObject; $nmo = new NinjaMailerObject;
$nmo->mailable = new EmailQuotaExceeded($this->companies()->first()); $nmo->mailable = new EmailQuotaExceeded($this->companies()->first());
$nmo->company = $this->companies()->first(); $nmo->company = $this->companies()->first();
$nmo->settings = $this->companies()->first()->settings; $nmo->settings = $this->companies()->first()->settings;
$nmo->to_user = $this->companies()->first()->owner(); $nmo->to_user = $this->companies()->first()->owner();
NinjaMailerJob::dispatch($nmo); NinjaMailerJob::dispatch($nmo);
Cache::put("throttle_notified:{$this->key}", true, 60 * 24); Cache::put("throttle_notified:{$this->key}", true, 60 * 24);
}
return true;
} }
}
return true; catch(\Exception $e){
\Sentry\captureMessage("I encountered an error with email quotas - defaulting to SEND");
} }
return false; return false;