diff --git a/app/Jobs/Cron/RecurringInvoicesCron.php b/app/Jobs/Cron/RecurringInvoicesCron.php index 0fd4e636a621..f050230efd05 100644 --- a/app/Jobs/Cron/RecurringInvoicesCron.php +++ b/app/Jobs/Cron/RecurringInvoicesCron.php @@ -48,7 +48,7 @@ class RecurringInvoicesCron Auth::logout(); if (! config('ninja.db.multi_db_enabled')) { - $recurring_invoices = RecurringInvoice::query()->where('status_id', RecurringInvoice::STATUS_ACTIVE) + $recurring_invoices = RecurringInvoice::where('status_id', RecurringInvoice::STATUS_ACTIVE) ->where('is_deleted', false) ->where('remaining_cycles', '!=', '0') ->whereNotNull('next_send_date') @@ -66,7 +66,7 @@ class RecurringInvoicesCron nlog(now()->format('Y-m-d').' Sending Recurring Invoices. Count = '.$recurring_invoices->count()); - $recurring_invoices->each(function ($recurring_invoice, $key) { + $recurring_invoices->each(function (RecurringInvoice $recurring_invoice, $key) { // nlog('Current date = '.now()->format('Y-m-d').' Recurring date = '.$recurring_invoice->next_send_date); nlog("Trying to send {$recurring_invoice->number}"); diff --git a/app/Models/RecurringExpense.php b/app/Models/RecurringExpense.php index eaf284ecddc9..7d406a8be992 100644 --- a/app/Models/RecurringExpense.php +++ b/app/Models/RecurringExpense.php @@ -141,7 +141,6 @@ use Illuminate\Support\Carbon; * @method static \Illuminate\Database\Eloquent\Builder|RecurringExpense withTrashed() * @method static \Illuminate\Database\Eloquent\Builder|RecurringExpense withoutTrashed() * @property-read \Illuminate\Database\Eloquent\Collection $documents - * @method static \Illuminate\Database\Eloquent\Builder|BaseModel company() * @mixin \Eloquent */ class RecurringExpense extends BaseModel @@ -223,7 +222,7 @@ class RecurringExpense extends BaseModel return $this->belongsTo(User::class, 'assigned_user_id', 'id'); } - public function company() + public function company():\Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(Company::class); } diff --git a/app/Models/RecurringInvoice.php b/app/Models/RecurringInvoice.php index 4d3dabf157db..edf59b5b2c80 100644 --- a/app/Models/RecurringInvoice.php +++ b/app/Models/RecurringInvoice.php @@ -294,10 +294,7 @@ class RecurringInvoice extends BaseModel return $this->hasManyThrough(Backup::class, Activity::class); } - /** - * @return \Illuminate\Database\Eloquent\Relations\BelongsTo - */ - public function company() + public function company(): \Illuminate\Database\Eloquent\Relations\BelongsTo { return $this->belongsTo(Company::class); }