Merge pull request #7786 from turbo124/v5-develop

Improve Check Data

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

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);
-
     }
 
     /**

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',