From 7c3613455d99238381fd2f5eec7f6209e9c41e52 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 15 May 2022 17:51:06 +1000
Subject: [PATCH 1/5] Ledger refactor

---
 app/Console/Commands/CheckData.php            |  8 +-
 app/Console/Kernel.php                        |  4 +-
 app/Jobs/Cron/SubscriptionCron.php            |  2 +
 app/Jobs/Ledger/ClientLedgerBalanceUpdate.php | 85 +++++++++++++++++++
 app/Jobs/Ledger/LedgerBalanceUpdate.php       | 17 +++-
 app/Jobs/Util/DiskCleanup.php                 |  2 +-
 app/Services/Ledger/LedgerService.php         |  6 ++
 7 files changed, 113 insertions(+), 11 deletions(-)
 create mode 100644 app/Jobs/Ledger/ClientLedgerBalanceUpdate.php

diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index 11120817a88d..a57375b47612 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -607,7 +607,7 @@ class CheckData extends Command
         invoices ON 
         clients.id=invoices.client_id 
         WHERE invoices.is_deleted = false 
-        AND invoices.status_id IN (2,3,4) 
+        AND invoices.status_id IN (2,3) 
         GROUP BY clients.id
         HAVING invoice_balance != clients.balance
         ORDER BY clients.id;
@@ -663,7 +663,7 @@ class CheckData extends Command
         ON invoices.client_id = clients.id
         WHERE invoices.is_deleted = 0
         AND clients.is_deleted = 0
-        AND invoices.status_id IN (2,3,4)
+        AND invoices.status_id IN (2,3)
         GROUP BY clients.id
         HAVING(invoices_balance != clients.balance)
         ORDER BY clients.id;
