Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 10:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adjustments for email quotas

Browse Source
This commit is contained in:
David Bomba 2024-03-13 20:19:17 +11:00
parent fa828b3ab6
commit fd06b42bc2
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,7 +145,8 @@ class NinjaMailerJob implements ShouldQueue
->send($mailable);
/* Count the amount of emails sent across all the users accounts */
Cache::increment("email_quota".$this->company->account->key);
$this->incrementEmailCounter();
LightLogs::create(new EmailSuccess($this->nmo->company->company_key, $this->nmo->mailable->subject))
->send();
@ -221,6 +222,12 @@ class NinjaMailerJob implements ShouldQueue
$this->cleanUpMailers();
}
private function incrementEmailCounter(): void
{
if(in_array($this->mailer, ['default','mailgun']))
Cache::increment("email_quota".$this->company->account->key);
}
/**
* Entity notification when an email fails to send
*

8
app/Services/Email/Email.php
View File

@ -244,6 +244,12 @@ class Email implements ShouldQueue
return $this;
}
private function incrementEmailCounter(): void
{
if(in_array($this->mailer, ['default','mailgun']))
Cache::increment("email_quota".$this->company->account->key);
}
/**
* Attempts to send the email
*
@ -270,7 +276,7 @@ class Email implements ShouldQueue
$mailer->send($this->mailable);
Cache::increment("email_quota".$this->company->account->key);
$this->incrementEmailCounter();
LightLogs::create(new EmailSuccess($this->company->company_key, $this->mailable->subject))
->send();