Merge pull request #7902 from turbo124/v5-stable

v5.5.35

VERSION.txt

@@ -1 +1 @@
-5.5.34
+5.5.35

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]);
 
         });
 

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')

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', ''),