@@ -683,7 +683,7 @@ class CheckData extends Command
         {
             $client = Client::withTrashed()->find($_client->id);
 
-            $invoice_balance = $client->invoices()->where('is_deleted', false)->whereIn('status_id', [2,3,4])->sum('balance');
+            $invoice_balance = $client->invoices()->where('is_deleted', false)->whereIn('status_id', [2,3])->sum('balance');
 
             $ledger = CompanyLedger::where('client_id', $client->id)->orderBy('id', 'DESC')->first();
 
@@ -724,7 +724,7 @@ class CheckData extends Command
         $this->wrong_paid_to_dates = 0;
 
         foreach (Client::where('is_deleted', 0)->where('clients.updated_at', '>', now()->subDays(2))->cursor() as $client) {
-            $invoice_balance = $client->invoices()->where('is_deleted', false)->whereIn('status_id', [2,3,4])->sum('balance');
+            $invoice_balance = $client->invoices()->where('is_deleted', false)->whereIn('status_id', [2,3])->sum('balance');
             $ledger = CompanyLedger::where('client_id', $client->id)->orderBy('id', 'DESC')->first();
 
             if ($ledger && number_format($ledger->balance, 4) != number_format($client->balance, 4)) {
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index c27713e47c94..b6e59ec00378 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -87,9 +87,9 @@ class Kernel extends ConsoleKernel
 
             $schedule->job(new SendFailedEmails)->daily()->withoutOverlapping();
 
-            $schedule->command('ninja:check-data --database=db-ninja-01')->daily('01:00')->withoutOverlapping();
+            $schedule->command('ninja:check-data --database=db-ninja-01')->daily('02:00')->withoutOverlapping();
 
-            $schedule->command('ninja:check-data --database=db-ninja-02')->dailyAt('01:05')->withoutOverlapping();
+            $schedule->command('ninja:check-data --database=db-ninja-02')->dailyAt('02:05')->withoutOverlapping();
 
             $schedule->command('ninja:s3-cleanup')->dailyAt('23:15')->withoutOverlapping();
 
diff --git a/app/Jobs/Cron/SubscriptionCron.php b/app/Jobs/Cron/SubscriptionCron.php
index 1cda190ec999..536c49063e84 100644
--- a/app/Jobs/Cron/SubscriptionCron.php
+++ b/app/Jobs/Cron/SubscriptionCron.php
@@ -38,6 +38,8 @@ class SubscriptionCron
     public function handle() : void
     {
 
+        nlog("Subscription Cron");
+
         if (! config('ninja.db.multi_db_enabled')) {
 
             $this->loopSubscriptions();
diff --git a/app/Jobs/Ledger/ClientLedgerBalanceUpdate.php b/app/Jobs/Ledger/ClientLedgerBalanceUpdate.php
new file mode 100644
index 000000000000..36068bdb7fea
--- /dev/null
+++ b/app/Jobs/Ledger/ClientLedgerBalanceUpdate.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Jobs\Ledger;
+
+use App\Libraries\MultiDB;
+use App\Models\Client;
+use App\Models\Company;
+use App\Models\CompanyLedger;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class ClientLedgerBalanceUpdate implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $tries = 1;
+
+    public $company;
+
+    public $client;
+
+
+    public function __construct(Company $company, Client $client)
+    {
+    
+        $this->company = $company;
+        $this->client = $client;
+    }
+
+    /**
+     * Execute the job.
+     *
+     *
+     * @return void
+     */
+    public function handle() :void
+    {
+        nlog("Updating company ledgers");
+
+        MultiDB::setDb($this->company->db);
+        
+        CompanyLedger::where('balance', 0)->where('client_id', $this->client->id)->cursor()->each(function ($company_ledger){
+
+            if($company_ledger->balance > 0)
+                return;
+
+            $last_record =  CompanyLedger::where('client_id', $company_ledger->client_id)
+                            ->where('company_id', $company_ledger->company_id)
+                            ->where('balance', '!=', 0)
+                            ->orderBy('id', 'DESC')
+                            ->first();
+
+            if(!$last_record)
+                return;
+
+            nlog("Updating Balance NOW");
+            
+            $company_ledger->balance = $last_record->balance + $company_ledger->adjustment;
+            $company_ledger->save();
+
+        });
+
+        nlog("Finished checking company ledgers");
+
+    }
+
+    public function checkLedger()
+    {
+
+
+    }
+
+}
diff --git a/app/Jobs/Ledger/LedgerBalanceUpdate.php b/app/Jobs/Ledger/LedgerBalanceUpdate.php
index e7fc1bde0157..536814e0d751 100644
--- a/app/Jobs/Ledger/LedgerBalanceUpdate.php
+++ b/app/Jobs/Ledger/LedgerBalanceUpdate.php
@@ -24,6 +24,8 @@ class LedgerBalanceUpdate implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
+    public $tries = 1;
+
     public function __construct()
     {
     }
@@ -34,25 +36,30 @@ class LedgerBalanceUpdate implements ShouldQueue
      *
      * @return void
      */
-    public function handle()
+    public function handle() :void
     {
+        nlog("Updating company ledgers");
 
         if (! config('ninja.db.multi_db_enabled')) {
-            $this->check();
+            $this->checkLedger();
         } else {
             //multiDB environment, need to
             foreach (MultiDB::$dbs as $db) {
                 MultiDB::setDB($db);
 
-                $this->check();
+                $this->checkLedger();
             }
         }
 
+        nlog("Finished checking company ledgers");
+
     }
 
-    public function check()
+    public function checkLedger()
     {
 
+        nlog("Checking ledgers....");
+
         CompanyLedger::where('balance', 0)->cursor()->each(function ($company_ledger){
 
             if($company_ledger->balance > 0)
@@ -67,6 +74,8 @@ class LedgerBalanceUpdate implements ShouldQueue
             if(!$last_record)
                 return;
 
+            nlog("Updating Balance NOW");
+            
             $company_ledger->balance = $last_record->balance + $company_ledger->adjustment;
             $company_ledger->save();
 
diff --git a/app/Jobs/Util/DiskCleanup.php b/app/Jobs/Util/DiskCleanup.php
index d18ac9737d10..698ae3975db7 100644
--- a/app/Jobs/Util/DiskCleanup.php
+++ b/app/Jobs/Util/DiskCleanup.php
@@ -36,7 +36,7 @@ class DiskCleanup implements ShouldQueue
      */
     public function handle()
     {
-
+        nlog("Cleaning Storage");
 
         // Get all files in a directory
         $files = Storage::allFiles(config('filesystems.default'), 'backups/');
diff --git a/app/Services/Ledger/LedgerService.php b/app/Services/Ledger/LedgerService.php
index df8d9568ead8..4925bcca997c 100644
--- a/app/Services/Ledger/LedgerService.php
+++ b/app/Services/Ledger/LedgerService.php
@@ -12,6 +12,7 @@
 namespace App\Services\Ledger;
 
 use App\Factory\CompanyLedgerFactory;
+use App\Jobs\Ledger\ClientLedgerBalanceUpdate;
 use App\Models\Activity;
 use App\Models\CompanyLedger;
 
@@ -36,6 +37,7 @@ class LedgerService
 
         $this->entity->company_ledger()->save($company_ledger);
         
+        ClientLedgerBalanceUpdate::dispatch($this->entity->company, $this->entity->client)->delay(300);
 
         return $this;
     }
@@ -52,6 +54,8 @@ class LedgerService
 
         $this->entity->company_ledger()->save($company_ledger);
 
+        ClientLedgerBalanceUpdate::dispatch($this->entity->company, $this->entity->client)->delay(300);
+
         return $this;
     }
 
@@ -67,6 +71,8 @@ class LedgerService
 
         $this->entity->company_ledger()->save($company_ledger);
 
+        ClientLedgerBalanceUpdate::dispatch($this->entity->company, $this->entity->client)->delay(300);
+
         return $this;
     }
 

From aeae0a19ab8c9ce4723d37e4305a5748ad7f888b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 15 May 2022 20:14:14 +1000
Subject: [PATCH 2/5] Adjust delays for observers

---
 app/Console/Kernel.php                            | 2 +-
 app/Http/Requests/Payment/StorePaymentRequest.php | 2 +-
 app/Mail/Engine/InvoiceEmailEngine.php            | 2 ++
 app/Models/CompanyLedger.php                      | 5 +++++
 app/Observers/ClientObserver.php                  | 6 +++---
 app/Observers/ExpenseObserver.php                 | 6 +++---
 app/Observers/InvoiceObserver.php                 | 6 +++---
 app/Observers/PaymentObserver.php                 | 4 ++--
 app/Observers/ProjectObserver.php                 | 4 ++--
 app/Observers/QuoteObserver.php                   | 6 +++---
 app/Observers/TaskObserver.php                    | 6 +++---
 app/PaymentDrivers/StripePaymentDriver.php        | 2 +-
 app/Services/Ledger/LedgerService.php             | 6 +++---
 13 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index b6e59ec00378..14445950b38f 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -55,7 +55,7 @@ class Kernel extends ConsoleKernel
 
         $schedule->job(new ReminderJob)->hourly()->withoutOverlapping();
 
-        $schedule->job(new LedgerBalanceUpdate)->everyFiveMinutes()->withoutOverlapping();
+        // $schedule->job(new LedgerBalanceUpdate)->everyFiveMinutes()->withoutOverlapping();
 
         $schedule->job(new CompanySizeCheck)->daily()->withoutOverlapping();
 
diff --git a/app/Http/Requests/Payment/StorePaymentRequest.php b/app/Http/Requests/Payment/StorePaymentRequest.php
index b26a6d5908d6..e0e52c7b25b3 100644
--- a/app/Http/Requests/Payment/StorePaymentRequest.php
+++ b/app/Http/Requests/Payment/StorePaymentRequest.php
@@ -104,7 +104,7 @@ class StorePaymentRequest extends Request
             'credits.*.credit_id' => new ValidCreditsRules($this->all()),
             'credits.*.amount' => ['required', new CreditsSumRule($this->all())],
             'invoices' => new ValidPayableInvoicesRule(),
-            'number' => ['nullable', Rule::unique('payments')->where('company_id', auth()->user()->company()->id)],
+            'number' => ['nullable', 'bail', Rule::unique('payments')->where('company_id', auth()->user()->company()->id)],
 
         ];
 
diff --git a/app/Mail/Engine/InvoiceEmailEngine.php b/app/Mail/Engine/InvoiceEmailEngine.php
index 99bf3041515f..ad0c232489cf 100644
--- a/app/Mail/Engine/InvoiceEmailEngine.php
+++ b/app/Mail/Engine/InvoiceEmailEngine.php
@@ -177,6 +177,8 @@ class InvoiceEmailEngine extends BaseEmailEngine
                                        });
                 }
 
+                $task_ids = [];
+                
                 if(property_exists($item, 'task_id'))
                 {
                     $task_ids[] = $item->task_id;
diff --git a/app/Models/CompanyLedger.php b/app/Models/CompanyLedger.php
index 4ce4690dcdde..f3f497341395 100644
--- a/app/Models/CompanyLedger.php
+++ b/app/Models/CompanyLedger.php
@@ -48,4 +48,9 @@ class CompanyLedger extends Model
     {
         return $this->morphTo();
     }
+
+    public function client()
+    {
+        return $this->belongsTo(Client::class);
+    }
 }
diff --git a/app/Observers/ClientObserver.php b/app/Observers/ClientObserver.php
index 5567a9e57faf..273b2e6c002c 100644
--- a/app/Observers/ClientObserver.php
+++ b/app/Observers/ClientObserver.php
@@ -30,7 +30,7 @@ class ClientObserver
                                     ->exists();
 
         if ($subscriptions) {
-            WebhookHandler::dispatch(Webhook::EVENT_CREATE_CLIENT, $client, $client->company);
+            WebhookHandler::dispatch(Webhook::EVENT_CREATE_CLIENT, $client, $client->company)->delay(now()->addSeconds(2));
         }
     }
 
