Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 08:17:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9332 from turbo124/v5-develop

Browse Source 
v5.8.30
This commit is contained in:
David Bomba 2024-02-25 09:46:53 +11:00 committed by GitHub
commit 18bdeb5a99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.8.29 5.8.30

2
app/DataMapper/Tax/BaseRule.php
View File

@ -271,7 +271,7 @@ class BaseRule implements RuleInterface
public function isTaxableRegion(): bool public function isTaxableRegion(): bool
{ {
return $this->client->company->tax_data->regions->{$this->client_region}->tax_all_subregions || return $this->client->company->tax_data->regions->{$this->client_region}->tax_all_subregions ||
(property_exists($this->client->company->tax_data->regions->{$this->client_region}->subregions, $this->client_subregion) && $this->client->company->tax_data->regions->{$this->client_region}->subregions->{$this->client_subregion}->apply_tax); (property_exists($this->client->company->tax_data->regions->{$this->client_region}->subregions, $this->client_subregion) && ($this->client->company->tax_data->regions->{$this->client_region}->subregions->{$this->client_subregion}->apply_tax ?? false));
} }
public function defaultForeign(): self public function defaultForeign(): self

2
app/Filters/PaymentFilters.php
View File

@ -164,7 +164,7 @@ class PaymentFilters extends QueryFilters
{ {
$sort_col = explode('|', $sort); $sort_col = explode('|', $sort);
if (!is_array($sort_col) || count($sort_col) != 2 || !in_array($sort_col, Schema::getColumnListing('payments'))) { if (!is_array($sort_col) || count($sort_col) != 2 || !in_array($sort_col[0], Schema::getColumnListing('payments'))) {
return $this->builder; return $this->builder;
} }

2
app/Filters/UserFilters.php
View File

@ -50,7 +50,7 @@ class UserFilters extends QueryFilters
{ {
$sort_col = explode('|', $sort); $sort_col = explode('|', $sort);
if (!is_array($sort_col) || count($sort_col) != 2 || !in_array($sort_col, \Illuminate\Support\Facades\Schema::getColumnListing('users'))) { if (!is_array($sort_col) || count($sort_col) != 2 || !in_array($sort_col[0], \Illuminate\Support\Facades\Schema::getColumnListing('users'))) {
return $this->builder; return $this->builder;
} }

4
config/ninja.php
View File

@ -17,8 +17,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION', '5.8.29'), 'app_version' => env('APP_VERSION', '5.8.30'),
'app_tag' => env('APP_TAG', '5.8.29'), 'app_tag' => env('APP_TAG', '5.8.30'),
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false), 'api_secret' => env('API_SECRET', false),

2
database/migrations/2024_02_16_011055_smtp_configuration.php
View File

@ -19,7 +19,7 @@ return new class extends Migration
$table->text('smtp_username')->nullable(); $table->text('smtp_username')->nullable();
$table->text('smtp_password')->nullable(); $table->text('smtp_password')->nullable();
$table->string('smtp_local_domain')->nullable(); $table->string('smtp_local_domain')->nullable();
$table->boolean('smtp_verify_peer')->default(0); $table->boolean('smtp_verify_peer')->default(true);
}); });
} }