From 540ae8df634892ea2b6a28ac60bedbbb48e78806 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 28 Oct 2022 17:04:48 +1100 Subject: [PATCH 1/3] Fixes for restore --- app/Services/Invoice/HandleRestore.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/Invoice/HandleRestore.php b/app/Services/Invoice/HandleRestore.php index a83dddf16b..fb33536b29 100644 --- a/app/Services/Invoice/HandleRestore.php +++ b/app/Services/Invoice/HandleRestore.php @@ -81,7 +81,7 @@ class HandleRestore extends AbstractService ->where('payment_id', $payment->id) ->where('paymentable_type', '=', 'invoices') ->where('paymentable_id', $this->invoice->id) - ->update(['deleted_at' => false]); + ->update(['deleted_at' => null]); }); From bbbda3691ca00dd9369a314011c2e6ff56ce8ce3 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 29 Oct 2022 08:43:34 +1100 Subject: [PATCH 2/3] Add check for settings saver --- app/Utils/Traits/SettingsSaver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Utils/Traits/SettingsSaver.php b/app/Utils/Traits/SettingsSaver.php index e507a90677..4e6216a254 100644 --- a/app/Utils/Traits/SettingsSaver.php +++ b/app/Utils/Traits/SettingsSaver.php @@ -52,7 +52,7 @@ trait SettingsSaver continue; } /*Separate loop if it is a _id field which is an integer cast as a string*/ - elseif (substr($key, -3) == '_id' || substr($key, -14) == 'number_counter' || ($key == 'payment_terms' && strlen($settings->{$key}) >= 1) || ($key == 'valid_until' && strlen($settings->{$key}) >= 1)) { + elseif (substr($key, -3) == '_id' || substr($key, -14) == 'number_counter' || ($key == 'payment_terms' && strlen($settings->{$key}) >= 1) || ($key == 'valid_until' && property_exists($settings, $key) && strlen($settings->{$key}) >= 1)) { $value = 'integer'; if($key == 'gmail_sending_user_id' || $key == 'besr_id') From eac5a5c69f881d98f4206ee1cf2ea939185922e5 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 29 Oct 2022 08:44:00 +1100 Subject: [PATCH 3/3] v5.5.35 --- VERSION.txt | 2 +- config/ninja.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 0295ad9713..03a49a0ddb 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.5.34 \ No newline at end of file +5.5.35 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index cd01145e60..637ca998a9 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -14,8 +14,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => '5.5.34', - 'app_tag' => '5.5.34', + 'app_version' => '5.5.35', + 'app_tag' => '5.5.35', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''),