@@ -47,7 +47,7 @@ class ClientObserver
                                     ->exists();
 
         if ($subscriptions) {
-            WebhookHandler::dispatch(Webhook::EVENT_UPDATE_CLIENT, $client, $client->company);
+            WebhookHandler::dispatch(Webhook::EVENT_UPDATE_CLIENT, $client, $client->company)->delay(now()->addSeconds(2));
         }
     }
 
@@ -64,7 +64,7 @@ class ClientObserver
                                     ->exists();
 
         if ($subscriptions) {
-            WebhookHandler::dispatch(Webhook::EVENT_DELETE_CLIENT, $client, $client->company);
+            WebhookHandler::dispatch(Webhook::EVENT_DELETE_CLIENT, $client, $client->company)->delay(now()->addSeconds(2));
         }
     }
 
diff --git a/app/Observers/ExpenseObserver.php b/app/Observers/ExpenseObserver.php
index 85d0af6171a4..2c71e5fc42da 100644
--- a/app/Observers/ExpenseObserver.php
+++ b/app/Observers/ExpenseObserver.php
@@ -30,7 +30,7 @@ class ExpenseObserver
                             ->exists();
 
         if ($subscriptions) {
-            WebhookHandler::dispatch(Webhook::EVENT_CREATE_EXPENSE, $expense, $expense->company);
+            WebhookHandler::dispatch(Webhook::EVENT_CREATE_EXPENSE, $expense, $expense->company)->delay(now()->addSeconds(2));
         }
     }
 
@@ -47,7 +47,7 @@ class ExpenseObserver
                             ->exists();
 
         if ($subscriptions) {
-            WebhookHandler::dispatch(Webhook::EVENT_UPDATE_EXPENSE, $expense, $expense->company);
+            WebhookHandler::dispatch(Webhook::EVENT_UPDATE_EXPENSE, $expense, $expense->company)->delay(now()->addSeconds(2));
         }
     }
 
@@ -64,7 +64,7 @@ class ExpenseObserver
                             ->exists();
 
         if ($subscriptions) {
-            WebhookHandler::dispatch(Webhook::EVENT_DELETE_EXPENSE, $expense, $expense->company);
+            WebhookHandler::dispatch(Webhook::EVENT_DELETE_EXPENSE, $expense, $expense->company)->delay(now()->addSeconds(2));
         }
     }
 
