From adf913754211902ea4545530604bf82de4a0822c Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 24 Feb 2024 14:15:57 +1100 Subject: [PATCH 1/4] Set verify peer - default = true --- database/migrations/2024_02_16_011055_smtp_configuration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2024_02_16_011055_smtp_configuration.php b/database/migrations/2024_02_16_011055_smtp_configuration.php index 38e7ea54e5..df54821c1b 100644 --- a/database/migrations/2024_02_16_011055_smtp_configuration.php +++ b/database/migrations/2024_02_16_011055_smtp_configuration.php @@ -19,7 +19,7 @@ return new class extends Migration $table->text('smtp_username')->nullable(); $table->text('smtp_password')->nullable(); $table->string('smtp_local_domain')->nullable(); - $table->boolean('smtp_verify_peer')->default(0); + $table->boolean('smtp_verify_peer')->default(true); }); } From 9ecf49f6d5756c8253ddaaebc1c40d09a6b75542 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 24 Feb 2024 14:20:50 +1100 Subject: [PATCH 2/4] Fixes for null coalescing --- app/DataMapper/Tax/BaseRule.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/DataMapper/Tax/BaseRule.php b/app/DataMapper/Tax/BaseRule.php index ccc0d46a44..d921f20068 100644 --- a/app/DataMapper/Tax/BaseRule.php +++ b/app/DataMapper/Tax/BaseRule.php @@ -271,7 +271,7 @@ class BaseRule implements RuleInterface public function isTaxableRegion(): bool { 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 From b38ddffee95716845862b89106242642ed255501 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 25 Feb 2024 09:45:51 +1100 Subject: [PATCH 3/4] Fixes for payment filters --- app/Filters/PaymentFilters.php | 2 +- app/Filters/UserFilters.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Filters/PaymentFilters.php b/app/Filters/PaymentFilters.php index 5c0b733f93..29b596e013 100644 --- a/app/Filters/PaymentFilters.php +++ b/app/Filters/PaymentFilters.php @@ -164,7 +164,7 @@ class PaymentFilters extends QueryFilters { $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; } diff --git a/app/Filters/UserFilters.php b/app/Filters/UserFilters.php index 002562933a..7988265e32 100644 --- a/app/Filters/UserFilters.php +++ b/app/Filters/UserFilters.php @@ -50,7 +50,7 @@ class UserFilters extends QueryFilters { $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; } From 8ffedbd128625901197dfb345d87c19c30e96d56 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 25 Feb 2024 09:46:11 +1100 Subject: [PATCH 4/4] V5.8.30 --- VERSION.txt | 2 +- config/ninja.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 5f3d508817..40fdb9da29 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.8.29 \ No newline at end of file +5.8.30 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index 889e6874c0..3f9061733a 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.29'), - 'app_tag' => env('APP_TAG', '5.8.29'), + 'app_version' => env('APP_VERSION', '5.8.30'), + 'app_tag' => env('APP_TAG', '5.8.30'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false),