From e4107416654742188513a3011447f1193dacd437 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sat, 22 Apr 2023 09:18:52 +1000
Subject: [PATCH] Minor fixes for quotas

---
 app/Filters/RecurringInvoiceFilters.php            | 4 ++--
 app/Http/ValidationRules/Account/BlackListRule.php | 1 +
 app/Jobs/Mail/NinjaMailerJob.php                   | 2 +-
 app/Services/Email/Email.php                       | 2 +-
 app/Services/Email/EmailMailer.php                 | 2 +-
 app/Utils/EmailStats.php                           | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/Filters/RecurringInvoiceFilters.php b/app/Filters/RecurringInvoiceFilters.php
index d87b9bc7b539..2a38a3a04deb 100644
--- a/app/Filters/RecurringInvoiceFilters.php
+++ b/app/Filters/RecurringInvoiceFilters.php
@@ -116,7 +116,7 @@ class RecurringInvoiceFilters extends QueryFilters
     /**
      * Filters the query by the users company ID.
      *
-     * @return Illuminate\Database\Eloquent\Builder
+     * @return Builder
      */
     public function entityFilter(): Builder
     {
@@ -126,7 +126,7 @@ class RecurringInvoiceFilters extends QueryFilters
     /**
      * Filter based on line_items product_key
      *
-     * @param string value Product keys
+     * @param string $value Product keys
      * @return Builder
      */
     public function product_key(string $value = ''): Builder
diff --git a/app/Http/ValidationRules/Account/BlackListRule.php b/app/Http/ValidationRules/Account/BlackListRule.php
index 740c269a8fef..d0f9fc535532 100644
--- a/app/Http/ValidationRules/Account/BlackListRule.php
+++ b/app/Http/ValidationRules/Account/BlackListRule.php
@@ -30,6 +30,7 @@ class BlackListRule implements Rule
         'sharklasers.com',
         '100072641.help',
         'yandex.com',
+        'bloheyz.com',
     ];
 
     /**
diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php
index 1254bd666b76..2a1e4d2b63c8 100644
--- a/app/Jobs/Mail/NinjaMailerJob.php
+++ b/app/Jobs/Mail/NinjaMailerJob.php
@@ -136,7 +136,7 @@ class NinjaMailerJob implements ShouldQueue
                 ->send($this->nmo->mailable);
 
             /* Count the amount of emails sent across all the users accounts */
-            Cache::increment($this->company->account->key);
+            Cache::increment("email_quota".$this->company->account->key);
 
             LightLogs::create(new EmailSuccess($this->nmo->company->company_key))
                      ->send();
diff --git a/app/Services/Email/Email.php b/app/Services/Email/Email.php
index 9ff36f5c52e6..40041fc984a6 100644
--- a/app/Services/Email/Email.php
+++ b/app/Services/Email/Email.php
@@ -247,7 +247,7 @@ class Email implements ShouldQueue
             
             $mailer->send($this->mailable);
 
-            Cache::increment($this->company->account->key);
+            Cache::increment("email_quota".$this->company->account->key);
 
             LightLogs::create(new EmailSuccess($this->company->company_key))
                      ->send();
diff --git a/app/Services/Email/EmailMailer.php b/app/Services/Email/EmailMailer.php
index 6d633575bc01..a3e52bc49aed 100644
--- a/app/Services/Email/EmailMailer.php
+++ b/app/Services/Email/EmailMailer.php
@@ -95,7 +95,7 @@ class EmailMailer implements ShouldQueue
             
             $mailer->send($this->email_mailable);
 
-            Cache::increment($this->email_service->company->account->key);
+            Cache::increment("email_quota".$this->email_service->company->account->key);
 
             LightLogs::create(new EmailSuccess($this->email_service->company->company_key))
                      ->send();
diff --git a/app/Utils/EmailStats.php b/app/Utils/EmailStats.php
index 1e007f8def05..8000ed4edfd7 100644
--- a/app/Utils/EmailStats.php
+++ b/app/Utils/EmailStats.php
@@ -28,7 +28,7 @@ class EmailStats
      */
     public static function inc($company_key)
     {
-        Cache::increment(self::EMAIL.$company_key);
+        Cache::increment("email_quota".self::EMAIL.$company_key);
     }
 
     /**