diff --git a/app/Observers/InvoiceObserver.php b/app/Observers/InvoiceObserver.php
index 00b18dc428c2..9650579f0e66 100644
--- a/app/Observers/InvoiceObserver.php
+++ b/app/Observers/InvoiceObserver.php
@@ -36,7 +36,7 @@ class InvoiceObserver
 
         if ($subscriptions) {
     
-            WebhookHandler::dispatch(Webhook::EVENT_CREATE_INVOICE, $invoice, $invoice->company, 'client');
+            WebhookHandler::dispatch(Webhook::EVENT_CREATE_INVOICE, $invoice, $invoice->company, 'client')->delay(now()->addSeconds(2));
         }
     }
 
@@ -55,7 +55,7 @@ class InvoiceObserver
 
         if ($subscriptions) {
                 
-            WebhookHandler::dispatch(Webhook::EVENT_UPDATE_INVOICE, $invoice, $invoice->company, 'client');
+            WebhookHandler::dispatch(Webhook::EVENT_UPDATE_INVOICE, $invoice, $invoice->company, 'client')->delay(now()->addSeconds(2));
         
         }
 
@@ -75,7 +75,7 @@ class InvoiceObserver
 
         if ($subscriptions) {
         
-            WebhookHandler::dispatch(Webhook::EVENT_DELETE_INVOICE, $invoice, $invoice->company, 'client');
+            WebhookHandler::dispatch(Webhook::EVENT_DELETE_INVOICE, $invoice, $invoice->company, 'client')->delay(now()->addSeconds(2));
         }
     }
 
diff --git a/app/Observers/PaymentObserver.php b/app/Observers/PaymentObserver.php
index efd1ac80f2a2..2f5a1d740eb6 100644
--- a/app/Observers/PaymentObserver.php
+++ b/app/Observers/PaymentObserver.php
@@ -30,7 +30,7 @@ class PaymentObserver
                             ->exists();
 
         if ($subscriptions) {
-            WebhookHandler::dispatch(Webhook::EVENT_CREATE_PAYMENT, $payment, $payment->company, 'invoices,client')->delay(5);
+            WebhookHandler::dispatch(Webhook::EVENT_CREATE_PAYMENT, $payment, $payment->company, 'invoices,client')->delay(now()->addSeconds(20));
         }
     }
 
@@ -57,7 +57,7 @@ class PaymentObserver
                         ->exists();
 
         if ($subscriptions) {
-            WebhookHandler::dispatch(Webhook::EVENT_DELETE_PAYMENT, $payment, $payment->company, 'invoices,client')->delay(5);
+            WebhookHandler::dispatch(Webhook::EVENT_DELETE_PAYMENT, $payment, $payment->company, 'invoices,client')->delay(now()->addSeconds(20));
         }
     }
 
diff --git a/app/Observers/ProjectObserver.php b/app/Observers/ProjectObserver.php
index 8adf3feee3ca..8c88a6c8eb9b 100644
--- a/app/Observers/ProjectObserver.php
+++ b/app/Observers/ProjectObserver.php
@@ -32,7 +32,7 @@ class ProjectObserver
 
         if ($subscriptions) {
     
-            WebhookHandler::dispatch(Webhook::EVENT_PROJECT_CREATE, $project, $project->company, 'client');
+            WebhookHandler::dispatch(Webhook::EVENT_PROJECT_CREATE, $project, $project->company, 'client')->delay(now()->addSeconds(2));
         }
     }
 
@@ -50,7 +50,7 @@ class ProjectObserver
 
         if ($subscriptions) {
     
-            WebhookHandler::dispatch(Webhook::EVENT_PROJECT_UPDATE, $project, $project->company, 'client');
+            WebhookHandler::dispatch(Webhook::EVENT_PROJECT_UPDATE, $project, $project->company, 'client')->delay(now()->addSeconds(2));
         }
     }
 
diff --git a/app/Observers/QuoteObserver.php b/app/Observers/QuoteObserver.php
index ba2f02fb5688..55e24d8e9b5c 100644
--- a/app/Observers/QuoteObserver.php
+++ b/app/Observers/QuoteObserver.php
@@ -33,7 +33,7 @@ class QuoteObserver
 
         if ($subscriptions) {
             $quote->load('client');
-            WebhookHandler::dispatch(Webhook::EVENT_CREATE_QUOTE, $quote, $quote->company, 'client');
+            WebhookHandler::dispatch(Webhook::EVENT_CREATE_QUOTE, $quote, $quote->company, 'client')->delay(now()->addSeconds(2));
         }
     }
 
@@ -53,7 +53,7 @@ class QuoteObserver
 
         if ($subscriptions) {
             $quote->load('client');
-            WebhookHandler::dispatch(Webhook::EVENT_UPDATE_QUOTE, $quote, $quote->company, 'client');
+            WebhookHandler::dispatch(Webhook::EVENT_UPDATE_QUOTE, $quote, $quote->company, 'client')->delay(now()->addSeconds(2));
         }
 
     }
@@ -72,7 +72,7 @@ class QuoteObserver
 
         if ($subscriptions) {
             $quote->load('client');
-            WebhookHandler::dispatch(Webhook::EVENT_DELETE_QUOTE, $quote, $quote->company, 'client');
+            WebhookHandler::dispatch(Webhook::EVENT_DELETE_QUOTE, $quote, $quote->company, 'client')->delay(now()->addSeconds(2));
         }
     }
 
