Merge pull request #7390 from turbo124/v5-stable

v5.3.83

VERSION.txt

@@ -1 +1 @@
-5.3.82
+5.3.83

app/Console/Commands/TypeCheck.php

@@ -134,7 +134,7 @@ class TypeCheck extends Command
 
         $this->logMessage(date('Y-m-d h:i:s').' Checking all clients and companies.');
 
-        Client::cursor()->each( function ($client) {
+        Client::withTrashed()->cursor()->each( function ($client) {
             $this->logMessage("Checking client {$client->id}");
             $entity_settings = $this->checkSettingType($client->settings);
             $entity_settings->md5 = md5(time());

app/Factory/RecurringInvoiceFactory.php

@@ -50,6 +50,8 @@ class RecurringInvoiceFactory
         $invoice->next_send_date = null;
         $invoice->remaining_cycles = -1;
         $invoice->paid_to_date = 0;
+        $invoice->auto_bill_enabled = false;
+        $invoice->auto_bill = 'off';
 
         return $invoice;
     }

app/Filters/ClientFilters.php

@@ -57,10 +57,13 @@ class ClientFilters extends QueryFilters
     {
         $parts = explode(':', $balance);
 
+        if(!is_array($parts))
+            return $this->builder;
+
         return $this->builder->whereBetween('balance', [$parts[0], $parts[1]]);
     }
 
-    public function email(string $email):Builder
+    public function email(string $email = ''):Builder
     {
         return
 

app/Http/Controllers/PreviewController.php

@@ -97,6 +97,7 @@ class PreviewController extends BaseController
             ! empty(request()->input('entity')) &&
             ! empty(request()->input('entity_id')) &&
             request()->has('body')) {
+            
             $design_object = json_decode(json_encode(request()->input('design')));
 
             if (! is_object($design_object)) {

app/Http/Controllers/SelfUpdateController.php

@@ -12,7 +12,9 @@
 namespace App\Http\Controllers;
 
 use App\Exceptions\FilePermissionsFailure;
+use App\Models\Client;
 use App\Utils\Ninja;
+use App\Utils\Traits\ClientGroupSettingsSaver;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Storage;
@@ -20,6 +22,7 @@ use Illuminate\Support\Facades\Storage;
 class SelfUpdateController extends BaseController
 {
     use DispatchesJobs;
+    use ClientGroupSettingsSaver;
 
     private array $purge_file_list = [
         'bootstrap/cache/compiled.php',
@@ -141,6 +144,20 @@ class SelfUpdateController extends BaseController
 
     }
 
+    private function postHookUpdate()
+    {
+        if(config('ninja.app_version') == '5.3.82')
+        {
+            Client::withTrashed()->cursor()->each( function ($client) {
+                $entity_settings = $this->checkSettingType($client->settings);
+                $entity_settings->md5 = md5(time());
+                $client->settings = $entity_settings;
+                $client->save();
+                
+            });
+        }
+    }
+
     private function testWritable()
     {
         $directoryIterator = new \RecursiveDirectoryIterator(base_path(), \RecursiveDirectoryIterator::SKIP_DOTS);

app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php

@@ -164,13 +164,13 @@ class AuthorizePaymentMethod
         if ($contact) {
             // Create the Bill To info for new payment type
             $billto = new CustomerAddressType();
-            $billto->setFirstName(substr(0,50,$contact->present()->first_name()));
-            $billto->setLastName(substr(0,50,$contact->present()->last_name()));
-            $billto->setCompany(substr(0,50,$this->authorize->client->present()->name()));
-            $billto->setAddress(substr(0,60,$this->authorize->client->address1));
-            $billto->setCity(substr(0,40,$this->authorize->client->city));
-            $billto->setState(substr(0,40,$this->authorize->client->state));
-            $billto->setZip(substr(0,20,$this->authorize->client->postal_code));
+            $billto->setFirstName(substr($contact->present()->first_name(),0,50));
+            $billto->setLastName(substr($contact->present()->last_name(),0,50));
+            $billto->setCompany(substr($this->authorize->client->present()->name(),0,50));
+            $billto->setAddress(substr($this->authorize->client->address1,0,60));
+            $billto->setCity(substr($this->authorize->client->city,0,40));
+            $billto->setState(substr($this->authorize->client->state,0,40));
+            $billto->setZip(substr($this->authorize->client->postal_code,0,20));
 
             if ($this->authorize->client->country_id) {
                 $billto->setCountry($this->authorize->client->country->name);

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.3.82',
-    'app_tag' => '5.3.82',
+    'app_version' => '5.3.83',
+    'app_tag' => '5.3.83',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),

database/migrations/2022_04_22_115838_client_settings_parse_for_types.php

@@ -23,7 +23,7 @@ class ClientSettingsParseForTypes extends Migration
         if(Ninja::isSelfHost())
         {
 
-            Client::cursor()->each( function ($client) {
+            Client::withTrashed()->cursor()->each( function ($client) {
                 $entity_settings = $this->checkSettingType($client->settings);
                 $entity_settings->md5 = md5(time());
                 $client->settings = $entity_settings;
@@ -31,7 +31,6 @@ class ClientSettingsParseForTypes extends Migration
                 
             });
 
-
         }
     }
 

public/flutter_service_worker.js

@@ -3,8 +3,8 @@ const MANIFEST = 'flutter-app-manifest';
 const TEMP = 'flutter-temp-cache';
 const CACHE_NAME = 'flutter-app-cache';
 const RESOURCES = {
-  "main.dart.js": "895b4896a670fcbc9996783d79fa4c8b",
-"/": "c03cfe19a48dcd9ed80698d608a5745a",
+  "main.dart.js": "6d052e2fe47482bbfea552235cfc5a18",
+"/": "e723e8a61f771fed887c7c05674883e9",
 "favicon.png": "dca91c54388f52eded692718d5a98b8b",
 "assets/fonts/MaterialIcons-Regular.otf": "7e7a6cccddf6d7b20012a548461d5d81",
 "assets/AssetManifest.json": "38d9aea341601f3a5c6fa7b5a1216ea5",