diff --git a/VERSION.txt b/VERSION.txt index cbfa2cc121b7..261553830a70 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.8.24 \ No newline at end of file +5.8.25 \ No newline at end of file diff --git a/app/DataProviders/Domains.php b/app/DataProviders/Domains.php index 2c6920d47311..f4c025b0b151 100644 --- a/app/DataProviders/Domains.php +++ b/app/DataProviders/Domains.php @@ -59391,7 +59391,7 @@ class Domains 'wireconnected.com' ]; - public static function getDomains() + public static function getDomains(): array { return self::$verify_domains; } diff --git a/app/Jobs/Cron/RecurringInvoicesCron.php b/app/Jobs/Cron/RecurringInvoicesCron.php index f050230efd05..0fd4e636a621 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::where('status_id', RecurringInvoice::STATUS_ACTIVE) + $recurring_invoices = RecurringInvoice::query()->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 (RecurringInvoice $recurring_invoice, $key) { + $recurring_invoices->each(function ($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/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index 2f8a9d315023..99da853cc753 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -233,7 +233,6 @@ class Import implements ShouldQueue ['name' => ctrans('texts.ready_to_do'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now(), 'status_order' => 2], ['name' => ctrans('texts.in_progress'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now(), 'status_order' => 3], ['name' => ctrans('texts.done'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now(), 'status_order' => 4], - ]; TaskStatus::insert($task_statuses); diff --git a/app/Models/RecurringExpense.php b/app/Models/RecurringExpense.php index 7d406a8be992..c46a9fffc00e 100644 --- a/app/Models/RecurringExpense.php +++ b/app/Models/RecurringExpense.php @@ -78,7 +78,6 @@ use Illuminate\Support\Carbon; * @property-read \App\Models\User $user * @property-read \App\Models\Vendor|null $vendor * @property-read \App\Models\ExpenseCategory|null $category - * @method static \Illuminate\Database\Eloquent\Builder|BaseModel company() * @method static \Illuminate\Database\Eloquent\Builder|BaseModel exclude($columns) * @method static \Database\Factories\RecurringExpenseFactory factory($count = null, $state = []) * @method static \Illuminate\Database\Eloquent\Builder|RecurringExpense filter(\App\Filters\QueryFilters $filters) diff --git a/app/Models/RecurringInvoice.php b/app/Models/RecurringInvoice.php index edf59b5b2c80..a29e9f4023b6 100644 --- a/app/Models/RecurringInvoice.php +++ b/app/Models/RecurringInvoice.php @@ -106,7 +106,6 @@ use Laracasts\Presenter\PresentableTrait; * @property-read \App\Models\Subscription|null $subscription * @property-read \App\Models\User $user * @property-read \App\Models\Vendor|null $vendor - * @method static \Illuminate\Database\Eloquent\Builder|BaseModel company() * @method static \Illuminate\Database\Eloquent\Builder|BaseModel exclude($columns) * @method static \Database\Factories\RecurringInvoiceFactory factory($count = null, $state = []) * @method static \Illuminate\Database\Eloquent\Builder|RecurringInvoice filter(\App\Filters\QueryFilters $filters) diff --git a/config/ninja.php b/config/ninja.php index 07147f9b62ae..c71db78427aa 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -17,8 +17,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => env('APP_VERSION', '5.8.24'), - 'app_tag' => env('APP_TAG', '5.8.24'), + 'app_version' => env('APP_VERSION', '5.8.25'), + 'app_tag' => env('APP_TAG', '5.8.25'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false),