diff --git a/app/Observers/TaskObserver.php b/app/Observers/TaskObserver.php
index 943ab483ebfa..5bfe4b43ef69 100644
--- a/app/Observers/TaskObserver.php
+++ b/app/Observers/TaskObserver.php
@@ -30,7 +30,7 @@ class TaskObserver
                         ->exists();
 
         if ($subscriptions) {
-            WebhookHandler::dispatch(Webhook::EVENT_CREATE_TASK, $task, $task->company);
+            WebhookHandler::dispatch(Webhook::EVENT_CREATE_TASK, $task, $task->company)->delay(now()->addSeconds(2));
         }
     }
 
@@ -47,7 +47,7 @@ class TaskObserver
                         ->exists();
 
         if ($subscriptions) {
-            WebhookHandler::dispatch(Webhook::EVENT_UPDATE_TASK, $task, $task->company);
+            WebhookHandler::dispatch(Webhook::EVENT_UPDATE_TASK, $task, $task->company)->delay(now()->addSeconds(2));
         }
     }
 
@@ -64,7 +64,7 @@ class TaskObserver
                         ->exists();
 
         if ($subscriptions) {
-            WebhookHandler::dispatch(Webhook::EVENT_DELETE_TASK, $task, $task->company);
+            WebhookHandler::dispatch(Webhook::EVENT_DELETE_TASK, $task, $task->company)->delay(now()->addSeconds(2));
         }
     }
 
diff --git a/app/PaymentDrivers/StripePaymentDriver.php b/app/PaymentDrivers/StripePaymentDriver.php
index 7f0537fe3503..c71f81655bc7 100644
--- a/app/PaymentDrivers/StripePaymentDriver.php
+++ b/app/PaymentDrivers/StripePaymentDriver.php
@@ -568,7 +568,7 @@ class StripePaymentDriver extends BaseDriver
 
         //payment_intent.succeeded - this will confirm or cancel the payment
         if($request->type === 'payment_intent.succeeded'){
-            PaymentIntentWebhook::dispatch($request->data, $request->company_key, $this->company_gateway->id)->delay(10);
+            PaymentIntentWebhook::dispatch($request->data, $request->company_key, $this->company_gateway->id)->delay(now()->addSeconds(10));
             return response()->json([], 200);
         }
 
diff --git a/app/Services/Ledger/LedgerService.php b/app/Services/Ledger/LedgerService.php
index 4925bcca997c..fe6d32097bf5 100644
--- a/app/Services/Ledger/LedgerService.php
+++ b/app/Services/Ledger/LedgerService.php
@@ -37,7 +37,7 @@ class LedgerService
 
         $this->entity->company_ledger()->save($company_ledger);
         
-        ClientLedgerBalanceUpdate::dispatch($this->entity->company, $this->entity->client)->delay(300);
+        ClientLedgerBalanceUpdate::dispatch($this->entity->company, $this->entity->client)->delay(now()->addSeconds(300));
 
         return $this;
     }
@@ -54,7 +54,7 @@ class LedgerService
 
         $this->entity->company_ledger()->save($company_ledger);
 
-        ClientLedgerBalanceUpdate::dispatch($this->entity->company, $this->entity->client)->delay(300);
+        ClientLedgerBalanceUpdate::dispatch($this->entity->company, $this->entity->client)->delay(now()->addSeconds(300));
 
         return $this;
     }
@@ -71,7 +71,7 @@ class LedgerService
 
         $this->entity->company_ledger()->save($company_ledger);
 
-        ClientLedgerBalanceUpdate::dispatch($this->entity->company, $this->entity->client)->delay(300);
+        ClientLedgerBalanceUpdate::dispatch($this->entity->company, $this->entity->client)->delay(now()->addSeconds(300));
 
         return $this;
     }

From 6a99cba813329ea5f17268a7408f1803975b6609 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 15 May 2022 20:43:50 +1000
Subject: [PATCH 3/5] Analytics on queue size

---
 app/Console/Kernel.php                 |  2 +
 app/DataMapper/Analytics/QueueSize.php | 79 ++++++++++++++++++++++++++
 app/Jobs/Ninja/QueueSize.php           | 48 ++++++++++++++++
 app/Mail/Engine/InvoiceEmailEngine.php |  6 +-
 app/Services/Credit/SendEmail.php      |  4 +-
 5 files changed, 135 insertions(+), 4 deletions(-)
 create mode 100644 app/DataMapper/Analytics/QueueSize.php
 create mode 100644 app/Jobs/Ninja/QueueSize.php

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 14445950b38f..b472bf3a7442 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -18,6 +18,7 @@ use App\Jobs\Cron\SubscriptionCron;
 use App\Jobs\Ledger\LedgerBalanceUpdate;
 use App\Jobs\Ninja\AdjustEmailQuota;
 use App\Jobs\Ninja\CompanySizeCheck;
+use App\Jobs\Ninja\QueueSize;
 use App\Jobs\Util\DiskCleanup;
 use App\Jobs\Util\ReminderJob;
 use App\Jobs\Util\SchedulerCheck;
@@ -56,6 +57,7 @@ class Kernel extends ConsoleKernel
         $schedule->job(new ReminderJob)->hourly()->withoutOverlapping();
 
         // $schedule->job(new LedgerBalanceUpdate)->everyFiveMinutes()->withoutOverlapping();
+        $schedule->job(new QueueSize)->everyFiveMinutes()->withoutOverlapping();
 
         $schedule->job(new CompanySizeCheck)->daily()->withoutOverlapping();
 
