From 8f0316a2ec2517c74b0ee29c704a3a9ffbe24430 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 28 Aug 2022 11:08:15 +1000
Subject: [PATCH 1/3] Improve Check Data

---
 app/Console/Commands/CheckData.php | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index 80ff44a1329f..e993454c2d4c 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -114,7 +114,8 @@ class CheckData extends Command
         $this->checkEntityInvitations();
         $this->checkCompanyData();
         $this->checkBalanceVsPaidStatus();
-
+        $this->checkDuplicateRecurringInvoices();
+        
         if(Ninja::isHosted())
             $this->checkAccountStatuses();
 
@@ -145,6 +146,23 @@ class CheckData extends Command
         $this->log .= $str."\n";
     }
 
+    private function checkDuplicateRecurringInvoices()
+    {
+
+        if(Ninja::isHosted())
+        {
+            $c = Client::on('db-ninja-01')->where('company_id', config('ninja.ninja_default_company_id'))
+                ->with('recurring_invoices')
+                ->cursor()
+                ->each(function ($client){
+                  if($client->recurring_invoices()->where('is_deleted', 0)->where('deleted_at', null)->count() > 1)
+                    $this->logMessage("Duplicate Recurring Invoice => {$client->custom_value1}");
+                });
+        }
+
+    }
+
+
     private function checkOAuth()
     {
         // check for duplicate oauth ids

From 970a4ed94eca4fc9c804a50b8495a23059ac5d28 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 28 Aug 2022 11:38:42 +1000
Subject: [PATCH 2/3] Minor fixes for languages

---
 lang/en/texts.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/en/texts.php b/lang/en/texts.php
index 83141fe88992..920fc8020249 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -800,7 +800,7 @@ $LANG = array(
     'activity_51' => ':user deleted user :user',
     'activity_52' => ':user restored user :user',
     'activity_53' => ':user marked sent :invoice',
-    'activity_54' => ':user reopened ticket :ticket',
+    'activity_54' => ':user paid invoice :invoice',
     'activity_55' => ':contact replied ticket :ticket',
     'activity_56' => ':user viewed ticket :ticket',
 

From 1f1d8d53cc027da68ef276c6a666c68c36174a97 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 28 Aug 2022 13:58:40 +1000
Subject: [PATCH 3/3] code cleanup

---
 app/Observers/UserObserver.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php
index 64e7e69bd0c9..9f1f008668d0 100644
--- a/app/Observers/UserObserver.php
+++ b/app/Observers/UserObserver.php
@@ -24,9 +24,6 @@ class UserObserver
     public function created(User $user)
     {
 
-        if(class_exists(\Modules\Admin\Jobs\Account\UserQuality::class))
-            \Modules\Admin\Jobs\Account\UserQuality::dispatch($user, $user->account->key);
-
     }
 
     /**
@@ -38,9 +35,6 @@ class UserObserver
     public function updated(User $user)
     {
 
-        if(class_exists(\Modules\Admin\Jobs\Account\UserQuality::class))
-            \Modules\Admin\Jobs\Account\UserQuality::dispatch($user, $user->account->key);
-
     }
 
     /**