Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

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;
@@ -55,7 +56,8 @@ 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 QueueSize)->everyFiveMinutes()->withoutOverlapping();
 
         $schedule->job(new CompanySizeCheck)->daily()->withoutOverlapping();
 

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;
+    }
+    
+}

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)],
 
         ];
 

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();        
+    }
+}

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;
@@ -177,6 +179,8 @@ class InvoiceEmailEngine extends BaseEmailEngine
                                        });
                 }
 
+                $task_ids = [];
+
                 if(property_exists($item, 'task_id'))
                 {
                     $task_ids[] = $item->task_id;

app/Models/CompanyLedger.php

@@ -48,4 +48,9 @@ class CompanyLedger extends Model
     {
         return $this->morphTo();
     }
+
+    public function client()
+    {
+        return $this->belongsTo(Client::class);
+    }
 }

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

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

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

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

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

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

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

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

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

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;
     }