diff --git a/app/DataMapper/Analytics/QueueSize.php b/app/DataMapper/Analytics/QueueSize.php
new file mode 100644
index 000000000000..3266f38645e2
--- /dev/null
+++ b/app/DataMapper/Analytics/QueueSize.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\DataMapper\Analytics;
+
+use Turbo124\Beacon\ExampleMetric\GenericMixedMetric;
+
+class QueueSize extends GenericMixedMetric
+{
+
+    /**
+     * The type of Sample.
+     *
+     * Monotonically incrementing counter
+     *
+     *  - counter
+     *
+     * @var string
+     */
+    public $type = 'mixed_metric';
+
+    /**
+     * The name of the counter.
+     * @var string
+     */
+    public $name = 'ninja.queue_size';
+
+    /**
+     * The datetime of the counter measurement.
+     *
+     * date("Y-m-d H:i:s")
+     *
+     * @var DateTime
+     */
+    public $datetime;
+
+    /**
+     * The Class failure name
+     * set to 0.
+     *
+     * @var string
+     */
+    public $string_metric5 = 'stub';
+
+    /**
+     * The exception string
+     * set to 0.
+     *
+     * @var string
+     */
+    public $string_metric6 = 'stub';
+
+    /**
+     * The counter
+     * set to 1.
+     *
+     * @var string
+     */
+    public $int_metric1 = 1;
+
+    /**
+     * Company Key
+     * @var string
+     */
+    public $string_metric7 = '';
+
+    public function __construct($int_metric1) {
+        $this->int_metric1 = $int_metric1;
+    }
+    
+}
diff --git a/app/Jobs/Ninja/QueueSize.php b/app/Jobs/Ninja/QueueSize.php
new file mode 100644
index 000000000000..f5a5d6951da3
--- /dev/null
+++ b/app/Jobs/Ninja/QueueSize.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Jobs\Ninja;
+
+use App\DataMapper\Analytics\QueueSize as QueueSizeAnalytic;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Queue;
+use Turbo124\Beacon\Facades\LightLogs;
+use Turbo124\Beacon\Jobs\Database\MySQL\DbStatus;
+
+class QueueSize implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        LightLogs::create(new QueueSizeAnalytic(Queue::size()))
+         ->queue();        
+    }
+}
diff --git a/app/Mail/Engine/InvoiceEmailEngine.php b/app/Mail/Engine/InvoiceEmailEngine.php
index ad0c232489cf..8ac9f89472bb 100644
--- a/app/Mail/Engine/InvoiceEmailEngine.php
+++ b/app/Mail/Engine/InvoiceEmailEngine.php
@@ -153,10 +153,12 @@ class InvoiceEmailEngine extends BaseEmailEngine
 
             $line_items = $this->invoice->line_items;
             
-            $expense_ids = [];
 
             foreach($line_items as $item)
             {
+
+                $expense_ids = [];
+
                 if(property_exists($item, 'expense_id'))
                 {
                     $expense_ids[] = $item->expense_id;
@@ -178,7 +180,7 @@ class InvoiceEmailEngine extends BaseEmailEngine
                 }
 
                 $task_ids = [];
-                
+
                 if(property_exists($item, 'task_id'))
                 {
                     $task_ids[] = $item->task_id;
diff --git a/app/Services/Credit/SendEmail.php b/app/Services/Credit/SendEmail.php
index b62122177b69..6432aaed44f2 100644
--- a/app/Services/Credit/SendEmail.php
+++ b/app/Services/Credit/SendEmail.php
@@ -45,8 +45,8 @@ class SendEmail
 
         $this->credit->invitations->each(function ($invitation) {
             if (!$invitation->contact->trashed() && $invitation->contact->email) {
-                $email_builder = (new CreditEmail())->build($invitation, $this->reminder_template);
-
+                
+                // $email_builder = (new CreditEmail())->build($invitation, $this->reminder_template);
                 // EmailCredit::dispatchNow($email_builder, $invitation, $invitation->company);
                 EmailEntity::dispatchNow($invitation, $invitation->company, $this->reminder_template);
             }

From 7521ef4459b17974774a5fb3a26b71feada03f2f Mon Sep 17 00:00:00 2001
From: = <turbo124@gmail.com>
Date: Mon, 16 May 2022 07:41:05 +1000
Subject: [PATCH 4/5] Minor fixes for statement dates

---
 app/Services/PdfMaker/Design.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php
index 9cbb6c304889..099b4d58a520 100644
--- a/app/Services/PdfMaker/Design.php
+++ b/app/Services/PdfMaker/Design.php
@@ -226,7 +226,7 @@ class Design extends BaseDesign
     {
         if ($this->type === 'statement') {
 
-            $s_date = $this->translateDate(now()->format($this->client->company->date_format()), $this->client->date_format(), $this->client->locale());
+            $s_date = $this->translateDate(now(), $this->client->date_format(), $this->client->locale());
             
             return [
                 ['element' => 'tr', 'properties' => ['data-ref' => 'statement-label'], 'elements' => [

From 2dfe0011526f93e9b905d92c3f9e5eb4658326d2 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 16 May 2022 18:53:01 +1000
Subject: [PATCH 5/5] Fixes for reminders

---
 app/Jobs/Ledger/LedgerBalanceUpdate.php  |  2 +-
 app/Services/Invoice/AutoBillInvoice.php |  7 +++++-
 app/Services/Invoice/UpdateReminder.php  | 29 ++++++++++++++++--------
 app/Services/PdfMaker/Design.php         |  8 +++----
 tests/Feature/ReminderTest.php           | 26 +++++++++++++++++++++
 5 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/app/Jobs/Ledger/LedgerBalanceUpdate.php b/app/Jobs/Ledger/LedgerBalanceUpdate.php
index 536814e0d751..56afed59fba6 100644
--- a/app/Jobs/Ledger/LedgerBalanceUpdate.php
+++ b/app/Jobs/Ledger/LedgerBalanceUpdate.php
@@ -60,7 +60,7 @@ class LedgerBalanceUpdate implements ShouldQueue
 
         nlog("Checking ledgers....");
 
-        CompanyLedger::where('balance', 0)->cursor()->each(function ($company_ledger){
+        CompanyLedger::where('balance', 0)->where('adjustment', '!=', 0)->cursor()->each(function ($company_ledger){
 
             if($company_ledger->balance > 0)
                 return;
diff --git a/app/Services/Invoice/AutoBillInvoice.php b/app/Services/Invoice/AutoBillInvoice.php
index 0a3af59e040f..f261e62b6d33 100644
--- a/app/Services/Invoice/AutoBillInvoice.php
+++ b/app/Services/Invoice/AutoBillInvoice.php
@@ -117,6 +117,9 @@ class AutoBillInvoice extends AbstractService
 
         $payment = false;
 
+        //TODO check retries is not past threshold > 3. //return
+        // if threshold exceeded. set invoices.auto_bill_enabled = false.
+
         try{
         $payment = $gateway_token->gateway
                                  ->driver($this->client)
@@ -125,7 +128,9 @@ class AutoBillInvoice extends AbstractService
          }
          catch(\Exception $e){
             nlog("payment NOT captured for ". $this->invoice->number . " with error " . $e->getMessage());
-         //   $this->invoice->service()->removeUnpaidGatewayFees();
+            //   $this->invoice->service()->removeUnpaidGatewayFees();
+
+            //@TODO increment auto_bill_tries here
          }
 
         if($payment){
diff --git a/app/Services/Invoice/UpdateReminder.php b/app/Services/Invoice/UpdateReminder.php
index 85a011be7cd6..0b3aefea7cf7 100644
--- a/app/Services/Invoice/UpdateReminder.php
+++ b/app/Services/Invoice/UpdateReminder.php
@@ -35,7 +35,7 @@ class UpdateReminder extends AbstractService
             $this->settings = $this->invoice->client->getMergedSettings();
         }
 
-        if (! $this->invoice->isPayable()) {
+        if (! $this->invoice->isPayable() || $this->invoice->status_id == Invoice::STATUS_DRAFT) {
             $this->invoice->next_send_date = null;
             $this->invoice->saveQuietly();
 
@@ -51,7 +51,8 @@ class UpdateReminder extends AbstractService
 
         if (is_null($this->invoice->reminder1_sent) &&
             $this->settings->schedule_reminder1 == 'after_invoice_date' &&
-            $this->settings->enable_reminder1) {
+            $this->settings->enable_reminder1 &&
+            $this->settings->num_days_reminder1 != 0) {
             $reminder_date = Carbon::parse($this->invoice->date)->startOfDay()->addDays($this->settings->num_days_reminder1)->addSeconds($offset);
 
             if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)))
@@ -60,7 +61,8 @@ class UpdateReminder extends AbstractService
 
         if (is_null($this->invoice->reminder1_sent) &&
             $this->settings->schedule_reminder1 == 'before_due_date' &&
-            $this->settings->enable_reminder1) {
+            $this->settings->enable_reminder1 &&
+            $this->settings->num_days_reminder1 != 0) {
             $reminder_date = Carbon::parse($this->invoice->due_date)->startOfDay()->subDays($this->settings->num_days_reminder1)->addSeconds($offset);
 
             if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)))
@@ -69,7 +71,8 @@ class UpdateReminder extends AbstractService
 
         if (is_null($this->invoice->reminder1_sent) &&
             $this->settings->schedule_reminder1 == 'after_due_date' &&
-            $this->settings->enable_reminder1) {
+            $this->settings->enable_reminder1 &&
+            $this->settings->num_days_reminder1 != 0) {
             $reminder_date = Carbon::parse($this->invoice->due_date)->startOfDay()->addDays($this->settings->num_days_reminder1)->addSeconds($offset);
 
             if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)))
@@ -78,7 +81,8 @@ class UpdateReminder extends AbstractService
 
         if (is_null($this->invoice->reminder2_sent) &&
             $this->settings->schedule_reminder2 == 'after_invoice_date' &&
-            $this->settings->enable_reminder2) {
+            $this->settings->enable_reminder2 &&
+            $this->settings->num_days_reminder2 != 0) {
             $reminder_date = Carbon::parse($this->invoice->date)->startOfDay()->addDays($this->settings->num_days_reminder2)->addSeconds($offset);
 
             if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)))
@@ -87,7 +91,8 @@ class UpdateReminder extends AbstractService
 
         if (is_null($this->invoice->reminder2_sent) &&
             $this->settings->schedule_reminder2 == 'before_due_date' &&
-            $this->settings->enable_reminder2) {
+            $this->settings->enable_reminder2 &&
+            $this->settings->num_days_reminder2 != 0) {
             $reminder_date = Carbon::parse($this->invoice->due_date)->startOfDay()->subDays($this->settings->num_days_reminder2)->addSeconds($offset);
 
             if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)))
@@ -96,7 +101,8 @@ class UpdateReminder extends AbstractService
 
         if (is_null($this->invoice->reminder2_sent) &&
             $this->settings->schedule_reminder2 == 'after_due_date' &&
-            $this->settings->enable_reminder2) {
+            $this->settings->enable_reminder2 &&
+            $this->settings->num_days_reminder2 != 0) {
             $reminder_date = Carbon::parse($this->invoice->due_date)->startOfDay()->addDays($this->settings->num_days_reminder2)->addSeconds($offset);
 
             if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)))
@@ -105,7 +111,8 @@ class UpdateReminder extends AbstractService
 
         if (is_null($this->invoice->reminder3_sent) &&
             $this->settings->schedule_reminder3 == 'after_invoice_date' &&
-            $this->settings->enable_reminder3) {
+            $this->settings->enable_reminder3 &&
+            $this->settings->num_days_reminder3 != 0) {
             $reminder_date = Carbon::parse($this->invoice->date)->startOfDay()->addDays($this->settings->num_days_reminder3)->addSeconds($offset);
 
             if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)))
@@ -114,7 +121,8 @@ class UpdateReminder extends AbstractService
 
         if (is_null($this->invoice->reminder3_sent) &&
             $this->settings->schedule_reminder3 == 'before_due_date' &&
-            $this->settings->enable_reminder3) {
+            $this->settings->enable_reminder3 &&
+            $this->settings->num_days_reminder3 != 0) {
             $reminder_date = Carbon::parse($this->invoice->due_date)->startOfDay()->subDays($this->settings->num_days_reminder3)->addSeconds($offset);
 
             if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)))
@@ -123,7 +131,8 @@ class UpdateReminder extends AbstractService
 
         if (is_null($this->invoice->reminder3_sent) &&
             $this->settings->schedule_reminder3 == 'after_due_date' &&
-            $this->settings->enable_reminder3) {
+            $this->settings->enable_reminder3 &&
+            $this->settings->num_days_reminder3 != 0) {
             $reminder_date = Carbon::parse($this->invoice->due_date)->startOfDay()->addDays($this->settings->num_days_reminder3)->addSeconds($offset);
 
             if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)))
diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php
index 099b4d58a520..05dab3c75d21 100644
--- a/app/Services/PdfMaker/Design.php
+++ b/app/Services/PdfMaker/Design.php
@@ -391,10 +391,10 @@ class Design extends BaseDesign
             $element = ['element' => 'tr', 'elements' => []];
 
             $element['elements'][] = ['element' => 'td', 'content' => $invoice->number];
-            $element['elements'][] = ['element' => 'td', 'content' => $this->translateDate($invoice->date, $this->client->date_format(), $this->client->locale()) ?: '&nbsp;'];
-            $element['elements'][] = ['element' => 'td', 'content' => $this->translateDate($invoice->due_date, $this->client->date_format(), $this->client->locale()) ?: '&nbsp;'];
-            $element['elements'][] = ['element' => 'td', 'content' => Number::formatMoney($invoice->amount, $this->client) ?: '&nbsp;'];
-            $element['elements'][] = ['element' => 'td', 'content' => Number::formatMoney($invoice->balance, $this->client) ?: '&nbsp;'];
+            $element['elements'][] = ['element' => 'td', 'content' => $this->translateDate($invoice->date, $this->client->date_format(), $this->client->locale()) ?: ' '];
+            $element['elements'][] = ['element' => 'td', 'content' => $this->translateDate($invoice->due_date, $this->client->date_format(), $this->client->locale()) ?: ' '];
+            $element['elements'][] = ['element' => 'td', 'content' => Number::formatMoney($invoice->amount, $this->client) ?: ' '];
+            $element['elements'][] = ['element' => 'td', 'content' => Number::formatMoney($invoice->balance, $this->client) ?: ' '];
 
             $tbody[] = $element;
         }
diff --git a/tests/Feature/ReminderTest.php b/tests/Feature/ReminderTest.php
index 54cfc5cc52dd..1a2577ac92b8 100644
--- a/tests/Feature/ReminderTest.php
+++ b/tests/Feature/ReminderTest.php
@@ -169,4 +169,30 @@ class ReminderTest extends TestCase
         
     }
 
+    public function testReminderIsSet()
+    {
+        $this->invoice->next_send_date = null;
+        $this->invoice->date = now()->format('Y-m-d');
+        $this->invoice->due_date = Carbon::now()->addDays(30)->format('Y-m-d');
+        $this->invoice->save();
+
+        $settings = $this->company->settings;
+        $settings->enable_reminder1 = true;
+        $settings->schedule_reminder1 = 'after_invoice_date';
+        $settings->num_days_reminder1 = 7;
+        $settings->enable_reminder2 = true;
+        $settings->schedule_reminder2 = 'before_due_date';
+        $settings->num_days_reminder2 = 1;
+        $settings->enable_reminder3 = true;
+        $settings->schedule_reminder3 = 'after_due_date';
+        $settings->num_days_reminder3 = 1;
+
+        $this->company->settings = $settings;
+        $this->invoice = $this->invoice->service()->markSent()->save();
+        $this->invoice->service()->setReminder($settings)->save();
+
+        $this->assertNotNull($this->invoice->next_send_date);
+    }
+
+
 }