diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 468c791745a8..5bf89ecafa62 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.1
           extensions: mysql, mysqlnd, sqlite3, bcmath, gd, curl, zip, openssl, mbstring, xml
 
       - name: Checkout code
@@ -50,7 +50,7 @@ jobs:
           cd ..
           rm -rf ui
           php artisan ninja:react
-          
+
       - name: Prepare JS/CSS assets
         run: |
           npm i
diff --git a/.gitignore b/.gitignore
index 807279c6ceeb..460032ba1b89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 /public/storage
 /public/react
 /storage/*.key
+/storage/debugbar
 /vendor
 /.idea
 /.vscode
diff --git a/VERSION.txt b/VERSION.txt
index 35986ea71677..32b0e1eace3c 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.4.12
\ No newline at end of file
+5.5.8
\ No newline at end of file
diff --git a/app/Console/Commands/BackupUpdate.php b/app/Console/Commands/BackupUpdate.php
index 33f8b3d6abe8..fcd1e6fa04d5 100644
--- a/app/Console/Commands/BackupUpdate.php
+++ b/app/Console/Commands/BackupUpdate.php
@@ -66,39 +66,25 @@ class BackupUpdate extends Command
                 $this->handleOnDb();
             }
 
-        MultiDB::setDB($current_db);
-        
+            MultiDB::setDB($current_db);
         }
-
-
     }
 
     private function handleOnDb()
     {
         set_time_limit(0);
-        
-        Backup::whereHas('activity')->whereRaw('html_backup IS NOT NULL')->cursor()->each( function ($backup) {
 
-                
-                if(strlen($backup->html_backup) > 1 && $backup->activity->invoice->exists()){
-
-                    $client = $backup->activity->invoice->client;
-                    $backup->storeRemotely($backup->html_backup, $client);
-
-                }else if(strlen($backup->html_backup) > 1 && $backup->activity->quote->exists()){
-
-                    $client = $backup->activity->quote->client;
-                    $backup->storeRemotely($backup->html_backup, $client);
-
-                }else if(strlen($backup->html_backup) > 1 && $backup->activity->credit->exists()){
-
-                    $client = $backup->activity->credit->client;
-                    $backup->storeRemotely($backup->html_backup, $client);
-
-                }
-
-            
+        Backup::whereHas('activity')->whereRaw('html_backup IS NOT NULL')->cursor()->each(function ($backup) {
+            if (strlen($backup->html_backup) > 1 && $backup->activity->invoice->exists()) {
+                $client = $backup->activity->invoice->client;
+                $backup->storeRemotely($backup->html_backup, $client);
+            } elseif (strlen($backup->html_backup) > 1 && $backup->activity->quote->exists()) {
+                $client = $backup->activity->quote->client;
+                $backup->storeRemotely($backup->html_backup, $client);
+            } elseif (strlen($backup->html_backup) > 1 && $backup->activity->credit->exists()) {
+                $client = $backup->activity->credit->client;
+                $backup->storeRemotely($backup->html_backup, $client);
+            }
         });
-
     }
 }
diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index 848e347a4359..80ff44a1329f 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -12,6 +12,7 @@
 namespace App\Console\Commands;
 
 use App;
+use App\DataMapper\ClientSettings;
 use App\Factory\ClientContactFactory;
 use App\Factory\VendorContactFactory;
 use App\Models\Account;
@@ -126,7 +127,7 @@ class CheckData extends Command
 
         $errorEmail = config('ninja.error_email');
 
-        if ($errorEmail) {
+        if (strlen($errorEmail) > 1) {
             Mail::raw($this->log, function ($message) use ($errorEmail, $database) {
                 $message->to($errorEmail)
                         ->from(config('mail.from.address'), config('mail.from.name'))
@@ -893,6 +894,45 @@ class CheckData extends Command
         });
     }
 
+
+    public function checkClientSettings()
+    {
+
+        if ($this->option('fix') == 'true') {
+
+            Client::query()->whereNull('settings->currency_id')->cursor()->each(function ($client){
+
+                if(is_array($client->settings) && count($client->settings) == 0)
+                {
+                    $settings = ClientSettings::defaults();
+                    $settings->currency_id = $client->company->settings->currency_id;
+                }
+                else {
+                    $settings = $client->settings;
+                    $settings->currency_id = $client->company->settings->currency_id;
+                }
+
+                $client->settings = $settings;
+                $client->save();
+
+                $this->logMessage("Fixing currency for # {$client->id}");
+
+            });
+
+
+            Client::query()->whereNull('country_id')->cursor()->each(function ($client){
+
+                $client->country_id = $client->company->settings->country_id;
+                $client->save();
+
+                $this->logMessage("Fixing country for # {$client->id}");
+
+            });
+
+        }
+
+    }
+
     public function checkBalanceVsPaidStatus()
     {
         $this->wrong_paid_status = 0;
diff --git a/app/Console/Commands/CheckDb.php b/app/Console/Commands/CheckDb.php
index b626e193c646..5f8fd0a1a0f9 100644
--- a/app/Console/Commands/CheckDb.php
+++ b/app/Console/Commands/CheckDb.php
@@ -36,8 +36,8 @@ use App\Models\GroupSetting;
 use App\Models\Invoice;
 use App\Models\InvoiceInvitation;
 use App\Models\Payment;
-use App\Models\PaymentHash;
 use App\Models\Paymentable;
+use App\Models\PaymentHash;
 use App\Models\Product;
 use App\Models\Project;
 use App\Models\Quote;
@@ -61,13 +61,11 @@ use Illuminate\Support\Str;
 use Mail;
 use Symfony\Component\Console\Input\InputOption;
 
-
 /**
  * Class CheckDb.
  */
 class CheckDb extends Command
 {
-
     protected $signature = 'ninja:check-db';
 
     protected $description = 'Check MultiDB';
@@ -118,33 +116,30 @@ class CheckDb extends Command
 
     public function handle()
     {
+        $this->LogMessage('Checking - V5_DB1');
 
-        $this->LogMessage("Checking - V5_DB1");
-
-        foreach($this->entities as $entity) {
-            
+        foreach ($this->entities as $entity) {
             $count_db_1 = $entity::on('db-ninja-01')->count();
             $count_db_2 = $entity::on('db-ninja-02a')->count();
 
             $diff = $count_db_1 - $count_db_2;
 
-            if($diff != 0)
+            if ($diff != 0) {
                 $this->logMessage("{$entity} DB1: {$count_db_1} - DB2: {$count_db_2} - diff = {$diff}");
-
+            }
         }
 
-        $this->LogMessage("Checking - V5_DB2");
-
-        foreach($this->entities as $entity) {
+        $this->LogMessage('Checking - V5_DB2');
 
+        foreach ($this->entities as $entity) {
             $count_db_1 = $entity::on('db-ninja-02')->count();
             $count_db_2 = $entity::on('db-ninja-01a')->count();
 
             $diff = $count_db_1 - $count_db_2;
 
-            if($diff != 0)
+            if ($diff != 0) {
                 $this->logMessage("{$entity} DB1: {$count_db_1} - DB2: {$count_db_2} - diff = {$diff}");
-
+            }
         }
     }
 
@@ -154,5 +149,4 @@ class CheckDb extends Command
         $this->info($str);
         $this->log .= $str."\n";
     }
-
 }
diff --git a/app/Console/Commands/CreateAccount.php b/app/Console/Commands/CreateAccount.php
index 0def06c5d5bd..c0eaed16bc59 100644
--- a/app/Console/Commands/CreateAccount.php
+++ b/app/Console/Commands/CreateAccount.php
@@ -51,10 +51,12 @@ use Illuminate\Support\Str;
 class CreateAccount extends Command
 {
     use MakesHash, GeneratesCounter;
+
     /**
      * @var string
      */
     protected $description = 'Create Single Account';
+
     /**
      * @var string
      */
@@ -82,12 +84,10 @@ class CreateAccount extends Command
         $this->warmCache();
 
         $this->createAccount();
-
     }
 
     private function createAccount()
     {
-
         $account = Account::factory()->create();
         $company = Company::factory()->create([
             'account_id' => $account->id,
@@ -131,10 +131,9 @@ class CreateAccount extends Command
             'settings' => null,
         ]);
 
-        CreateCompanyPaymentTerms::dispatchNow($company, $user);
-        CreateCompanyTaskStatuses::dispatchNow($company, $user);
-        VersionCheck::dispatchNow();
-
+        (new CreateCompanyPaymentTerms($company, $user))->handle();
+        (new CreateCompanyTaskStatuses($company, $user))->handle();
+        (new VersionCheck())->handle();
     }
 
     private function warmCache()
@@ -164,5 +163,4 @@ class CreateAccount extends Command
             }
         }
     }
-
 }
diff --git a/app/Console/Commands/CreateTestData.php b/app/Console/Commands/CreateTestData.php
index ecd6ab2018f3..866c3588ccfe 100644
--- a/app/Console/Commands/CreateTestData.php
+++ b/app/Console/Commands/CreateTestData.php
@@ -48,10 +48,12 @@ use Illuminate\Support\Str;
 class CreateTestData extends Command
 {
     use MakesHash, GeneratesCounter;
+
     /**
      * @var string
      */
     protected $description = 'Create Test Data';
+
     /**
      * @var string
      */
@@ -66,14 +68,16 @@ class CreateTestData extends Command
      */
     public function handle()
     {
-        if(config('ninja.is_docker'))
+        if (config('ninja.is_docker')) {
             return;
+        }
 
-    if (!$this->confirm('Are you sure you want to inject dummy data?'))
-        return;
+        if (! $this->confirm('Are you sure you want to inject dummy data?')) {
+            return;
+        }
 
         $this->invoice_repo = new InvoiceRepository();
-        
+
         $this->info(date('r').' Running CreateTestData...');
         $this->count = $this->argument('count');
 
@@ -125,14 +129,14 @@ class CreateTestData extends Command
             'is_admin' => 1,
             'is_locked' => 0,
             'notifications' => CompanySettings::notificationDefaults(),
-           // 'permissions' => '',
+            // 'permissions' => '',
             'settings' => null,
         ]);
 
         Product::factory()->count(50)->create([
-                'user_id' => $user->id,
-                'company_id' => $company->id,
-            ]);
+            'user_id' => $user->id,
+            'company_id' => $company->id,
+        ]);
 
         $this->info('Creating '.$this->count.' clients');
 
@@ -219,15 +223,14 @@ class CreateTestData extends Command
             'is_admin' => 1,
             'is_locked' => 0,
             'notifications' => CompanySettings::notificationDefaults(),
-         //   'permissions' => '',
+            //   'permissions' => '',
             'settings' => null,
         ]);
 
         Product::factory()->count(50)->create([
-                'user_id' => $user->id,
-                'company_id' => $company->id,
-            ]);
-
+            'user_id' => $user->id,
+            'company_id' => $company->id,
+        ]);
 
         $this->count = $this->count * 10;
 
@@ -317,14 +320,14 @@ class CreateTestData extends Command
             'is_admin' => 1,
             'is_locked' => 0,
             'notifications' => CompanySettings::notificationDefaults(),
-         //   'permissions' => '',
+            //   'permissions' => '',
             'settings' => null,
         ]);
 
         Product::factory()->count(15000)->create([
-                'user_id' => $user->id,
-                'company_id' => $company->id,
-            ]);
+            'user_id' => $user->id,
+            'company_id' => $company->id,
+        ]);
 
         $this->count = $this->count * 10;
 
@@ -382,30 +385,29 @@ class CreateTestData extends Command
 
         // });
         $client = Client::factory()->create([
-                'user_id' => $user->id,
-                'company_id' => $company->id,
-            ]);
-
+            'user_id' => $user->id,
+            'company_id' => $company->id,
+        ]);
 
         Document::factory()->count(50)->create([
-                'user_id' => $user->id,
-                'company_id' => $company->id,
-                'documentable_type' => Client::class,
-                'documentable_id' => $client->id
-            ]);
+            'user_id' => $user->id,
+            'company_id' => $company->id,
+            'documentable_type' => Client::class,
+            'documentable_id' => $client->id,
+        ]);
 
         ClientContact::factory()->create([
-                    'user_id' => $user->id,
-                    'client_id' => $client->id,
-                    'company_id' => $company->id,
-                    'is_primary' => 1,
-                ]);
+            'user_id' => $user->id,
+            'client_id' => $client->id,
+            'company_id' => $company->id,
+            'is_primary' => 1,
+        ]);
 
         ClientContact::factory()->count(rand(1, 5))->create([
-                    'user_id' => $user->id,
-                    'client_id' => $client->id,
-                    'company_id' => $company->id,
-                ]);
+            'user_id' => $user->id,
+            'client_id' => $client->id,
+            'company_id' => $company->id,
+        ]);
 
         $client->number = $this->getNextClientNumber($client);
 
@@ -422,70 +424,69 @@ class CreateTestData extends Command
     private function createExpense($client)
     {
         Expense::factory()->count(rand(1, 5))->create([
-                'user_id' => $client->user->id,
-                'client_id' => $client->id,
-                'company_id' => $client->company->id,
-            ]);
+            'user_id' => $client->user->id,
+            'client_id' => $client->id,
+            'company_id' => $client->company->id,
+        ]);
     }
 
     private function createVendor($client)
     {
         $vendor = Vendor::factory()->create([
-                'user_id' => $client->user->id,
-                'company_id' => $client->company->id,
-            ]);
+            'user_id' => $client->user->id,
+            'company_id' => $client->company->id,
+        ]);
 
         Document::factory()->count(50)->create([
-                'user_id' => $client->user->id,
-                'company_id' => $client->company_id,
-                'documentable_type' => Vendor::class,
-                'documentable_id' => $vendor->id
-            ]);
+            'user_id' => $client->user->id,
+            'company_id' => $client->company_id,
+            'documentable_type' => Vendor::class,
+            'documentable_id' => $vendor->id,
+        ]);
 
         VendorContact::factory()->create([
-                'user_id' => $client->user->id,
-                'vendor_id' => $vendor->id,
-                'company_id' => $client->company->id,
-                'is_primary' => 1,
-            ]);
+            'user_id' => $client->user->id,
+            'vendor_id' => $vendor->id,
+            'company_id' => $client->company->id,
+            'is_primary' => 1,
+        ]);
 
         VendorContact::factory()->count(rand(1, 5))->create([
-                'user_id' => $client->user->id,
-                'vendor_id' => $vendor->id,
-                'company_id' => $client->company->id,
-                'is_primary' => 0,
-            ]);
+            'user_id' => $client->user->id,
+            'vendor_id' => $vendor->id,
+            'company_id' => $client->company->id,
+            'is_primary' => 0,
+        ]);
     }
 
     private function createTask($client)
     {
         $vendor = Task::factory()->create([
-                'user_id' => $client->user->id,
-                'company_id' => $client->company->id,
-            ]);
-
+            'user_id' => $client->user->id,
+            'company_id' => $client->company->id,
+        ]);
 
         Document::factory()->count(5)->create([
-                'user_id' => $client->user->id,
-                'company_id' => $client->company_id,
-                'documentable_type' => Task::class,
-                'documentable_id' => $vendor->id
-            ]);
+            'user_id' => $client->user->id,
+            'company_id' => $client->company_id,
+            'documentable_type' => Task::class,
+            'documentable_id' => $vendor->id,
+        ]);
     }
 
     private function createProject($client)
     {
         $vendor = Project::factory()->create([
-                'user_id' => $client->user->id,
-                'company_id' => $client->company->id,
-            ]);
+            'user_id' => $client->user->id,
+            'company_id' => $client->company->id,
+        ]);
 
-            Document::factory()->count(5)->create([
-                'user_id' => $client->user->id,
-                'company_id' => $client->company_id,
-                'documentable_type' => Project::class,
-                'documentable_id' => $vendor->id
-            ]);
+        Document::factory()->count(5)->create([
+            'user_id' => $client->user->id,
+            'company_id' => $client->company_id,
+            'documentable_type' => Project::class,
+            'documentable_id' => $vendor->id,
+        ]);
     }
 
     private function createInvoice($client)
@@ -516,7 +517,7 @@ class CreateTestData extends Command
             $invoice->tax_rate3 = 5;
         }
 
-        $invoice->custom_value1 = $faker->date;
+        $invoice->custom_value1 = $faker->date();
         $invoice->custom_value2 = rand(0, 1) ? 'yes' : 'no';
 
         $invoice->save();
@@ -537,16 +538,15 @@ class CreateTestData extends Command
             $invoice = $invoice->service()->markPaid()->save();
         }
 
-            Document::factory()->count(5)->create([
-                'user_id' => $invoice->user->id,
-                'company_id' => $invoice->company_id,
-                'documentable_type' => Invoice::class,
-                'documentable_id' => $invoice->id
-            ]);
+        Document::factory()->count(5)->create([
+            'user_id' => $invoice->user->id,
+            'company_id' => $invoice->company_id,
+            'documentable_type' => Invoice::class,
+            'documentable_id' => $invoice->id,
+        ]);
 
         RecurringInvoice::factory()->create(['user_id' => $invoice->user->id, 'company_id' => $invoice->company->id, 'client_id' => $invoice->client_id]);
 
-
         event(new InvoiceWasCreated($invoice, $invoice->company, Ninja::eventVars()));
     }
 
diff --git a/app/Console/Commands/DemoMode.php b/app/Console/Commands/DemoMode.php
index bbb24e2a89db..8a5864a6440a 100644
--- a/app/Console/Commands/DemoMode.php
+++ b/app/Console/Commands/DemoMode.php
@@ -73,8 +73,9 @@ class DemoMode extends Command
     {
         set_time_limit(0);
 
-        if(config('ninja.is_docker'))
+        if (config('ninja.is_docker')) {
             return;
+        }
 
         $this->invoice_repo = new InvoiceRepository();
 
@@ -111,9 +112,9 @@ class DemoMode extends Command
         $this->info('Seeding Random Data');
         $this->createSmallAccount();
 
-        VersionCheck::dispatchNow();
+        (new VersionCheck())->handle();
 
-        CompanySizeCheck::dispatchNow();
+        (new CompanySizeCheck())->handle();
     }
 
     private function createSmallAccount()
@@ -136,15 +137,15 @@ class DemoMode extends Command
 
         $settings = $company->settings;
 
-        $settings->name = $faker->company;
-        $settings->address1 = $faker->buildingNumber;
-        $settings->address2 = $faker->streetAddress;
-        $settings->city = $faker->city;
-        $settings->state = $faker->state;
-        $settings->postal_code = $faker->postcode;
-        $settings->website = $faker->url;
+        $settings->name = $faker->company();
+        $settings->address1 = $faker->buildingNumber();
+        $settings->address2 = $faker->streetAddress();
+        $settings->city = $faker->city();
+        $settings->state = $faker->state();
+        $settings->postal_code = $faker->postcode();
+        $settings->website = $faker->url();
         $settings->vat_number = (string) $faker->numberBetween(123456789, 987654321);
-        $settings->phone = (string) $faker->phoneNumber;
+        $settings->phone = (string) $faker->phoneNumber();
 
         $company->settings = $settings;
         $company->save();
@@ -163,8 +164,8 @@ class DemoMode extends Command
             ]);
         }
 
-        CreateCompanyPaymentTerms::dispatchNow($company, $user);
-        CreateCompanyTaskStatuses::dispatchNow($company, $user);
+        (new CreateCompanyPaymentTerms($company, $user))->handle();
+        (new CreateCompanyTaskStatuses($company, $user))->handle();
 
         $company_token = new CompanyToken;
         $company_token->user_id = $user->id;
@@ -182,7 +183,7 @@ class DemoMode extends Command
             'is_admin' => 1,
             'is_locked' => 0,
             'notifications' => CompanySettings::notificationDefaults(),
-           // 'permissions' => '',
+            // 'permissions' => '',
             'settings' => null,
         ]);
 
@@ -217,9 +218,9 @@ class DemoMode extends Command
         }
 
         Product::factory()->count(50)->create([
-                'user_id' => $user->id,
-                'company_id' => $company->id,
-            ]);
+            'user_id' => $user->id,
+            'company_id' => $company->id,
+        ]);
 
         $this->info('Creating '.$this->count.' clients');
 
@@ -265,22 +266,22 @@ class DemoMode extends Command
 
         // });
         $client = Client::factory()->create([
-                'user_id' => $user->id,
-                'company_id' => $company->id,
-            ]);
+            'user_id' => $user->id,
+            'company_id' => $company->id,
+        ]);
 
         ClientContact::factory()->create([
-                    'user_id' => $user->id,
-                    'client_id' => $client->id,
-                    'company_id' => $company->id,
-                    'is_primary' => 1,
-                ]);
+            'user_id' => $user->id,
+            'client_id' => $client->id,
+            'company_id' => $company->id,
+            'is_primary' => 1,
+        ]);
 
         ClientContact::factory()->count(rand(1, 5))->create([
-                    'user_id' => $user->id,
-                    'client_id' => $client->id,
-                    'company_id' => $company->id,
-                ]);
+            'user_id' => $user->id,
+            'client_id' => $client->id,
+            'company_id' => $company->id,
+        ]);
 
         $client->number = $this->getNextClientNumber($client);
 
@@ -299,41 +300,37 @@ class DemoMode extends Command
     private function createExpense($client)
     {
         Expense::factory()->count(rand(1, 5))->create([
-                'user_id' => $client->user_id,
-                'client_id' => $client->id,
-                'company_id' => $client->company_id,
-            ]);
-
-        Expense::all()->each(function ($expense){
+            'user_id' => $client->user_id,
+            'client_id' => $client->id,
+            'company_id' => $client->company_id,
+        ]);
 
+        Expense::all()->each(function ($expense) {
             $expense->number = $this->getNextExpenseNumber($expense);
             $expense->save();
-
         });
-        
     }
 
     private function createVendor($client, $assigned_user_id = null)
     {
         $vendor = Vendor::factory()->create([
-                'user_id' => $client->user_id,
-                'company_id' => $client->company_id,
-            ]);
+            'user_id' => $client->user_id,
+            'company_id' => $client->company_id,
+        ]);
 
         VendorContact::factory()->create([
-                'user_id' => $client->user->id,
-                'vendor_id' => $vendor->id,
-                'company_id' => $client->company_id,
-                'is_primary' => 1,
-            ]);
+            'user_id' => $client->user->id,
+            'vendor_id' => $vendor->id,
+            'company_id' => $client->company_id,
+            'is_primary' => 1,
+        ]);
 
         VendorContact::factory()->count(rand(1, 5))->create([
-                'user_id' => $client->user->id,
-                'vendor_id' => $vendor->id,
-                'company_id' => $client->company_id,
-                'is_primary' => 0,
-            ]);
-
+            'user_id' => $client->user->id,
+            'vendor_id' => $vendor->id,
+            'company_id' => $client->company_id,
+            'is_primary' => 0,
+        ]);
 
         $vendor->number = $this->getNextVendorNumber($vendor);
         $vendor->save();
@@ -342,25 +339,24 @@ class DemoMode extends Command
     private function createTask($client, $assigned_user_id = null)
     {
         $task = Task::factory()->create([
-                'user_id' => $client->user->id,
-                'company_id' => $client->company_id,
-                'client_id' => $client->id
-            ]);
+            'user_id' => $client->user->id,
+            'company_id' => $client->company_id,
+            'client_id' => $client->id,
+        ]);
 
         $task->status_id = TaskStatus::all()->random()->id;
 
         $task->number = $this->getNextTaskNumber($task);
         $task->save();
-
     }
 
     private function createProject($client, $assigned_user_id = null)
     {
         $project = Project::factory()->create([
-                'user_id' => $client->user->id,
-                'company_id' => $client->company_id,
-                'client_id' => $client->id,
-            ]);
+            'user_id' => $client->user->id,
+            'company_id' => $client->company_id,
+            'client_id' => $client->id,
+        ]);
 
         $project->number = $this->getNextProjectNumber($project);
         $project->save();
@@ -399,7 +395,7 @@ class DemoMode extends Command
         //     $invoice->tax_rate3 = 5;
         // }
 
-        // $invoice->custom_value1 = $faker->date;
+        // $invoice->custom_value1 = $faker->date();
         // $invoice->custom_value2 = rand(0, 1) ? 'yes' : 'no';
 
         $invoice->save();
@@ -466,7 +462,7 @@ class DemoMode extends Command
         //     $invoice->tax_rate3 = 5;
         // }
 
-        // $invoice->custom_value1 = $faker->date;
+        // $invoice->custom_value1 = $faker->date();
         // $invoice->custom_value2 = rand(0, 1) ? 'yes' : 'no';
 
         $invoice->save();
diff --git a/app/Console/Commands/DesignUpdate.php b/app/Console/Commands/DesignUpdate.php
index cada484be4bb..caccb3bd7c42 100644
--- a/app/Console/Commands/DesignUpdate.php
+++ b/app/Console/Commands/DesignUpdate.php
@@ -64,11 +64,8 @@ class DesignUpdate extends Command
                 $this->handleOnDb($db);
             }
 
-        MultiDB::setDB($current_db);
-        
+            MultiDB::setDB($current_db);
         }
-
-
     }
 
     private function handleOnDb()
diff --git a/app/Console/Commands/HostedMigrations.php b/app/Console/Commands/HostedMigrations.php
index e8540a9c4431..0e303129a7ec 100644
--- a/app/Console/Commands/HostedMigrations.php
+++ b/app/Console/Commands/HostedMigrations.php
@@ -71,26 +71,27 @@ class HostedMigrations extends Command
     public function handle()
     {
         $this->buildCache();
-    
-        if(!MultiDB::userFindAndSetDb($this->option('email'))){
-            $this->info("Could not find a user with that email address");
+
+        if (! MultiDB::userFindAndSetDb($this->option('email'))) {
+            $this->info('Could not find a user with that email address');
+
             return;
         }
 
         $user = User::where('email', $this->option('email'))->first();
 
-        if(!$user){
-            $this->info("There was a problem getting the user, did you set the right DB?");
+        if (! $user) {
+            $this->info('There was a problem getting the user, did you set the right DB?');
+
             return;
         }
 
         $path = public_path('storage/migrations/import');
-        
+
         $directory = new DirectoryIterator($path);
 
         foreach ($directory as $file) {
             if ($file->getExtension() === 'zip') {
-
                 $company = $user->companies()->first();
 
                 $this->info('Started processing: '.$file->getBasename().' at '.now());
@@ -104,14 +105,13 @@ class HostedMigrations extends Command
                     }
 
                     $filename = pathinfo($file->getRealPath(), PATHINFO_FILENAME);
-                        
+
                     $zip->extractTo(public_path("storage/migrations/{$filename}"));
                     $zip->close();
 
                     $import_file = public_path("storage/migrations/$filename/migration.json");
 
                     Import::dispatch($import_file, $user->companies()->first(), $user);
-
                 } catch (NonExistingMigrationFile | ProcessingMigrationArchiveFailed | ResourceNotAvailableForMigration | MigrationValidatorFailed | ResourceDependencyMissing $e) {
                     \Mail::to($this->user)->send(new MigrationFailed($e, $e->getMessage()));
 
@@ -122,5 +122,4 @@ class HostedMigrations extends Command
             }
         }
     }
-
 }
diff --git a/app/Console/Commands/HostedUsers.php b/app/Console/Commands/HostedUsers.php
index 621102382e2f..63a1b94e7e35 100644
--- a/app/Console/Commands/HostedUsers.php
+++ b/app/Console/Commands/HostedUsers.php
@@ -41,21 +41,16 @@ class HostedUsers extends Command
      */
     public function handle()
     {
-
-        Company::on('db-ninja-01')->each(function ($company){
-
-            if(Ninja::isHosted())
-                \Modules\Admin\Jobs\Account\NinjaUser::dispatchNow([], $company);
-        
+        Company::on('db-ninja-01')->each(function ($company) {
+            if (Ninja::isHosted()) {
+                (new \Modules\Admin\Jobs\Account\NinjaUser([], $company))->handle();
+            }
         });
 
-        Company::on('db-ninja-02')->each(function ($company){
-            
-            if(Ninja::isHosted())
-                \Modules\Admin\Jobs\Account\NinjaUser::dispatchNow([], $company);
-
+        Company::on('db-ninja-02')->each(function ($company) {
+            if (Ninja::isHosted()) {
+                (new \Modules\Admin\Jobs\Account\NinjaUser([], $company))->handle();
+            }
         });
-
     }
-
 }
diff --git a/app/Console/Commands/ImportMigrations.php b/app/Console/Commands/ImportMigrations.php
index dcd184a2f1a9..594d447469cf 100644
--- a/app/Console/Commands/ImportMigrations.php
+++ b/app/Console/Commands/ImportMigrations.php
@@ -77,9 +77,9 @@ class ImportMigrations extends Command
     public function handle()
     {
         $this->buildCache();
-    
+
         $path = $this->option('path') ?? public_path('storage/migrations/import');
-        
+
         $directory = new DirectoryIterator($path);
 
         foreach ($directory as $file) {
@@ -98,7 +98,7 @@ class ImportMigrations extends Command
                     }
 
                     $filename = pathinfo($file->getRealPath(), PATHINFO_FILENAME);
-                        
+
                     $zip->extractTo(public_path("storage/migrations/{$filename}"));
                     $zip->close();
 
@@ -124,7 +124,7 @@ class ImportMigrations extends Command
 
         $user = User::factory()->create([
             'account_id' => $account->id,
-            'email' => Str::random(10) . "@example.com",
+            'email' => Str::random(10).'@example.com',
             'confirmation_code' => $this->createDbHash($company->db),
         ]);
 
@@ -137,7 +137,7 @@ class ImportMigrations extends Command
             'name' => 'First token',
             'token' => Str::random(64),
         ]);
-        
+
         $user->companies()->attach($company->id, [
             'account_id' => $account->id,
             'is_owner' => 1,
diff --git a/app/Console/Commands/MobileLocalization.php b/app/Console/Commands/MobileLocalization.php
index 7ae72f6cd1bc..0277fb75adce 100644
--- a/app/Console/Commands/MobileLocalization.php
+++ b/app/Console/Commands/MobileLocalization.php
@@ -23,7 +23,6 @@ class MobileLocalization extends Command
      */
     protected $description = 'Generate mobile localization resources';
 
-
     /**
      * Create a new command instance.
      *
@@ -83,9 +82,9 @@ class MobileLocalization extends Command
                     $text = $resources->$key;
                 }
 
-                $text = str_replace(array('<b>', '</b>'), '', $text);
-                $text = str_replace(array('<i>', '</i>'), '', $text);
-                $text = str_replace(array('<strong>', '</strong>'), '', $text);
+                $text = str_replace(['<b>', '</b>'], '', $text);
+                $text = str_replace(['<i>', '</i>'], '', $text);
+                $text = str_replace(['<strong>', '</strong>'], '', $text);
 
                 echo "'$key': '$text',\n";
             }
@@ -103,11 +102,11 @@ class MobileLocalization extends Command
         $end = strpos($data, '},', $start);
         $data = substr($data, $start, $end - $start - 5);
 
-        $data = str_replace("\n", "", $data);
-        $data = str_replace("\"", "\'", $data);
-        $data = str_replace("'", "\"", $data);
+        $data = str_replace("\n", '', $data);
+        $data = str_replace('"', "\'", $data);
+        $data = str_replace("'", '"', $data);
 
-        return json_decode('{' . rtrim($data, ',') . '}');
+        return json_decode('{'.rtrim($data, ',').'}');
     }
 
     protected function getOptions()
@@ -116,5 +115,4 @@ class MobileLocalization extends Command
             ['type', null, InputOption::VALUE_OPTIONAL, 'Type', null],
         ];
     }
-
 }
diff --git a/app/Console/Commands/ParallelCheckData.php b/app/Console/Commands/ParallelCheckData.php
index 1879202cb432..c79161632835 100644
--- a/app/Console/Commands/ParallelCheckData.php
+++ b/app/Console/Commands/ParallelCheckData.php
@@ -52,15 +52,10 @@ class ParallelCheckData extends Command
 
     public function handle()
     {
-    
-    	$hash = Str::random(32);
-
-    	Company::cursor()->each(function ($company) use ($hash){
-
-    		CheckCompanyData::dispatch($company, $hash)->onQueue('checkdata');
-    		
-    	});
+        $hash = Str::random(32);
 
+        Company::cursor()->each(function ($company) use ($hash) {
+            CheckCompanyData::dispatch($company, $hash)->onQueue('checkdata');
+        });
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/Console/Commands/PostUpdate.php b/app/Console/Commands/PostUpdate.php
index 5eeadb84ac88..007a9bed6211 100644
--- a/app/Console/Commands/PostUpdate.php
+++ b/app/Console/Commands/PostUpdate.php
@@ -50,24 +50,22 @@ class PostUpdate extends Command
             info("I wasn't able to migrate the data.");
         }
 
-        info("finished migrating");
+        info('finished migrating');
 
         $output = [];
 
         // exec('vendor/bin/composer install --no-dev -o', $output);
 
-        info(print_r($output,1));
-        info("finished running composer install ");
+        info(print_r($output, 1));
+        info('finished running composer install ');
 
         try {
-
             Artisan::call('optimize');
-
         } catch (\Exception $e) {
             info("I wasn't able to optimize.");
         }
 
-        info("optimized");
+        info('optimized');
 
         try {
             Artisan::call('view:clear');
@@ -75,7 +73,7 @@ class PostUpdate extends Command
             info("I wasn't able to clear the views.");
         }
 
-        info("view cleared");
+        info('view cleared');
 
         try {
             Artisan::call('queue:restart');
@@ -83,11 +81,10 @@ class PostUpdate extends Command
             info("I wasn't able to restart the queue.");
         }
 
-        info("queue restarted");
+        info('queue restarted');
 
         VersionCheck::dispatch();
 
-        info("Sent for version check");
-
+        info('Sent for version check');
     }
 }
diff --git a/app/Console/Commands/ReactBuilder.php b/app/Console/Commands/ReactBuilder.php
index 4081e76846e6..15a2f6520f46 100644
--- a/app/Console/Commands/ReactBuilder.php
+++ b/app/Console/Commands/ReactBuilder.php
@@ -56,33 +56,19 @@ class ReactBuilder extends Command
         $directoryIterator = new \RecursiveDirectoryIterator(public_path('react'), \RecursiveDirectoryIterator::SKIP_DOTS);
 
         foreach (new \RecursiveIteratorIterator($directoryIterator) as $file) {
-
-          if(str_contains($file->getFileName(), '.js')) {
-
-            if(str_contains($file->getFileName(), 'index.')){            
-
-                $includes .= '<script type="module" crossorigin src="/react/' . $file->getFileName() . '"></script>'."\n";
-
-            }
-            else{
-
-                $includes .= '<link rel="modulepreload" href="/react/' . $file->getFileName() . '">'."\n";
+            if (str_contains($file->getFileName(), '.js')) {
+                if (str_contains($file->getFileName(), 'index.')) {
+                    $includes .= '<script type="module" crossorigin src="/react/'.$file->getFileName().'"></script>'."\n";
+                } else {
+                    $includes .= '<link rel="modulepreload" href="/react/'.$file->getFileName().'">'."\n";
+                }
             }
 
-          }
-
-
-          if(str_contains($file->getFileName(), '.css')) {
-
-            $includes .= '<link rel="stylesheet" href="/react/' . $file->getFileName() . '">'."\n";
-
-          }
-  
+            if (str_contains($file->getFileName(), '.css')) {
+                $includes .= '<link rel="stylesheet" href="/react/'.$file->getFileName().'">'."\n";
+            }
         }
 
         file_put_contents(resource_path('views/react/head.blade.php'), $includes);
-
     }
-
-
 }
diff --git a/app/Console/Commands/RecurringCommand.php b/app/Console/Commands/RecurringCommand.php
index 325100d82a08..2bc62d79dee5 100644
--- a/app/Console/Commands/RecurringCommand.php
+++ b/app/Console/Commands/RecurringCommand.php
@@ -47,6 +47,6 @@ class RecurringCommand extends Command
      */
     public function handle()
     {
-        RecurringInvoicesCron::dispatchNow();
+        (new RecurringInvoicesCron())->handle();
     }
 }
diff --git a/app/Console/Commands/S3Cleanup.php b/app/Console/Commands/S3Cleanup.php
index 9b29ee692a63..12b998dd5697 100644
--- a/app/Console/Commands/S3Cleanup.php
+++ b/app/Console/Commands/S3Cleanup.php
@@ -42,10 +42,10 @@ class S3Cleanup extends Command
      */
     public function handle()
     {
-
-        if(!Ninja::isHosted())
+        if (! Ninja::isHosted()) {
             return;
-        
+        }
+
         $c1 = Company::on('db-ninja-01')->pluck('company_key');
         $c2 = Company::on('db-ninja-02')->pluck('company_key');
 
@@ -53,23 +53,20 @@ class S3Cleanup extends Command
 
         $directories = Storage::disk(config('filesystems.default'))->directories();
 
-        $this->LogMessage("Disk Cleanup");
+        $this->LogMessage('Disk Cleanup');
 
-            foreach($directories as $dir)
-            {
-                if(!in_array($dir, $merged))
-                {
-                    $this->logMessage("Deleting $dir");
+        foreach ($directories as $dir) {
+            if (! in_array($dir, $merged)) {
+                $this->logMessage("Deleting $dir");
 
-                    /* Ensure we are not deleting the root folder */
-                    if(strlen($dir) > 1)
-                        Storage::disk(config('filesystems.default'))->deleteDirectory($dir);
-                    
+                /* Ensure we are not deleting the root folder */
+                if (strlen($dir) > 1) {
+                    Storage::disk(config('filesystems.default'))->deleteDirectory($dir);
                 }
-            }        
-
-        $this->logMessage("exiting");
+            }
+        }
 
+        $this->logMessage('exiting');
     }
 
     private function logMessage($str)
diff --git a/app/Console/Commands/SendRemindersCron.php b/app/Console/Commands/SendRemindersCron.php
index cd16da8ecae2..cdbdad6b37ab 100644
--- a/app/Console/Commands/SendRemindersCron.php
+++ b/app/Console/Commands/SendRemindersCron.php
@@ -29,6 +29,7 @@ use Illuminate\Support\Facades\App;
 class SendRemindersCron extends Command
 {
     use MakesReminders, MakesDates;
+
     /**
      * The name and signature of the console command.
      *
@@ -60,56 +61,49 @@ class SendRemindersCron extends Command
      */
     public function handle()
     {
-
         Invoice::where('next_send_date', '<=', now()->toDateTimeString())
                  ->whereNull('deleted_at')
                  ->where('is_deleted', 0)
                  ->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
                  ->where('balance', '>', 0)
                  ->whereHas('client', function ($query) {
-                     $query->where('is_deleted',0)
-                           ->where('deleted_at', NULL);
+                     $query->where('is_deleted', 0)
+                           ->where('deleted_at', null);
                  })
                  ->whereHas('company', function ($query) {
-                     $query->where('is_disabled',0);
+                     $query->where('is_disabled', 0);
                  })
                  ->with('invitations')->cursor()->each(function ($invoice) {
+                     if ($invoice->isPayable()) {
+                         $reminder_template = $invoice->calculateTemplate('invoice');
+                         $invoice->service()->touchReminder($reminder_template)->save();
+                         $invoice = $this->calcLateFee($invoice, $reminder_template);
 
-            if ($invoice->isPayable()) {
-                $reminder_template = $invoice->calculateTemplate('invoice');
-                $invoice->service()->touchReminder($reminder_template)->save();
-                $invoice = $this->calcLateFee($invoice, $reminder_template);
+                         //check if this reminder needs to be emailed
+                         if (in_array($reminder_template, ['reminder1', 'reminder2', 'reminder3']) && $invoice->client->getSetting('enable_'.$reminder_template)) {
+                             $invoice->invitations->each(function ($invitation) use ($invoice, $reminder_template) {
+                                 EmailEntity::dispatch($invitation, $invitation->company, $reminder_template);
+                                 nlog("Firing reminder email for invoice {$invoice->number}");
+                             });
 
-                //check if this reminder needs to be emailed
-                if(in_array($reminder_template, ['reminder1','reminder2','reminder3']) && $invoice->client->getSetting("enable_".$reminder_template))
-                {
-                    $invoice->invitations->each(function ($invitation) use ($invoice, $reminder_template) {
-                        EmailEntity::dispatch($invitation, $invitation->company, $reminder_template);
-                        nlog("Firing reminder email for invoice {$invoice->number}");
-                    });
+                             if ($invoice->invitations->count() > 0) {
+                                 event(new InvoiceWasEmailed($invoice->invitations->first(), $invoice->company, Ninja::eventVars(), $reminder_template));
+                             }
+                         }
+                         $invoice->service()->setReminder()->save();
+                     } else {
+                         $invoice->next_send_date = null;
+                         $invoice->save();
+                     }
+                 });
 
-                    if ($invoice->invitations->count() > 0) {
-                        event(new InvoiceWasEmailed($invoice->invitations->first(), $invoice->company, Ninja::eventVars(), $reminder_template));
-                    }
-                }
-                $invoice->service()->setReminder()->save();
-                
-            } else {
-                $invoice->next_send_date = null;
-                $invoice->save();
-            }
-
-        });
-
-
-       //  SendReminders::dispatchNow();
+        //  SendReminders::dispatchNow();
 
        // $this->webHookOverdueInvoices();
        // $this->webHookExpiredQuotes();
     }
 
-
- private function calcLateFee($invoice, $template) :Invoice
+    private function calcLateFee($invoice, $template) :Invoice
     {
         $late_fee_amount = 0;
         $late_fee_percent = 0;
@@ -151,7 +145,6 @@ class SendRemindersCron extends Command
      */
     private function setLateFee($invoice, $amount, $percent) :Invoice
     {
-
         App::forgetInstance('translator');
         $t = app('translator');
         $t->replace(Ninja::transformTranslations($invoice->client->getMergedSettings()));
@@ -187,49 +180,20 @@ class SendRemindersCron extends Command
         $invoice->calc()->getInvoice()->save();
         $invoice->fresh();
         $invoice->service()->deletePdf();
-        
+
         /* Refresh the client here to ensure the balance is fresh */
         $client = $invoice->client;
         $client = $client->fresh();
 
-        nlog("adjusting client balance and invoice balance by ". ($invoice->balance - $temp_invoice_balance));
+        nlog('adjusting client balance and invoice balance by '.($invoice->balance - $temp_invoice_balance));
         $client->service()->updateBalance($invoice->balance - $temp_invoice_balance)->save();
         $invoice->ledger()->updateInvoiceBalance($invoice->balance - $temp_invoice_balance, "Late Fee Adjustment for invoice {$invoice->number}");
 
         return $invoice;
     }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     private function webHookOverdueInvoices()
     {
-
-
         if (! config('ninja.db.multi_db_enabled')) {
             $this->executeWebhooks();
         } else {
@@ -240,12 +204,10 @@ class SendRemindersCron extends Command
                 $this->executeWebhooks();
             }
         }
-
     }
 
     private function webHookExpiredQuotes()
     {
-        
     }
 
     private function executeWebhooks()
@@ -255,21 +217,18 @@ class SendRemindersCron extends Command
                           ->where('balance', '>', 0)
                           ->whereDate('due_date', '<=', now()->subDays(1)->startOfDay())
                           ->cursor();
-    
+
         $invoices->each(function ($invoice) {
             WebhookHandler::dispatch(Webhook::EVENT_LATE_INVOICE, $invoice, $invoice->company);
-            
         });
 
         $quotes = Quote::where('is_deleted', 0)
                           ->where('status_id', Quote::STATUS_SENT)
                           ->whereDate('due_date', '<=', now()->subDays(1)->startOfDay())
                           ->cursor();
-    
+
         $quotes->each(function ($quote) {
             WebhookHandler::dispatch(Webhook::EVENT_EXPIRED_QUOTE, $quote, $quote->company);
         });
     }
-
-
 }
diff --git a/app/Console/Commands/SendTestEmails.php b/app/Console/Commands/SendTestEmails.php
index e47ec4c8a420..aa10cd582234 100644
--- a/app/Console/Commands/SendTestEmails.php
+++ b/app/Console/Commands/SendTestEmails.php
@@ -70,7 +70,7 @@ class SendTestEmails extends Command
         $user = User::factory()->create([
             'account_id' => $account->id,
             'confirmation_code' => '123',
-            'email' => $faker->safeEmail,
+            'email' => $faker->safeEmail(),
             'first_name' => 'John',
             'last_name' => 'Doe',
         ]);
@@ -96,6 +96,6 @@ class SendTestEmails extends Command
         $nmo->settings = $user->account->companies()->first()->settings;
         $nmo->to_user = $user;
 
-        NinjaMailerJob::dispatchNow($nmo);
+        (new NinjaMailerJob($nmo))->handle();
     }
 }
diff --git a/app/Console/Commands/SubdomainFill.php b/app/Console/Commands/SubdomainFill.php
index ad5471d7866c..aa099a57a51e 100644
--- a/app/Console/Commands/SubdomainFill.php
+++ b/app/Console/Commands/SubdomainFill.php
@@ -40,25 +40,17 @@ class SubdomainFill extends Command
      */
     public function handle()
     {
-
         $c1 = Company::on('db-ninja-01')->whereNull('subdomain')->orWhere('subdomain', '')->get();
         $c2 = Company::on('db-ninja-02')->whereNull('subdomain')->orWhere('subdomain', '')->get();
 
-
-        $c1->each(function ($company){
-
+        $c1->each(function ($company) {
             $company->subdomain = MultiDB::randomSubdomainGenerator();
             $company->save();
-
         });
 
-        $c2->each(function ($company){
-
+        $c2->each(function ($company) {
             $company->subdomain = MultiDB::randomSubdomainGenerator();
             $company->save();
-
         });
-
     }
-
 }
diff --git a/app/Console/Commands/TranslationsExport.php b/app/Console/Commands/TranslationsExport.php
index bfc7ffe3f370..5fcf588b0ff5 100644
--- a/app/Console/Commands/TranslationsExport.php
+++ b/app/Console/Commands/TranslationsExport.php
@@ -69,8 +69,9 @@ class TranslationsExport extends Command
         'sv',
         'th',
         'tr_TR',
-        'zh_TW'
+        'zh_TW',
     ];
+
     /**
      * Create a new command instance.
      *
@@ -88,19 +89,14 @@ class TranslationsExport extends Command
      */
     public function handle()
     {
-
         Storage::makeDirectory(storage_path('lang'));
 
-        foreach($this->langs as $lang)
-        {
+        foreach ($this->langs as $lang) {
             Storage::makeDirectory(storage_path("lang/{$lang}"));
 
-            $translations = Lang::getLoader()->load($lang,'texts');
+            $translations = Lang::getLoader()->load($lang, 'texts');
 
             Storage::put(storage_path("lang/{$lang}/{$lang}.json"), json_encode(Arr::dot($translations), JSON_UNESCAPED_UNICODE));
-
         }
-
     }
-
 }
diff --git a/app/Console/Commands/TypeCheck.php b/app/Console/Commands/TypeCheck.php
index 0c7c3b97ed29..3ec6a339c34d 100644
--- a/app/Console/Commands/TypeCheck.php
+++ b/app/Console/Commands/TypeCheck.php
@@ -43,7 +43,6 @@ class TypeCheck extends Command
 
     protected $log = '';
 
-
     /**
      * Create a new command instance.
      *
@@ -65,91 +64,74 @@ class TypeCheck extends Command
 
         $current_db = config('database.default');
 
-        if($this->option('all'))
-        {
+        if ($this->option('all')) {
             if (! config('ninja.db.multi_db_enabled')) {
-                    $this->checkAll();
+                $this->checkAll();
             } else {
-
-                foreach (MultiDB::$dbs as $db) 
-                {
+                foreach (MultiDB::$dbs as $db) {
                     MultiDB::setDB($db);
 
                     $this->checkAll();
                 }
 
                 MultiDB::setDB($current_db);
-            
             }
-
         }
 
-        if($this->option('client_id'))
-        {
+        if ($this->option('client_id')) {
             $client = MultiDB::findAndSetDbByClientId($this->option('client_id'));
 
-            if($client)
+            if ($client) {
                 $this->checkClient($client);
-            else
+            } else {
                 $this->logMessage(date('Y-m-d h:i:s').' Could not find this client');
-
+            }
         }
 
-        if($this->option('company_id'))
-        {
+        if ($this->option('company_id')) {
             $company = MultiDB::findAndSetDbByCompanyId($this->option('company_id'));
 
-
-            if($company)
+            if ($company) {
                 $this->checkCompany($company);
-            else
+            } else {
                 $this->logMessage(date('Y-m-d h:i:s').' Could not find this company');
+            }
         }
-
     }
 
-
     private function checkClient($client)
     {
-        $this->logMessage(date('Y-m-d h:i:s').' Checking Client => ' . $client->present()->name(). " " . $client->id);
-
-
-            $entity_settings = $this->checkSettingType($client->settings);
-            $entity_settings->md5 = md5(time());
-            $client->settings = $entity_settings;
-            $client->save();
+        $this->logMessage(date('Y-m-d h:i:s').' Checking Client => '.$client->present()->name().' '.$client->id);
 
+        $entity_settings = $this->checkSettingType($client->settings);
+        $entity_settings->md5 = md5(time());
+        $client->settings = $entity_settings;
+        $client->save();
     }
 
     private function checkCompany($company)
     {
-        $this->logMessage(date('Y-m-d h:i:s').' Checking Company => ' . $company->present()->name(). " " . $company->id);
-
-            $company->saveSettings((array)$company->settings, $company);
+        $this->logMessage(date('Y-m-d h:i:s').' Checking Company => '.$company->present()->name().' '.$company->id);
 
+        $company->saveSettings((array) $company->settings, $company);
     }
 
     private function checkAll()
     {
-
         $this->logMessage(date('Y-m-d h:i:s').' Checking all clients and companies.');
 
-        Client::withTrashed()->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());
             $client->settings = $entity_settings;
             $client->save();
-            
         });
 
-        Company::cursor()->each( function ($company) {
+        Company::cursor()->each(function ($company) {
             $this->logMessage("Checking company {$company->id}");
             $company->saveSettings($company->settings, $company);
-            
         });
-
-
     }
 
     private function logMessage($str)
@@ -159,4 +141,3 @@ class TypeCheck extends Command
         $this->log .= $str."\n";
     }
 }
-
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index e6ebbdc808c3..4ee1a351dda1 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -34,15 +34,6 @@ use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
 class Kernel extends ConsoleKernel
 {
-    /**
-     * The Artisan commands provided by your application.
-     *
-     * @var array
-     */
-    protected $commands = [
-        //
-    ];
-
     /**
      * Define the application's command schedule.
      *
@@ -51,7 +42,6 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-
         $schedule->job(new VersionCheck)->daily();
 
         $schedule->job(new DiskCleanup)->daily()->withoutOverlapping();
@@ -78,17 +68,14 @@ class Kernel extends ConsoleKernel
 
         $schedule->job(new SystemMaintenance)->weekly()->withoutOverlapping();
 
-        if(Ninja::isSelfHost())
-        {
+        if (Ninja::isSelfHost()) {
             $schedule->call(function () {
                 Account::whereNotNull('id')->update(['is_scheduler_running' => true]);
             })->everyFiveMinutes();
-
         }
 
         /* Run hosted specific jobs */
         if (Ninja::isHosted()) {
-
             $schedule->job(new AdjustEmailQuota)->dailyAt('23:30')->withoutOverlapping();
 
             $schedule->job(new SendFailedEmails)->daily()->withoutOverlapping();
@@ -98,17 +85,13 @@ class Kernel extends ConsoleKernel
             $schedule->command('ninja:check-data --database=db-ninja-02')->dailyAt('02:05')->withoutOverlapping();
 
             $schedule->command('ninja:s3-cleanup')->dailyAt('23:15')->withoutOverlapping();
-
         }
 
-        if (config('queue.default') == 'database' && Ninja::isSelfHost() && config('ninja.internal_queue_enabled') && !config('ninja.is_docker')) {
-
+        if (config('queue.default') == 'database' && Ninja::isSelfHost() && config('ninja.internal_queue_enabled') && ! config('ninja.is_docker')) {
             $schedule->command('queue:work database --stop-when-empty --memory=256')->everyMinute()->withoutOverlapping();
 
             $schedule->command('queue:restart')->everyFiveMinutes()->withoutOverlapping();
-
         }
-
     }
 
     /**
@@ -118,7 +101,7 @@ class Kernel extends ConsoleKernel
      */
     protected function commands()
     {
-        $this->load(__DIR__ . '/Commands');
+        $this->load(__DIR__.'/Commands');
 
         require base_path('routes/console.php');
     }
diff --git a/app/DataMapper/Analytics/AccountPlatform.php b/app/DataMapper/Analytics/AccountPlatform.php
index 40f0e2abf9f2..2e696ab50172 100644
--- a/app/DataMapper/Analytics/AccountPlatform.php
+++ b/app/DataMapper/Analytics/AccountPlatform.php
@@ -53,7 +53,8 @@ class AccountPlatform extends GenericMixedMetric
 
     public $string_metric7 = 'ip_address';
 
-    public function __construct($string_metric5, $string_metric6, $string_metric7) {
+    public function __construct($string_metric5, $string_metric6, $string_metric7)
+    {
         $this->string_metric5 = $string_metric5;
         $this->string_metric6 = $string_metric6;
         $this->string_metric7 = $string_metric7;
diff --git a/app/DataMapper/Analytics/DbQuery.php b/app/DataMapper/Analytics/DbQuery.php
index 52ffbe646444..05d8b232b75e 100644
--- a/app/DataMapper/Analytics/DbQuery.php
+++ b/app/DataMapper/Analytics/DbQuery.php
@@ -52,6 +52,7 @@ class DbQuery extends GenericMixedMetric
     public $string_metric6 = 'url';
 
     public $string_metric7 = 'ip_address';
+
     /**
      * The counter
      * set to 1.
@@ -62,7 +63,8 @@ class DbQuery extends GenericMixedMetric
 
     public $double_metric2 = 1;
 
-    public function __construct($string_metric5, $string_metric6, $int_metric1, $double_metric2, $string_metric7) {
+    public function __construct($string_metric5, $string_metric6, $int_metric1, $double_metric2, $string_metric7)
+    {
         $this->int_metric1 = $int_metric1;
         $this->string_metric5 = $string_metric5;
         $this->string_metric6 = $string_metric6;
diff --git a/app/DataMapper/Analytics/EmailFailure.php b/app/DataMapper/Analytics/EmailFailure.php
index 077e0a15be9b..43cfc97fae32 100644
--- a/app/DataMapper/Analytics/EmailFailure.php
+++ b/app/DataMapper/Analytics/EmailFailure.php
@@ -71,7 +71,8 @@ class EmailFailure extends GenericMixedMetric
      */
     public $string_metric7 = '';
 
-    public function __construct($string_metric7) {
+    public function __construct($string_metric7)
+    {
         $this->string_metric7 = $string_metric7;
     }
 }
diff --git a/app/DataMapper/Analytics/EmailSuccess.php b/app/DataMapper/Analytics/EmailSuccess.php
index 1d2160cb58e8..9f566eaa752a 100644
--- a/app/DataMapper/Analytics/EmailSuccess.php
+++ b/app/DataMapper/Analytics/EmailSuccess.php
@@ -15,7 +15,6 @@ use Turbo124\Beacon\ExampleMetric\GenericMixedMetric;
 
 class EmailSuccess extends GenericMixedMetric
 {
-
     /**
      * The type of Sample.
      *
@@ -72,8 +71,8 @@ class EmailSuccess extends GenericMixedMetric
      */
     public $string_metric7 = '';
 
-    public function __construct($string_metric7) {
+    public function __construct($string_metric7)
+    {
         $this->string_metric7 = $string_metric7;
     }
-    
 }
diff --git a/app/DataMapper/Analytics/Mail/EmailBounce.php b/app/DataMapper/Analytics/Mail/EmailBounce.php
index 010a77ab3413..90a115a2ad53 100644
--- a/app/DataMapper/Analytics/Mail/EmailBounce.php
+++ b/app/DataMapper/Analytics/Mail/EmailBounce.php
@@ -71,7 +71,8 @@ class EmailBounce extends GenericMixedMetric
      */
     public $int_metric1 = 1;
 
-    public function __construct($string_metric5,$string_metric6,$string_metric7) {
+    public function __construct($string_metric5, $string_metric6, $string_metric7)
+    {
         $this->string_metric5 = $string_metric5;
         $this->string_metric6 = $string_metric6;
         $this->string_metric7 = $string_metric7;
diff --git a/app/DataMapper/Analytics/Mail/EmailSpam.php b/app/DataMapper/Analytics/Mail/EmailSpam.php
index 1e63b6ba4b69..9d658d1243d9 100644
--- a/app/DataMapper/Analytics/Mail/EmailSpam.php
+++ b/app/DataMapper/Analytics/Mail/EmailSpam.php
@@ -71,7 +71,8 @@ class EmailSpam extends GenericMixedMetric
      */
     public $int_metric1 = 1;
 
-    public function __construct($string_metric5,$string_metric6,$string_metric7) {
+    public function __construct($string_metric5, $string_metric6, $string_metric7)
+    {
         $this->string_metric5 = $string_metric5;
         $this->string_metric6 = $string_metric6;
         $this->string_metric7 = $string_metric7;
diff --git a/app/DataMapper/Analytics/QueueSize.php b/app/DataMapper/Analytics/QueueSize.php
index 3266f38645e2..0a356785f7a3 100644
--- a/app/DataMapper/Analytics/QueueSize.php
+++ b/app/DataMapper/Analytics/QueueSize.php
@@ -15,7 +15,6 @@ use Turbo124\Beacon\ExampleMetric\GenericMixedMetric;
 
 class QueueSize extends GenericMixedMetric
 {
-
     /**
      * The type of Sample.
      *
@@ -72,8 +71,8 @@ class QueueSize extends GenericMixedMetric
      */
     public $string_metric7 = '';
 
-    public function __construct($int_metric1) {
+    public function __construct($int_metric1)
+    {
         $this->int_metric1 = $int_metric1;
     }
-    
 }
diff --git a/app/DataMapper/Billing/SubscriptionContextMapper.php b/app/DataMapper/Billing/SubscriptionContextMapper.php
index e45c6d1587e1..c86738a9162b 100644
--- a/app/DataMapper/Billing/SubscriptionContextMapper.php
+++ b/app/DataMapper/Billing/SubscriptionContextMapper.php
@@ -12,7 +12,6 @@
 
 namespace App\DataMapper\Billing;
 
-
 class SubscriptionContextMapper
 {
     /**
diff --git a/app/DataMapper/Billing/WebhookConfiguration.php b/app/DataMapper/Billing/WebhookConfiguration.php
index 1e0edd246417..08560d5ce1a1 100644
--- a/app/DataMapper/Billing/WebhookConfiguration.php
+++ b/app/DataMapper/Billing/WebhookConfiguration.php
@@ -12,7 +12,6 @@
 
 namespace App\DataMapper\Billing;
 
-
 class WebhookConfiguration
 {
     /**
@@ -33,11 +32,11 @@ class WebhookConfiguration
     /**
      * @var string
      */
-    public $post_purchase_body =  '';
+    public $post_purchase_body = '';
 
     /**
      * @var string
-     */ 
+     */
     public $post_purchase_rest_method = 'POST';
 
     /**
diff --git a/app/DataMapper/ClientRegistrationFields.php b/app/DataMapper/ClientRegistrationFields.php
index a70871163f76..5e6397267dfe 100644
--- a/app/DataMapper/ClientRegistrationFields.php
+++ b/app/DataMapper/ClientRegistrationFields.php
@@ -13,89 +13,88 @@ namespace App\DataMapper;
 
 class ClientRegistrationFields
 {
-
     public static function generate()
     {
-        $data = 
+        $data =
         [
             [
                 'key' => 'first_name',
-                'required' => true
+                'required' => true,
             ],
             [
                 'key' => 'last_name',
-                'required' => true
+                'required' => true,
             ],
             [
                 'key' => 'email',
-                'required' => true
+                'required' => true,
             ],
             [
                 'key' => 'phone',
-                'required' => false
+                'required' => false,
             ],
             [
                 'key' => 'password',
-                'required' => true
-            ], 
+                'required' => true,
+            ],
             [
                 'key' => 'name',
-                'required' => false
+                'required' => false,
             ],
             [
                 'key' => 'website',
-                'required' => false
+                'required' => false,
             ],
             [
                 'key' => 'address1',
-                'required' => false
+                'required' => false,
             ],
             [
                 'key' => 'address2',
-                'required' => false
+                'required' => false,
             ],
             [
                 'key' => 'city',
-                'required' => false
+                'required' => false,
             ],
             [
                 'key' => 'state',
-                'required' => false
+                'required' => false,
             ],
             [
                 'key' => 'postal_code',
-                'required' => false
-            ],            
+                'required' => false,
+            ],
             [
                 'key' => 'country_id',
-                'required' => false
-            ],            
+                'required' => false,
+            ],
             [
                 'key' => 'custom_value1',
-                'required' => false
-            ],            
+                'required' => false,
+            ],
             [
                 'key' => 'custom_value2',
-                'required' => false
+                'required' => false,
             ],
             [
                 'key' => 'custom_value3',
-                'required' => false
-            ],            
+                'required' => false,
+            ],
             [
                 'key' => 'custom_value4',
-                'required' => false
-            ],                       
+                'required' => false,
+            ],
             [
                 'key' => 'public_notes',
-                'required' => false
-            ],   
+                'required' => false,
+            ],
             [
                 'key' => 'vat_number',
-                'required' => false
-            ],          
+                'required' => false,
+            ],
         ];
 
         return $data;
     }
-}
\ No newline at end of file
+}
diff --git a/app/DataMapper/ClientSettings.php b/app/DataMapper/ClientSettings.php
index 334b1c5936bd..2f10f03b655f 100644
--- a/app/DataMapper/ClientSettings.php
+++ b/app/DataMapper/ClientSettings.php
@@ -30,6 +30,7 @@ class ClientSettings extends BaseSettings
      * Settings which which are unique to client settings.
      */
     public $industry_id;
+
     public $size_id;
 
     public static $casts = [
diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index 758c494e15c8..92a0ae31a2cc 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -31,20 +31,29 @@ class CompanySettings extends BaseSettings
     public $lock_invoices = 'off'; //off,when_sent,when_paid //@implemented
 
     public $enable_client_portal_tasks = false; //@ben to implement
+
     public $show_all_tasks_client_portal = 'invoiced'; // all, uninvoiced, invoiced
+
     public $enable_client_portal_password = false; //@implemented
+
     public $enable_client_portal = true; //@implemented
+
     public $enable_client_portal_dashboard = false; // @TODO There currently is no dashboard so this is pending
+
     public $signature_on_pdf = false; //@implemented
+
     public $document_email_attachment = false; //@TODO I assume this is 3rd party attachments on the entity to be included
 
     public $portal_design_id = '1'; //?@deprecated
 
     public $timezone_id = ''; //@implemented
+
     public $date_format_id = ''; //@implemented
+
     public $military_time = false; // @TODOImplemented in Tasks only?
 
     public $language_id = ''; //@implemented
+
     public $show_currency_code = false; //@implemented
 
     public $company_gateway_ids = ''; //@implemented
@@ -52,243 +61,379 @@ class CompanySettings extends BaseSettings
     public $currency_id = '1'; //@implemented
 
     public $custom_value1 = ''; //@implemented
+
     public $custom_value2 = ''; //@implemented
+
     public $custom_value3 = ''; //@implemented
+
     public $custom_value4 = ''; //@implemented
 
     public $default_task_rate = 0; // @TODO Where do we inject this?
 
     public $payment_terms = ''; //@implemented
+
     public $send_reminders = true; //@TODO
 
     public $custom_message_dashboard = ''; // @TODO There currently is no dashboard so this is pending
+
     public $custom_message_unpaid_invoice = '';
+
     public $custom_message_paid_invoice = '';
+
     public $custom_message_unapproved_quote = '';
+
     public $auto_archive_quote = false; //@implemented
+
     public $auto_convert_quote = true; //@implemented
+
     public $auto_email_invoice = true; //@only used for Recurring Invoices, if set to false, we never send?
 
     public $entity_send_time = 6;
 
     public $inclusive_taxes = false; //@implemented
+
     public $quote_footer = ''; //@implmented
 
     public $translations;
 
     public $counter_number_applied = 'when_saved'; // when_saved , when_sent //@implemented
+
     public $quote_number_applied = 'when_saved'; // when_saved , when_sent //@implemented
 
     /* Counters */
     public $invoice_number_pattern = ''; //@implemented
+
     public $invoice_number_counter = 1; //@implemented
 
     public $recurring_invoice_number_pattern = ''; //@implemented
+
     public $recurring_invoice_number_counter = 1; //@implemented
 
     public $quote_number_pattern = ''; //@implemented
+
     public $quote_number_counter = 1; //@implemented
 
     public $client_number_pattern = ''; //@implemented
+
     public $client_number_counter = 1; //@implemented
 
     public $credit_number_pattern = ''; //@implemented
+
     public $credit_number_counter = 1; //@implemented
 
     public $task_number_pattern = ''; //@implemented
+
     public $task_number_counter = 1; //@implemented
 
     public $expense_number_pattern = ''; //@implemented
+
     public $expense_number_counter = 1; //@implemented
 
     public $recurring_expense_number_pattern = '';
+
     public $recurring_expense_number_counter = 1;
 
     public $recurring_quote_number_pattern = '';
+
     public $recurring_quote_number_counter = 1;
 
     public $vendor_number_pattern = ''; //@implemented
+
     public $vendor_number_counter = 1; //@implemented
 
     public $ticket_number_pattern = ''; //@implemented
+
     public $ticket_number_counter = 1; //@implemented
 
     public $payment_number_pattern = ''; //@implemented
+
     public $payment_number_counter = 1; //@implemented
 
     public $project_number_pattern = ''; //@implemented
+
     public $project_number_counter = 1; //@implemented
 
     public $purchase_order_number_pattern = ''; //@implemented
+
     public $purchase_order_number_counter = 1; //@implemented
 
     public $shared_invoice_quote_counter = false; //@implemented
+
     public $shared_invoice_credit_counter = false; //@implemented
+
     public $recurring_number_prefix = ''; //@implemented
+
     public $reset_counter_frequency_id = '0'; //@implemented
+
     public $reset_counter_date = ''; //@implemented
+
     public $counter_padding = 4; //@implemented
 
     public $auto_bill = 'off'; //off,always,optin,optout //@implemented
+
     public $auto_bill_date = 'on_due_date'; // on_due_date , on_send_date //@implemented
 
     public $invoice_terms = ''; //@implemented
+
     public $quote_terms = ''; //@implemented
+
     public $invoice_taxes = 0; // ? used in AP only?
 
     public $invoice_design_id = 'Wpmbk5ezJn'; //@implemented
+
     public $quote_design_id = 'Wpmbk5ezJn'; //@implemented
+
     public $credit_design_id = 'Wpmbk5ezJn'; //@implemented
 
     public $purchase_order_design_id = 'Wpmbk5ezJn';
+
     public $purchase_order_footer = ''; //@implemented
+
     public $purchase_order_terms = ''; //@implemented
+
     public $purchase_order_public_notes = ''; //@implemented
+
     public $require_purchase_order_signature = false;  //@TODO ben to confirm
-    
+
     public $invoice_footer = ''; //@implemented
+
     public $credit_footer = ''; //@implemented
+
     public $credit_terms = ''; //@implemented
+
     public $invoice_labels = ''; //@TODO used in AP only?
+
     public $tax_name1 = ''; //@TODO where do we use this?
+
     public $tax_rate1 = 0; //@TODO where do we use this?
+
     public $tax_name2 = ''; //@TODO where do we use this?
+
     public $tax_rate2 = 0; //@TODO where do we use this?
+
     public $tax_name3 = ''; //@TODO where do we use this?
+
     public $tax_rate3 = 0; //@TODO where do we use this?
+
     public $payment_type_id = '0'; //@TODO where do we use this?
 
     public $valid_until = ''; //@implemented
 
     public $show_accept_invoice_terms = false; //@TODO ben to confirm
+
     public $show_accept_quote_terms = false;  //@TODO ben to confirm
+
     public $require_invoice_signature = false;  //@TODO ben to confirm
+
     public $require_quote_signature = false;  //@TODO ben to confirm
 
     //email settings
     public $email_sending_method = 'default'; //enum 'default','gmail','office365' //@implemented
+
     public $gmail_sending_user_id = '0'; //@implemented
 
     public $reply_to_email = ''; //@implemented
+
     public $reply_to_name = ''; //@implemented
+
     public $bcc_email = ''; //@TODO
+
     public $pdf_email_attachment = false; //@implemented
+
     public $ubl_email_attachment = false; //@implemented
 
     public $email_style = 'light'; //plain, light, dark, custom  //@implemented
+
     public $email_style_custom = '';      //the template itself  //@implemented
+
     public $email_subject_invoice = '';  //@implemented
+
     public $email_subject_quote = '';  //@implemented
+
     public $email_subject_credit = ''; //@implemented
+
     public $email_subject_payment = ''; //@implemented
+
     public $email_subject_payment_partial = ''; //@implemented
+
     public $email_subject_statement = ''; //@implemented
+
     public $email_subject_purchase_order = ''; //@implemented
+
     public $email_template_purchase_order = ''; //@implemented
+
     public $email_template_invoice = ''; //@implemented
+
     public $email_template_credit = ''; //@implemented
+
     public $email_template_quote = ''; //@implemented
+
     public $email_template_payment = ''; //@implemented
+
     public $email_template_payment_partial = ''; //@implemented
+
     public $email_template_statement = ''; //@implemented
+
     public $email_subject_reminder1 = ''; //@implemented
+
     public $email_subject_reminder2 = ''; //@implemented
+
     public $email_subject_reminder3 = ''; //@implemented
+
     public $email_subject_reminder_endless = ''; //@implemented
+
     public $email_template_reminder1 = ''; //@implemented
+
     public $email_template_reminder2 = ''; //@implemented
+
     public $email_template_reminder3 = ''; //@implemented
+
     public $email_template_reminder_endless = ''; //@implemented
+
     public $email_signature = ''; //@implemented
+
     public $enable_email_markup = true; //@TODO -
 
     public $email_subject_custom1 = ''; //@TODO
+
     public $email_subject_custom2 = ''; //@TODO
+
     public $email_subject_custom3 = ''; //@TODO
 
     public $email_template_custom1 = ''; //@TODO
+
     public $email_template_custom2 = ''; //@TODO
+
     public $email_template_custom3 = ''; //@TODO
 
     public $enable_reminder1 = false; //@implmemented
+
     public $enable_reminder2 = false; //@implmemented
+
     public $enable_reminder3 = false; //@implmemented
+
     public $enable_reminder_endless = false; //@implmemented
 
-    public $num_days_reminder1 = 0;//@implmemented
-    public $num_days_reminder2 = 0;//@implmemented
-    public $num_days_reminder3 = 0;//@implmemented
+    public $num_days_reminder1 = 0; //@implmemented
+
+    public $num_days_reminder2 = 0; //@implmemented
+
+    public $num_days_reminder3 = 0; //@implmemented
 
     public $schedule_reminder1 = ''; // (enum: after_invoice_date, before_due_date, after_due_date) implmemented
+
     public $schedule_reminder2 = ''; // (enum: after_invoice_date, before_due_date, after_due_date) implmemented
+
     public $schedule_reminder3 = ''; // (enum: after_invoice_date, before_due_date, after_due_date) implmemented
 
     public $reminder_send_time = 0; //number of seconds from UTC +0 to send reminders @TODO
 
     public $late_fee_amount1 = 0; //@implemented
+
     public $late_fee_amount2 = 0; //@implemented
+
     public $late_fee_amount3 = 0; //@implemented
 
     public $late_fee_percent1 = 0; //@implemented
+
     public $late_fee_percent2 = 0; //@implemented
+
     public $late_fee_percent3 = 0; //@implemented
 
     public $endless_reminder_frequency_id = '0'; //@implemented
+
     public $late_fee_endless_amount = 0; //@implemented
+
     public $late_fee_endless_percent = 0; //@implemented
 
     public $client_online_payment_notification = true; //@todo implement in notifications check this bool prior to sending payment notification to client
+
     public $client_manual_payment_notification = true; //@todo implement in notifications check this bool prior to sending manual payment notification to client
 
     /* Company Meta data that we can use to build sub companies*/
 
     public $name = ''; //@implemented
+
     public $company_logo = ''; //@implemented
+
     public $website = ''; //@implemented
+
     public $address1 = ''; //@implemented
+
     public $address2 = ''; //@implemented
+
     public $city = ''; //@implemented
+
     public $state = ''; //@implemented
+
     public $postal_code = ''; //@implemented
+
     public $phone = ''; //@implemented
+
     public $email = ''; //@implemented
+
     public $country_id; //@implemented
+
     public $vat_number = ''; //@implemented
+
     public $id_number = ''; //@implemented
 
     public $page_size = 'A4';  //Letter, Legal, Tabloid, Ledger, A0, A1, A2, A3, A4, A5, A6
+
     public $page_layout = 'portrait';
+
     public $font_size = 7; //@implemented
+
     public $primary_font = 'Roboto';
+
     public $secondary_font = 'Roboto';
+
     public $primary_color = '#298AAB';
+
     public $secondary_color = '#7081e0';
 
     public $page_numbering = false;
+
     public $page_numbering_alignment = 'C';  //C,R,L
 
     public $hide_paid_to_date = false; //@TODO where?
+
     public $embed_documents = false; //@TODO where?
+
     public $all_pages_header = false; //@deprecated 31-05-2021
+
     public $all_pages_footer = false; //@deprecated 31-05-2021
+
     public $pdf_variables = ''; //@implemented
 
     public $portal_custom_head = ''; //@TODO @BEN
+
     public $portal_custom_css = ''; //@TODO @BEN
+
     public $portal_custom_footer = ''; //@TODO @BEN
+
     public $portal_custom_js = ''; //@TODO @BEN
 
     public $client_can_register = false; //@deorecated 04/06/2021
+
     public $client_portal_terms = ''; //@TODO @BEN
+
     public $client_portal_privacy_policy = ''; //@TODO @BEN
+
     public $client_portal_enable_uploads = false; //@implemented
+
     public $client_portal_allow_under_payment = false; //@implemented
+
     public $client_portal_under_payment_minimum = 0; //@implemented
+
     public $client_portal_allow_over_payment = false; //@implemented
 
     public $use_credits_payment = 'off'; //always, option, off //@implemented
+
     public $hide_empty_columns_on_pdf = false;
+
     public $email_from_name = '';
+
     public $auto_archive_invoice_cancelled = false;
 
     public $vendor_portal_enable_uploads=false;
diff --git a/app/DataMapper/DefaultSettings.php b/app/DataMapper/DefaultSettings.php
index e2b4d45b9d52..2c0ebef43bcf 100644
--- a/app/DataMapper/DefaultSettings.php
+++ b/app/DataMapper/DefaultSettings.php
@@ -26,12 +26,11 @@ class DefaultSettings extends BaseSettings
 
     /**
      * @return stdClass
-     *
      */
     public static function userSettings() : stdClass
     {
         return (object) [
-        //    class_basename(User::class) => self::userSettingsObject(),
+            //    class_basename(User::class) => self::userSettingsObject(),
         ];
     }
 
@@ -41,7 +40,7 @@ class DefaultSettings extends BaseSettings
     private static function userSettingsObject() : stdClass
     {
         return (object) [
-        //    'per_page' => self::$per_page,
+            //    'per_page' => self::$per_page,
         ];
     }
 }
diff --git a/app/DataMapper/EmailTemplateDefaults.php b/app/DataMapper/EmailTemplateDefaults.php
index 5cdc7b915c23..3ce6ab53ac96 100644
--- a/app/DataMapper/EmailTemplateDefaults.php
+++ b/app/DataMapper/EmailTemplateDefaults.php
@@ -162,11 +162,9 @@ class EmailTemplateDefaults
 
     public static function emailPurchaseOrderTemplate()
     {
-
         $purchase_order_message = '<p>$vendor<br><br>'.self::transformText('purchase_order_message').'</p><div class="center">$view_button</div>';
 
         return $purchase_order_message;
-
     }
 
     public static function emailPaymentTemplate()
@@ -249,6 +247,6 @@ class EmailTemplateDefaults
     {
         //preformat the string, removing trailing colons.
 
-        return str_replace(':', '$', rtrim( ctrans('texts.'.$string), ":"));
+        return str_replace(':', '$', rtrim(ctrans('texts.'.$string), ':'));
     }
 }
diff --git a/app/DataMapper/FreeCompanySettings.php b/app/DataMapper/FreeCompanySettings.php
index fceab936b176..cecea6bf606d 100644
--- a/app/DataMapper/FreeCompanySettings.php
+++ b/app/DataMapper/FreeCompanySettings.php
@@ -20,67 +20,123 @@ use stdClass;
 class FreeCompanySettings extends BaseSettings
 {
     use MakesHash;
+
     /*Group settings based on functionality*/
     public $credit_design_id = 'VolejRejNm';
+
     public $client_number_pattern = '';
+
     public $client_number_counter = 1;
+
     public $credit_number_pattern = '';
+
     public $credit_number_counter = 1;
+
     public $currency_id = '1';
+
     public $custom_value1 = '';
+
     public $custom_value2 = '';
+
     public $custom_value3 = '';
+
     public $custom_value4 = '';
+
     public $date_format_id = '';
+
 //    public $enabled_item_tax_rates          = 0;
     public $expense_number_pattern = '';
+
     public $expense_number_counter = 1;
+
     public $inclusive_taxes = false;
+
     public $invoice_design_id = 'VolejRejNm';
+
     public $invoice_number_pattern = '';
+
     public $invoice_number_counter = 1;
+
     public $invoice_taxes = 0;
+
     public $language_id = '';
+
     public $military_time = false;
+
     public $payment_number_pattern = '';
+
     public $payment_number_counter = 1;
+
     public $payment_terms = '';
+
     public $payment_type_id = '0';
+
     public $portal_design_id = '1';
+
     public $quote_design_id = 'VolejRejNm';
+
     public $quote_number_pattern = '';
+
     public $quote_number_counter = 1;
+
     public $timezone_id = '';
+
     public $show_currency_code = false;
+
     public $company_gateway_ids = '';
+
     public $task_number_pattern = '';
+
     public $task_number_counter = 1;
+
     public $tax_name1 = '';
+
     public $tax_rate1 = 0;
+
     public $tax_name2 = '';
+
     public $tax_rate2 = 0;
+
     public $tax_name3 = '';
+
     public $tax_rate3 = 0;
+
     public $ticket_number_pattern = '';
+
     public $ticket_number_counter = 1;
+
     public $translations;
+
     public $vendor_number_pattern = '';
+
     public $vendor_number_counter = 1;
 
     /* Company Meta data that we can use to build sub companies*/
 
     public $address1 = '';
+
     public $address2 = '';
+
     public $city = '';
+
     public $company_logo = '';
+
     public $country_id;
+
     public $email = '';
+
     public $id_number = '';
+
     public $name = '';
+
     public $phone = '';
+
     public $postal_code = '';
+
     public $state = '';
+
     public $vat_number = '';
+
     public $website = '';
 
     public static $casts = [
diff --git a/app/DataMapper/Transactions/BaseTransaction.php b/app/DataMapper/Transactions/BaseTransaction.php
index 88c49b8cdb3c..7546ebbae740 100644
--- a/app/DataMapper/Transactions/BaseTransaction.php
+++ b/app/DataMapper/Transactions/BaseTransaction.php
@@ -22,8 +22,7 @@ use App\Models\TransactionEvent;
  */
 class BaseTransaction implements TransactionInterface
 {
-    
-    public $event_id = TransactionEvent::INVOICE_MARK_PAID; 
+    public $event_id = TransactionEvent::INVOICE_MARK_PAID;
 
     public array $model = [
         'client_id',
@@ -56,7 +55,7 @@ class BaseTransaction implements TransactionInterface
     {
         // $invoice = $data['invoice'];
         // $payment = $data['payment'];
-        // $client = $data['client']; 
+        // $client = $data['client'];
         // $credit = $data['credit'];
         // $payment_request = $data['payment']['payment_request'];
         // $metadata = $data['metadata'];
@@ -95,6 +94,5 @@ class BaseTransaction implements TransactionInterface
         //     'credit_status' => $credit?->status_id,
         //     'timestamp' => time(),
         // ];
-
     }
 }
diff --git a/app/DataMapper/Transactions/ClientStatusTransaction.php b/app/DataMapper/Transactions/ClientStatusTransaction.php
index 0670c3f0fd89..0c28e4a8dc16 100644
--- a/app/DataMapper/Transactions/ClientStatusTransaction.php
+++ b/app/DataMapper/Transactions/ClientStatusTransaction.php
@@ -22,7 +22,5 @@ use App\Models\TransactionEvent;
  */
 class ClientStatusTransaction extends BaseTransaction implements TransactionInterface
 {
-    
-    public $event_id = TransactionEvent::CLIENT_STATUS; 
-
+    public $event_id = TransactionEvent::CLIENT_STATUS;
 }
diff --git a/app/DataMapper/Transactions/GatewayPaymentMadeTransaction.php b/app/DataMapper/Transactions/GatewayPaymentMadeTransaction.php
index 26af2acd3b65..f41d91b7a8b8 100644
--- a/app/DataMapper/Transactions/GatewayPaymentMadeTransaction.php
+++ b/app/DataMapper/Transactions/GatewayPaymentMadeTransaction.php
@@ -22,7 +22,5 @@ use App\Models\TransactionEvent;
  */
 class GatewayPaymentMadeTransaction extends BaseTransaction implements TransactionInterface
 {
-    
-    public $event_id = TransactionEvent::GATEWAY_PAYMENT_MADE; 
-
+    public $event_id = TransactionEvent::GATEWAY_PAYMENT_MADE;
 }
diff --git a/app/DataMapper/Transactions/InvoiceCancelledTransaction.php b/app/DataMapper/Transactions/InvoiceCancelledTransaction.php
index 1e7438513285..9dcd28b09b03 100644
--- a/app/DataMapper/Transactions/InvoiceCancelledTransaction.php
+++ b/app/DataMapper/Transactions/InvoiceCancelledTransaction.php
@@ -22,7 +22,5 @@ use App\Models\TransactionEvent;
  */
 class InvoiceCancelledTransaction extends BaseTransaction implements TransactionInterface
 {
-    
-    public $event_id = TransactionEvent::INVOICE_CANCELLED; 
-
+    public $event_id = TransactionEvent::INVOICE_CANCELLED;
 }
diff --git a/app/DataMapper/Transactions/InvoiceDeletedTransaction.php b/app/DataMapper/Transactions/InvoiceDeletedTransaction.php
index 7a1d6c89ae35..a7ef833ad764 100644
--- a/app/DataMapper/Transactions/InvoiceDeletedTransaction.php
+++ b/app/DataMapper/Transactions/InvoiceDeletedTransaction.php
@@ -22,7 +22,5 @@ use App\Models\TransactionEvent;
  */
 class InvoiceDeletedTransaction extends BaseTransaction implements TransactionInterface
 {
-    
-    public $event_id = TransactionEvent::INVOICE_DELETED; 
-
+    public $event_id = TransactionEvent::INVOICE_DELETED;
 }
diff --git a/app/DataMapper/Transactions/InvoiceFeeAppliedTransaction.php b/app/DataMapper/Transactions/InvoiceFeeAppliedTransaction.php
index fdc9b4f67f7d..ab3a41fe9e3f 100644
--- a/app/DataMapper/Transactions/InvoiceFeeAppliedTransaction.php
+++ b/app/DataMapper/Transactions/InvoiceFeeAppliedTransaction.php
@@ -22,7 +22,5 @@ use App\Models\TransactionEvent;
  */
 class InvoiceFeeAppliedTransaction extends BaseTransaction implements TransactionInterface
 {
-    
-    public $event_id = TransactionEvent::INVOICE_FEE_APPLIED; 
-
+    public $event_id = TransactionEvent::INVOICE_FEE_APPLIED;
 }
diff --git a/app/DataMapper/Transactions/InvoicePaymentTransaction.php b/app/DataMapper/Transactions/InvoicePaymentTransaction.php
index af1c86f1d2cc..43c39d365288 100644
--- a/app/DataMapper/Transactions/InvoicePaymentTransaction.php
+++ b/app/DataMapper/Transactions/InvoicePaymentTransaction.php
@@ -22,7 +22,5 @@ use App\Models\TransactionEvent;
  */
 class InvoicePaymentTransaction extends BaseTransaction implements TransactionInterface
 {
-    
-    public $event_id = TransactionEvent::INVOICE_PAYMENT_APPLIED; 
-
+    public $event_id = TransactionEvent::INVOICE_PAYMENT_APPLIED;
 }
diff --git a/app/DataMapper/Transactions/InvoiceReversalTransaction.php b/app/DataMapper/Transactions/InvoiceReversalTransaction.php
index 4577b99434d8..afe2fb6dbf0c 100644
--- a/app/DataMapper/Transactions/InvoiceReversalTransaction.php
+++ b/app/DataMapper/Transactions/InvoiceReversalTransaction.php
@@ -22,7 +22,5 @@ use App\Models\TransactionEvent;
  */
 class InvoiceReversalTransaction extends BaseTransaction implements TransactionInterface
 {
-    
-    public $event_id = TransactionEvent::INVOICE_REVERSED; 
-
+    public $event_id = TransactionEvent::INVOICE_REVERSED;
 }
diff --git a/app/DataMapper/Transactions/InvoiceUpdatedTransaction.php b/app/DataMapper/Transactions/InvoiceUpdatedTransaction.php
index 675df7c230c7..fb0343aa9d15 100644
--- a/app/DataMapper/Transactions/InvoiceUpdatedTransaction.php
+++ b/app/DataMapper/Transactions/InvoiceUpdatedTransaction.php
@@ -22,7 +22,5 @@ use App\Models\TransactionEvent;
  */
 class InvoiceUpdatedTransaction extends BaseTransaction implements TransactionInterface
 {
-    
-    public $event_id = TransactionEvent::INVOICE_UPDATED; 
-
+    public $event_id = TransactionEvent::INVOICE_UPDATED;
 }
diff --git a/app/DataMapper/Transactions/MarkPaidTransaction.php b/app/DataMapper/Transactions/MarkPaidTransaction.php
index b1a5c2f6425f..78506c0c1503 100644
--- a/app/DataMapper/Transactions/MarkPaidTransaction.php
+++ b/app/DataMapper/Transactions/MarkPaidTransaction.php
@@ -22,7 +22,5 @@ use App\Models\TransactionEvent;
  */
 class MarkPaidTransaction extends BaseTransaction implements TransactionInterface
 {
-    
-    public $event_id = TransactionEvent::INVOICE_MARK_PAID; 
-
+    public $event_id = TransactionEvent::INVOICE_MARK_PAID;
 }
diff --git a/app/DataMapper/Transactions/PaymentAppliedTransaction.php b/app/DataMapper/Transactions/PaymentAppliedTransaction.php
index c00e3a828d1a..b0f9a32172d0 100644
--- a/app/DataMapper/Transactions/PaymentAppliedTransaction.php
+++ b/app/DataMapper/Transactions/PaymentAppliedTransaction.php
@@ -22,7 +22,5 @@ use App\Models\TransactionEvent;
  */
 class PaymentAppliedTransaction extends BaseTransaction implements TransactionInterface
 {
-    
-    public $event_id = TransactionEvent::PAYMENT_APPLIED; 
-
+    public $event_id = TransactionEvent::PAYMENT_APPLIED;
 }
diff --git a/app/DataMapper/Transactions/PaymentDeletedTransaction.php b/app/DataMapper/Transactions/PaymentDeletedTransaction.php
index f1d6e51cd8dc..e9cca01cce16 100644
--- a/app/DataMapper/Transactions/PaymentDeletedTransaction.php
+++ b/app/DataMapper/Transactions/PaymentDeletedTransaction.php
@@ -22,7 +22,5 @@ use App\Models\TransactionEvent;
  */
 class PaymentDeletedTransaction extends BaseTransaction implements TransactionInterface
 {
-    
-    public $event_id = TransactionEvent::PAYMENT_DELETED; 
-
+    public $event_id = TransactionEvent::PAYMENT_DELETED;
 }
diff --git a/app/DataMapper/Transactions/PaymentFailedTransaction.php b/app/DataMapper/Transactions/PaymentFailedTransaction.php
index a215c08815ac..d46bd83b16ff 100644
--- a/app/DataMapper/Transactions/PaymentFailedTransaction.php
+++ b/app/DataMapper/Transactions/PaymentFailedTransaction.php
@@ -22,7 +22,5 @@ use App\Models\TransactionEvent;
  */
 class PaymentFailedTransaction extends BaseTransaction implements TransactionInterface
 {
-    
-    public $event_id = TransactionEvent::PAYMENT_FAILED; 
-
+    public $event_id = TransactionEvent::PAYMENT_FAILED;
 }
diff --git a/app/DataMapper/Transactions/PaymentMadeTransaction.php b/app/DataMapper/Transactions/PaymentMadeTransaction.php
index a96b923eb746..427f59edc16a 100644
--- a/app/DataMapper/Transactions/PaymentMadeTransaction.php
+++ b/app/DataMapper/Transactions/PaymentMadeTransaction.php
@@ -22,7 +22,5 @@ use App\Models\TransactionEvent;
  */
 class PaymentMadeTransaction extends BaseTransaction implements TransactionInterface
 {
-    
-    public $event_id = TransactionEvent::PAYMENT_MADE; 
-
+    public $event_id = TransactionEvent::PAYMENT_MADE;
 }
diff --git a/app/DataMapper/Transactions/PaymentRefundedTransaction.php b/app/DataMapper/Transactions/PaymentRefundedTransaction.php
index a7c696d8e3b8..f2b2b92ad587 100644
--- a/app/DataMapper/Transactions/PaymentRefundedTransaction.php
+++ b/app/DataMapper/Transactions/PaymentRefundedTransaction.php
@@ -22,7 +22,5 @@ use App\Models\TransactionEvent;
  */
 class PaymentRefundedTransaction extends BaseTransaction implements TransactionInterface
 {
-    
-    public $event_id = TransactionEvent::PAYMENT_REFUND; 
-
+    public $event_id = TransactionEvent::PAYMENT_REFUND;
 }
diff --git a/app/Events/Client/ClientWasRestored.php b/app/Events/Client/ClientWasRestored.php
index 4a1fc529736b..41cf7fd04e50 100644
--- a/app/Events/Client/ClientWasRestored.php
+++ b/app/Events/Client/ClientWasRestored.php
@@ -28,7 +28,7 @@ class ClientWasRestored
     public $client;
 
     public $fromDeleted;
-    
+
     public $company;
 
     public $event_vars;
diff --git a/app/Events/Credit/CreditWasEmailed.php b/app/Events/Credit/CreditWasEmailed.php
index fc567516c6b0..3c17c71da343 100644
--- a/app/Events/Credit/CreditWasEmailed.php
+++ b/app/Events/Credit/CreditWasEmailed.php
@@ -28,6 +28,7 @@ class CreditWasEmailed
     public $event_vars;
 
     public $template;
+
     /**
      * Create a new event instance.
      *
diff --git a/app/Events/Credit/CreditWasMarkedSent.php b/app/Events/Credit/CreditWasMarkedSent.php
index 48f0ca791a48..60ce1a4e84cf 100644
--- a/app/Events/Credit/CreditWasMarkedSent.php
+++ b/app/Events/Credit/CreditWasMarkedSent.php
@@ -21,6 +21,7 @@ use Illuminate\Queue\SerializesModels;
 class CreditWasMarkedSent
 {
     use SerializesModels;
+
     /**
      * @var Credit
      */
diff --git a/app/Events/Credit/CreditWasRestored.php b/app/Events/Credit/CreditWasRestored.php
index 1f515ac41625..cb564bc006ca 100644
--- a/app/Events/Credit/CreditWasRestored.php
+++ b/app/Events/Credit/CreditWasRestored.php
@@ -32,6 +32,7 @@ class CreditWasRestored
     public $event_vars;
 
     public $fromDeleted;
+
     /**
      * Create a new event instance.
      *
diff --git a/app/Events/Design/DesignWasRestored.php b/app/Events/Design/DesignWasRestored.php
index bca0757aa152..42525602fa86 100644
--- a/app/Events/Design/DesignWasRestored.php
+++ b/app/Events/Design/DesignWasRestored.php
@@ -32,6 +32,7 @@ class DesignWasRestored
     public $event_vars;
 
     public $fromDeleted;
+
     /**
      * Create a new event instance.
      *
diff --git a/app/Events/Document/DocumentWasRestored.php b/app/Events/Document/DocumentWasRestored.php
index 4941db97cfe1..3fc9580e7828 100644
--- a/app/Events/Document/DocumentWasRestored.php
+++ b/app/Events/Document/DocumentWasRestored.php
@@ -32,6 +32,7 @@ class DocumentWasRestored
     public $event_vars;
 
     public $fromDeleted;
+
     /**
      * Create a new event instance.
      *
diff --git a/app/Events/Expense/ExpenseWasRestored.php b/app/Events/Expense/ExpenseWasRestored.php
index 2c74bf5e6d86..5341329823c1 100644
--- a/app/Events/Expense/ExpenseWasRestored.php
+++ b/app/Events/Expense/ExpenseWasRestored.php
@@ -32,6 +32,7 @@ class ExpenseWasRestored
     public $event_vars;
 
     public $fromDeleted;
+
     /**
      * Create a new event instance.
      *
diff --git a/app/Events/Invoice/InvoiceWasRestored.php b/app/Events/Invoice/InvoiceWasRestored.php
index d848d4cb0e59..489e47b1a173 100644
--- a/app/Events/Invoice/InvoiceWasRestored.php
+++ b/app/Events/Invoice/InvoiceWasRestored.php
@@ -32,7 +32,7 @@ class InvoiceWasRestored
     public $company;
 
     public $event_vars;
-    
+
     /**
      * Create a new event instance.
      *
diff --git a/app/Events/Payment/PaymentWasRestored.php b/app/Events/Payment/PaymentWasRestored.php
index 390e3e193c92..378e3a956613 100644
--- a/app/Events/Payment/PaymentWasRestored.php
+++ b/app/Events/Payment/PaymentWasRestored.php
@@ -26,8 +26,11 @@ class PaymentWasRestored
      * @var Payment
      */
     public $payment;
+
     public $fromDeleted;
+
     public $company;
+
     public $event_vars;
 
     /**
diff --git a/app/Events/Product/ProductWasRestored.php b/app/Events/Product/ProductWasRestored.php
index 9949bf21b396..16432c6ce8b3 100644
--- a/app/Events/Product/ProductWasRestored.php
+++ b/app/Events/Product/ProductWasRestored.php
@@ -32,6 +32,7 @@ class ProductWasRestored
     public $event_vars;
 
     public $fromDeleted;
+
     /**
      * Create a new event instance.
      *
diff --git a/app/Events/PurchaseOrder/PurchaseOrderWasAccepted.php b/app/Events/PurchaseOrder/PurchaseOrderWasAccepted.php
index ed2147b5fdb1..d903911cfda9 100644
--- a/app/Events/PurchaseOrder/PurchaseOrderWasAccepted.php
+++ b/app/Events/PurchaseOrder/PurchaseOrderWasAccepted.php
@@ -34,6 +34,7 @@ class PurchaseOrderWasAccepted
     public $event_vars;
 
     public $contact;
+
     /**
      * Create a new event instance.
      *
diff --git a/app/Events/PurchaseOrder/PurchaseOrderWasRestored.php b/app/Events/PurchaseOrder/PurchaseOrderWasRestored.php
index c957c52a75b9..c0a40f7838a4 100644
--- a/app/Events/PurchaseOrder/PurchaseOrderWasRestored.php
+++ b/app/Events/PurchaseOrder/PurchaseOrderWasRestored.php
@@ -32,6 +32,7 @@ class PurchaseOrderWasRestored
     public $event_vars;
 
     public $fromDeleted;
+
     /**
      * Create a new event instance.
      *
diff --git a/app/Events/Quote/QuoteWasEmailed.php b/app/Events/Quote/QuoteWasEmailed.php
index 02f6ea7c376b..5cd9ad36a19e 100644
--- a/app/Events/Quote/QuoteWasEmailed.php
+++ b/app/Events/Quote/QuoteWasEmailed.php
@@ -30,6 +30,7 @@ class QuoteWasEmailed
     public $event_vars;
 
     public $template;
+
     /**
      * Create a new event instance.
      *
diff --git a/app/Events/Quote/QuoteWasRestored.php b/app/Events/Quote/QuoteWasRestored.php
index 162cec73d7d3..4f4f550e4e8f 100644
--- a/app/Events/Quote/QuoteWasRestored.php
+++ b/app/Events/Quote/QuoteWasRestored.php
@@ -29,6 +29,7 @@ class QuoteWasRestored
     public $event_vars;
 
     public $fromDeleted;
+
     /**
      * Create a new event instance.
      *
diff --git a/app/Events/RecurringExpense/RecurringExpenseWasRestored.php b/app/Events/RecurringExpense/RecurringExpenseWasRestored.php
index 7134e211800c..903c041c49eb 100644
--- a/app/Events/RecurringExpense/RecurringExpenseWasRestored.php
+++ b/app/Events/RecurringExpense/RecurringExpenseWasRestored.php
@@ -32,6 +32,7 @@ class RecurringExpenseWasRestored
     public $event_vars;
 
     public $fromDeleted;
+
     /**
      * Create a new event instance.
      *
diff --git a/app/Events/RecurringInvoice/RecurringInvoiceWasRestored.php b/app/Events/RecurringInvoice/RecurringInvoiceWasRestored.php
index e6441eae6143..4e31892c1f1c 100644
--- a/app/Events/RecurringInvoice/RecurringInvoiceWasRestored.php
+++ b/app/Events/RecurringInvoice/RecurringInvoiceWasRestored.php
@@ -32,7 +32,7 @@ class RecurringInvoiceWasRestored
     public $company;
 
     public $event_vars;
-    
+
     /**
      * Create a new event instance.
      *
diff --git a/app/Events/RecurringQuote/RecurringQuoteWasRestored.php b/app/Events/RecurringQuote/RecurringQuoteWasRestored.php
index 400bf11aa858..d84bc692e562 100644
--- a/app/Events/RecurringQuote/RecurringQuoteWasRestored.php
+++ b/app/Events/RecurringQuote/RecurringQuoteWasRestored.php
@@ -32,7 +32,7 @@ class RecurringQuoteWasRestored
     public $company;
 
     public $event_vars;
-    
+
     /**
      * Create a new event instance.
      *
diff --git a/app/Events/Subscription/SubscriptionWasCreated.php b/app/Events/Subscription/SubscriptionWasCreated.php
index 67d061f6738d..1da537bbbf1f 100644
--- a/app/Events/Subscription/SubscriptionWasCreated.php
+++ b/app/Events/Subscription/SubscriptionWasCreated.php
@@ -2,8 +2,8 @@
 
 namespace App\Events\Subscription;
 
-use App\Models\Subscription;
 use App\Models\Company;
+use App\Models\Subscription;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Broadcasting\PresenceChannel;
diff --git a/app/Events/Subscription/SubscriptionWasRestored.php b/app/Events/Subscription/SubscriptionWasRestored.php
index d205a5c2f702..54029013febb 100644
--- a/app/Events/Subscription/SubscriptionWasRestored.php
+++ b/app/Events/Subscription/SubscriptionWasRestored.php
@@ -32,6 +32,7 @@ class SubscriptionWasRestored
     public $event_vars;
 
     public $fromDeleted;
+
     /**
      * Create a new event instance.
      *
diff --git a/app/Events/Task/TaskWasRestored.php b/app/Events/Task/TaskWasRestored.php
index a6c68e5d2367..54f9b087e197 100644
--- a/app/Events/Task/TaskWasRestored.php
+++ b/app/Events/Task/TaskWasRestored.php
@@ -32,6 +32,7 @@ class TaskWasRestored
     public $event_vars;
 
     public $fromDeleted;
+
     /**
      * Create a new event instance.
      *
diff --git a/app/Events/Vendor/VendorWasRestored.php b/app/Events/Vendor/VendorWasRestored.php
index 00f44cd8ae84..9d402240b504 100644
--- a/app/Events/Vendor/VendorWasRestored.php
+++ b/app/Events/Vendor/VendorWasRestored.php
@@ -32,6 +32,7 @@ class VendorWasRestored
     public $event_vars;
 
     public $fromDeleted;
+
     /**
      * Create a new event instance.
      *
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index f9bc844a31da..9bfbc70930c5 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -62,6 +62,7 @@ class Handler extends ExceptionHandler
      * @var array
      */
     protected $dontFlash = [
+        'current_password',
         'password',
         'password_confirmation',
     ];
@@ -77,37 +78,33 @@ class Handler extends ExceptionHandler
     {
         if (! Schema::hasTable('accounts')) {
             info('account table not found');
+
             return;
         }
 
-        if(Ninja::isHosted() && !($exception instanceof ValidationException)){
-
+        if (Ninja::isHosted() && ! ($exception instanceof ValidationException)) {
             app('sentry')->configureScope(function (Scope $scope): void {
-
                 $name = 'hosted@invoiceninja.com';
 
-                if(auth()->guard('contact') && auth()->guard('contact')->user()){
-                    $name = "Contact = ".auth()->guard('contact')->user()->email;
+                if (auth()->guard('contact') && auth()->guard('contact')->user()) {
+                    $name = 'Contact = '.auth()->guard('contact')->user()->email;
                     $key = auth()->guard('contact')->user()->company->account->key;
-                }
-                elseif (auth()->guard('user') && auth()->guard('user')->user()){
-                    $name = "Admin = ".auth()->guard('user')->user()->email;                    
+                } elseif (auth()->guard('user') && auth()->guard('user')->user()) {
+                    $name = 'Admin = '.auth()->guard('user')->user()->email;
                     $key = auth()->user()->account->key;
-                } 
-                else
+                } else {
                     $key = 'Anonymous';
-                
-                 $scope->setUser([
-                        'id'    => $key,
-                        'email' => 'hosted@invoiceninja.com',
-                        'name'  => $name,
-                    ]);
+                }
+
+                $scope->setUser([
+                    'id'    => $key,
+                    'email' => 'hosted@invoiceninja.com',
+                    'name'  => $name,
+                ]);
             });
 
-                app('sentry')->captureException($exception);
-
-        }
-        elseif (app()->bound('sentry') && $this->shouldReport($exception)) {
+            app('sentry')->captureException($exception);
+        } elseif (app()->bound('sentry') && $this->shouldReport($exception)) {
             app('sentry')->configureScope(function (Scope $scope): void {
                 if (auth()->guard('contact') && auth()->guard('contact')->user() && auth()->guard('contact')->user()->company->account->report_errors) {
                     $scope->setUser([
@@ -130,28 +127,33 @@ class Handler extends ExceptionHandler
         }
 
         parent::report($exception);
-
     }
 
     private function validException($exception)
     {
-        if (strpos($exception->getMessage(), 'file_put_contents') !== false) 
+        if (strpos($exception->getMessage(), 'file_put_contents') !== false) {
             return false;
+        }
 
-        if (strpos($exception->getMessage(), 'Permission denied') !== false) 
-            return false;
-        
-        if (strpos($exception->getMessage(), 'flock') !== false) 
+        if (strpos($exception->getMessage(), 'Permission denied') !== false) {
             return false;
+        }
 
-        if (strpos($exception->getMessage(), 'expects parameter 1 to be resource') !== false) 
+        if (strpos($exception->getMessage(), 'flock') !== false) {
             return false;
+        }
 
-        if (strpos($exception->getMessage(), 'fwrite()') !== false)
+        if (strpos($exception->getMessage(), 'expects parameter 1 to be resource') !== false) {
             return false;
-        
-        if(strpos($exception->getMessage(), 'LockableFile') !== false)
+        }
+
+        if (strpos($exception->getMessage(), 'fwrite()') !== false) {
             return false;
+        }
+
+        if (strpos($exception->getMessage(), 'LockableFile') !== false) {
+            return false;
+        }
 
         return true;
     }
@@ -168,11 +170,11 @@ class Handler extends ExceptionHandler
     {
         if ($exception instanceof ModelNotFoundException && $request->expectsJson()) {
             return response()->json(['message'=>$exception->getMessage()], 400);
-        }elseif($exception instanceof InternalPDFFailure && $request->expectsJson()){
+        } elseif ($exception instanceof InternalPDFFailure && $request->expectsJson()) {
             return response()->json(['message' => $exception->getMessage()], 500);
-        }elseif($exception instanceof PhantomPDFFailure && $request->expectsJson()){
+        } elseif ($exception instanceof PhantomPDFFailure && $request->expectsJson()) {
             return response()->json(['message' => $exception->getMessage()], 500);
-        }elseif($exception instanceof FilePermissionsFailure) {
+        } elseif ($exception instanceof FilePermissionsFailure) {
             return response()->json(['message' => $exception->getMessage()], 500);
         } elseif ($exception instanceof ThrottleRequestsException && $request->expectsJson()) {
             return response()->json(['message'=>'Too many requests'], 429);
@@ -202,7 +204,7 @@ class Handler extends ExceptionHandler
             return response()->json(['message' => $exception->getMessage()], 400);
         } elseif ($exception instanceof StripeConnectFailure) {
             return response()->json(['message' => $exception->getMessage()], 400);
-        } 
+        }
 
         return parent::render($request, $exception);
     }
diff --git a/app/Exceptions/PaymentFailed.php b/app/Exceptions/PaymentFailed.php
index b509df02fa77..108e1071f6dc 100644
--- a/app/Exceptions/PaymentFailed.php
+++ b/app/Exceptions/PaymentFailed.php
@@ -14,6 +14,7 @@ class PaymentFailed extends Exception
     public function render($request)
     {
         if (auth()->guard('contact')->user() || ($request->has('cko-session-id') && $request->query('cko-session-id') )) {
+
             return render('gateways.unsuccessful', [
                 'message' => $this->getMessage(),
                 'code' => $this->getCode(),
diff --git a/app/Exceptions/PaymentRefundFailed.php b/app/Exceptions/PaymentRefundFailed.php
index 94a6fe455e01..d2be5cadc8b2 100644
--- a/app/Exceptions/PaymentRefundFailed.php
+++ b/app/Exceptions/PaymentRefundFailed.php
@@ -30,12 +30,12 @@ class PaymentRefundFailed extends Exception
         // $msg = 'Unable to refund the transaction';
         $msg = ctrans('texts.warning_local_refund');
 
-        if($this->getMessage() && strlen($this->getMessage()) >=1 )
+        if ($this->getMessage() && strlen($this->getMessage()) >= 1) {
             $msg = $this->getMessage();
+        }
 
         return response()->json([
-           'message' => $msg,
-       ], 401);
-
+            'message' => $msg,
+        ], 401);
     }
 }
diff --git a/app/Exceptions/SystemError.php b/app/Exceptions/SystemError.php
index f15cf8cf1333..03b0aaabe0c7 100644
--- a/app/Exceptions/SystemError.php
+++ b/app/Exceptions/SystemError.php
@@ -13,12 +13,9 @@ class SystemError extends Exception
 
     public function render($request)
     {
-
         return view('errors.guest', [
             'message' => $this->getMessage(),
             'code' => $this->getCode(),
         ]);
-        
-
     }
 }
diff --git a/app/Export/CSV/BaseExport.php b/app/Export/CSV/BaseExport.php
index 250bba51d10c..4d0271b767d3 100644
--- a/app/Export/CSV/BaseExport.php
+++ b/app/Export/CSV/BaseExport.php
@@ -15,28 +15,22 @@ use Illuminate\Support\Carbon;
 
 class BaseExport
 {
-
     protected function addDateRange($query)
     {
-
         $date_range = $this->input['date_range'];
 
-        if(array_key_exists('date_key', $this->input) && strlen($this->input['date_key']) > 1)
+        if (array_key_exists('date_key', $this->input) && strlen($this->input['date_key']) > 1) {
             $this->date_key = $this->input['date_key'];
-        
-        try{
-
-            $custom_start_date = Carbon::parse($this->input['start_date']);
-            $custom_end_date = Carbon::parse($this->input['end_date']);    
-
         }
-        catch(\Exception $e){
 
+        try {
+            $custom_start_date = Carbon::parse($this->input['start_date']);
+            $custom_end_date = Carbon::parse($this->input['end_date']);
+        } catch (\Exception $e) {
             $custom_start_date = now()->startOfYear();
             $custom_end_date = now();
-
         }
-        
+
         switch ($date_range) {
 
             case 'all':
@@ -61,26 +55,23 @@ class BaseExport
                 return $query->whereBetween($this->date_key, [now()->startOfYear(), now()])->orderBy($this->date_key, 'ASC');
 
         }
-
     }
 
     protected function buildHeader() :array
     {
-
         $header = [];
 
-        foreach($this->input['report_keys'] as $value){
+        foreach ($this->input['report_keys'] as $value) {
+            $key = array_search($value, $this->entity_keys);
 
-            $key = array_search ($value, $this->entity_keys);
-            
-            $key = str_replace("item.", "", $key);
-            $key = str_replace("invoice.", "", $key);
-            $key = str_replace("client.", "", $key);
-            $key = str_replace("contact.", "", $key);
+            $key = str_replace('item.', '', $key);
+            $key = str_replace('invoice.', '', $key);
+            $key = str_replace('client.', '', $key);
+            $key = str_replace('contact.', '', $key);
 
             $header[] = ctrans("texts.{$key}");
         }
 
         return $header;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Export/CSV/ClientExport.php b/app/Export/CSV/ClientExport.php
index b4d4df64e67e..5ba69ed72622 100644
--- a/app/Export/CSV/ClientExport.php
+++ b/app/Export/CSV/ClientExport.php
@@ -17,9 +17,9 @@ use App\Models\Company;
 use App\Transformers\ClientContactTransformer;
 use App\Transformers\ClientTransformer;
 use App\Utils\Ninja;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\App;
 use League\Csv\Writer;
-use Illuminate\Support\Carbon;
 
 class ClientExport extends BaseExport
 {
@@ -95,7 +95,6 @@ class ClientExport extends BaseExport
 
     public function run()
     {
-
         MultiDB::setDb($this->company->db);
         App::forgetInstance('translator');
         App::setLocale($this->company->locale());
@@ -105,8 +104,9 @@ class ClientExport extends BaseExport
         //load the CSV document from a string
         $this->csv = Writer::createFromString();
 
-        if(count($this->input['report_keys']) == 0)
+        if (count($this->input['report_keys']) == 0) {
             $this->input['report_keys'] = array_values($this->entity_keys);
+        }
 
         //insert the header
         $this->csv->insertOne($this->buildHeader());
@@ -114,69 +114,65 @@ class ClientExport extends BaseExport
         $query = Client::query()->with('contacts')
                                 ->withTrashed()
                                 ->where('company_id', $this->company->id)
-                                ->where('is_deleted',0);
-    
+                                ->where('is_deleted', 0);
+
         $query = $this->addDateRange($query);
 
         $query->cursor()
-              ->each(function ($client){
-                        $this->csv->insertOne($this->buildRow($client)); 
-                    });
-
-
-        return $this->csv->toString(); 
+              ->each(function ($client) {
+                  $this->csv->insertOne($this->buildRow($client));
+              });
 
+        return $this->csv->toString();
     }
 
     private function buildRow(Client $client) :array
     {
-
         $transformed_contact = false;
 
         $transformed_client = $this->client_transformer->transform($client);
 
-        if($contact = $client->contacts()->first())
+        if ($contact = $client->contacts()->first()) {
             $transformed_contact = $this->contact_transformer->transform($contact);
+        }
 
         $entity = [];
 
-        foreach(array_values($this->input['report_keys']) as $key){
+        foreach (array_values($this->input['report_keys']) as $key) {
+            $parts = explode('.', $key);
 
-            $parts = explode(".",$key);
-            
             $keyval = array_search($key, $this->entity_keys);
 
-            if($parts[0] == 'client' && array_key_exists($parts[1], $transformed_client)) {
+            if ($parts[0] == 'client' && array_key_exists($parts[1], $transformed_client)) {
                 $entity[$keyval] = $transformed_client[$parts[1]];
-            }
-            elseif($parts[0] == 'contact' && array_key_exists($parts[1], $transformed_contact)) {
+            } elseif ($parts[0] == 'contact' && array_key_exists($parts[1], $transformed_contact)) {
                 $entity[$keyval] = $transformed_contact[$parts[1]];
+            } else {
+                $entity[$keyval] = '';
             }
-            else 
-                $entity[$keyval] = "";
-
         }
 
         return $this->decorateAdvancedFields($client, $entity);
-
     }
 
     private function decorateAdvancedFields(Client $client, array $entity) :array
     {
+        if (in_array('client.country_id', $this->input['report_keys'])) {
+            $entity['country'] = $client->country ? ctrans("texts.country_{$client->country->name}") : '';
+        }
 
-        if(in_array('client.country_id', $this->input['report_keys']))
-            $entity['country'] = $client->country ? ctrans("texts.country_{$client->country->name}") : ""; 
+        if (in_array('client.shipping_country_id', $this->input['report_keys'])) {
+            $entity['shipping_country'] = $client->shipping_country ? ctrans("texts.country_{$client->shipping_country->name}") : '';
+        }
 
-        if(in_array('client.shipping_country_id', $this->input['report_keys']))
-            $entity['shipping_country'] = $client->shipping_country ? ctrans("texts.country_{$client->shipping_country->name}") : ""; 
-
-        if(in_array('client.currency', $this->input['report_keys']))
+        if (in_array('client.currency', $this->input['report_keys'])) {
             $entity['currency'] = $client->currency() ? $client->currency()->code : $client->company->currency()->code;
+        }
 
-        if(in_array('client.industry_id', $this->input['report_keys']))
-            $entity['industry_id'] = $client->industry ? ctrans("texts.industry_{$client->industry->name}") : ""; 
+        if (in_array('client.industry_id', $this->input['report_keys'])) {
+            $entity['industry_id'] = $client->industry ? ctrans("texts.industry_{$client->industry->name}") : '';
+        }
 
         return $entity;
     }
-
 }
diff --git a/app/Export/CSV/ContactExport.php b/app/Export/CSV/ContactExport.php
index 1c938b187f46..a96974cba829 100644
--- a/app/Export/CSV/ContactExport.php
+++ b/app/Export/CSV/ContactExport.php
@@ -91,7 +91,6 @@ class ContactExport extends BaseExport
 
     public function run()
     {
-
         MultiDB::setDb($this->company->db);
         App::forgetInstance('translator');
         App::setLocale($this->company->locale());
@@ -101,8 +100,9 @@ class ContactExport extends BaseExport
         //load the CSV document from a string
         $this->csv = Writer::createFromString();
 
-        if(count($this->input['report_keys']) == 0)
+        if (count($this->input['report_keys']) == 0) {
             $this->input['report_keys'] = array_values($this->entity_keys);
+        }
 
         //insert the header
         $this->csv->insertOne($this->buildHeader());
@@ -112,19 +112,15 @@ class ContactExport extends BaseExport
 
         $query = $this->addDateRange($query);
 
-        $query->cursor()->each(function ($contact){
-
-            $this->csv->insertOne($this->buildRow($contact)); 
-
+        $query->cursor()->each(function ($contact) {
+            $this->csv->insertOne($this->buildRow($contact));
         });
 
-        return $this->csv->toString(); 
-
+        return $this->csv->toString();
     }
 
     private function buildRow(ClientContact $contact) :array
     {
-
         $transformed_contact = false;
 
         $transformed_client = $this->client_transformer->transform($contact->client);
@@ -132,41 +128,40 @@ class ContactExport extends BaseExport
 
         $entity = [];
 
-        foreach(array_values($this->input['report_keys']) as $key){
-
-            $parts = explode(".",$key);
+        foreach (array_values($this->input['report_keys']) as $key) {
+            $parts = explode('.', $key);
             $keyval = array_search($key, $this->entity_keys);
 
-            if($parts[0] == 'client' && array_key_exists($parts[1], $transformed_client)) {
+            if ($parts[0] == 'client' && array_key_exists($parts[1], $transformed_client)) {
                 $entity[$keyval] = $transformed_client[$parts[1]];
-            }
-            elseif($parts[0] == 'contact' && array_key_exists($parts[1], $transformed_contact)) {
+            } elseif ($parts[0] == 'contact' && array_key_exists($parts[1], $transformed_contact)) {
                 $entity[$keyval] = $transformed_contact[$parts[1]];
+            } else {
+                $entity[$keyval] = '';
             }
-            else 
-                $entity[$keyval] = "";
         }
 
         return $this->decorateAdvancedFields($contact->client, $entity);
-
     }
 
     private function decorateAdvancedFields(Client $client, array $entity) :array
     {
+        if (in_array('client.country_id', $this->input['report_keys'])) {
+            $entity['country'] = $client->country ? ctrans("texts.country_{$client->country->name}") : '';
+        }
 
-        if(in_array('client.country_id', $this->input['report_keys']))
-            $entity['country'] = $client->country ? ctrans("texts.country_{$client->country->name}") : ""; 
+        if (in_array('client.shipping_country_id', $this->input['report_keys'])) {
+            $entity['shipping_country'] = $client->shipping_country ? ctrans("texts.country_{$client->shipping_country->name}") : '';
+        }
 
-        if(in_array('client.shipping_country_id', $this->input['report_keys']))
-            $entity['shipping_country'] = $client->shipping_country ? ctrans("texts.country_{$client->shipping_country->name}") : ""; 
-
-        if(in_array('client.currency', $this->input['report_keys']))
+        if (in_array('client.currency', $this->input['report_keys'])) {
             $entity['currency'] = $client->currency() ? $client->currency()->code : $client->company->currency()->code;
+        }
 
-        if(in_array('client.industry_id', $this->input['report_keys']))
-            $entity['industry_id'] = $client->industry ? ctrans("texts.industry_{$client->industry->name}") : ""; 
+        if (in_array('client.industry_id', $this->input['report_keys'])) {
+            $entity['industry_id'] = $client->industry ? ctrans("texts.industry_{$client->industry->name}") : '';
+        }
 
         return $entity;
     }
-
 }
diff --git a/app/Export/CSV/CreditExport.php b/app/Export/CSV/CreditExport.php
index e28711bfe111..8a552a991300 100644
--- a/app/Export/CSV/CreditExport.php
+++ b/app/Export/CSV/CreditExport.php
@@ -65,7 +65,7 @@ class CreditExport extends BaseExport
         'tax_rate3' => 'tax_rate3',
         'terms' => 'terms',
         'total_taxes' => 'total_taxes',
-        'currency' => 'currency'
+        'currency' => 'currency',
     ];
 
     private array $decorate_keys = [
@@ -84,7 +84,6 @@ class CreditExport extends BaseExport
 
     public function run()
     {
-
         MultiDB::setDb($this->company->db);
         App::forgetInstance('translator');
         App::setLocale($this->company->locale());
@@ -94,71 +93,69 @@ class CreditExport extends BaseExport
         //load the CSV document from a string
         $this->csv = Writer::createFromString();
 
-        if(count($this->input['report_keys']) == 0)
+        if (count($this->input['report_keys']) == 0) {
             $this->input['report_keys'] = array_values($this->entity_keys);
-        
+        }
+
         //insert the header
         $this->csv->insertOne($this->buildHeader());
 
         $query = Credit::query()
                         ->withTrashed()
                         ->with('client')->where('company_id', $this->company->id)
-                        ->where('is_deleted',0);
+                        ->where('is_deleted', 0);
 
         $query = $this->addDateRange($query);
 
         $query->cursor()
-            ->each(function ($credit){
-
-                $this->csv->insertOne($this->buildRow($credit)); 
-
-        });
-
-        return $this->csv->toString(); 
+            ->each(function ($credit) {
+                $this->csv->insertOne($this->buildRow($credit));
+            });
 
+        return $this->csv->toString();
     }
 
     private function buildRow(Credit $credit) :array
     {
-
         $transformed_credit = $this->credit_transformer->transform($credit);
 
         $entity = [];
 
-        foreach(array_values($this->input['report_keys']) as $key){
-
+        foreach (array_values($this->input['report_keys']) as $key) {
             $keyval = array_search($key, $this->entity_keys);
 
-            if(array_key_exists($key, $transformed_credit))
+            if (array_key_exists($key, $transformed_credit)) {
                 $entity[$keyval] = $transformed_credit[$key];
-            else
+            } else {
                 $entity[$keyval] = '';
-
+            }
         }
 
         return $this->decorateAdvancedFields($credit, $entity);
-
     }
 
     private function decorateAdvancedFields(Credit $credit, array $entity) :array
     {
+        if (in_array('country_id', $this->input['report_keys'])) {
+            $entity['country'] = $credit->client->country ? ctrans("texts.country_{$credit->client->country->name}") : '';
+        }
 
-        if(in_array('country_id', $this->input['report_keys']))
-            $entity['country'] = $credit->client->country ? ctrans("texts.country_{$credit->client->country->name}") : ""; 
+        if (in_array('currency_id', $this->input['report_keys'])) {
+            $entity['currency_id'] = $credit->client->currency() ? $credit->client->currency()->code : $invoice->company->currency()->code;
+        }
 
-        if(in_array('currency_id', $this->input['report_keys']))
-            $entity['currency_id'] = $credit->client->currency() ? $credit->client->currency()->code : $invoice->company->currency()->code;;
+        if (in_array('invoice_id', $this->input['report_keys'])) {
+            $entity['invoice'] = $credit->invoice ? $credit->invoice->number : '';
+        }
 
-        if(in_array('invoice_id', $this->input['report_keys']))
-            $entity['invoice'] = $credit->invoice ? $credit->invoice->number : "";
-
-        if(in_array('client_id', $this->input['report_keys']))
+        if (in_array('client_id', $this->input['report_keys'])) {
             $entity['client'] = $credit->client->present()->name();
+        }
 
-        if(in_array('status_id',$this->input['report_keys']))
+        if (in_array('status_id', $this->input['report_keys'])) {
             $entity['status'] = $credit->stringStatus($credit->status_id);
+        }
 
         return $entity;
     }
-
 }
diff --git a/app/Export/CSV/DocumentExport.php b/app/Export/CSV/DocumentExport.php
index b70a854af7bd..dae5f6509c74 100644
--- a/app/Export/CSV/DocumentExport.php
+++ b/app/Export/CSV/DocumentExport.php
@@ -52,7 +52,6 @@ class DocumentExport extends BaseExport
 
     public function run()
     {
-
         MultiDB::setDb($this->company->db);
         App::forgetInstance('translator');
         App::setLocale($this->company->locale());
@@ -62,8 +61,9 @@ class DocumentExport extends BaseExport
         //load the CSV document from a string
         $this->csv = Writer::createFromString();
 
-        if(count($this->input['report_keys']) == 0)
+        if (count($this->input['report_keys']) == 0) {
             $this->input['report_keys'] = array_values($this->entity_keys);
+        }
 
         //insert the header
         $this->csv->insertOne($this->buildHeader());
@@ -73,47 +73,41 @@ class DocumentExport extends BaseExport
         $query = $this->addDateRange($query);
 
         $query->cursor()
-              ->each(function ($entity){
-
-            $this->csv->insertOne($this->buildRow($entity)); 
-
-        });
-
-        return $this->csv->toString(); 
+              ->each(function ($entity) {
+                  $this->csv->insertOne($this->buildRow($entity));
+              });
 
+        return $this->csv->toString();
     }
 
     private function buildRow(Document $document) :array
     {
-
         $transformed_entity = $this->entity_transformer->transform($document);
 
         $entity = [];
 
-        foreach(array_values($this->input['report_keys']) as $key){
-
+        foreach (array_values($this->input['report_keys']) as $key) {
             $keyval = array_search($key, $this->entity_keys);
 
-            if(array_key_exists($key, $transformed_entity))
+            if (array_key_exists($key, $transformed_entity)) {
                 $entity[$keyval] = $transformed_entity[$key];
-            else
-                $entity[$keyval] = '';        
+            } else {
+                $entity[$keyval] = '';
+            }
         }
 
         return $this->decorateAdvancedFields($document, $entity);
-
     }
 
     private function decorateAdvancedFields(Document $document, array $entity) :array
     {
-
-        if(in_array('record_type', $this->input['report_keys']))
+        if (in_array('record_type', $this->input['report_keys'])) {
             $entity['record_type'] = class_basename($document->documentable);
+        }
 
         // if(in_array('record_name', $this->input['report_keys']))
         //     $entity['record_name'] = $document->hashed_id;
 
         return $entity;
     }
-
 }
diff --git a/app/Export/CSV/ExpenseExport.php b/app/Export/CSV/ExpenseExport.php
index d4ccaaa23674..dced738d742c 100644
--- a/app/Export/CSV/ExpenseExport.php
+++ b/app/Export/CSV/ExpenseExport.php
@@ -82,7 +82,6 @@ class ExpenseExport extends BaseExport
 
     public function run()
     {
-
         MultiDB::setDb($this->company->db);
         App::forgetInstance('translator');
         App::setLocale($this->company->locale());
@@ -92,8 +91,9 @@ class ExpenseExport extends BaseExport
         //load the CSV document from a string
         $this->csv = Writer::createFromString();
 
-        if(count($this->input['report_keys']) == 0)
+        if (count($this->input['report_keys']) == 0) {
             $this->input['report_keys'] = array_values($this->entity_keys);
+        }
 
         //insert the header
         $this->csv->insertOne($this->buildHeader());
@@ -102,69 +102,67 @@ class ExpenseExport extends BaseExport
                         ->with('client')
                         ->withTrashed()
                         ->where('company_id', $this->company->id)
-                        ->where('is_deleted',0);
+                        ->where('is_deleted', 0);
 
         $query = $this->addDateRange($query);
 
         $query->cursor()
-                ->each(function ($expense){
-
-                    $this->csv->insertOne($this->buildRow($expense)); 
-
-        });
-
-
-        return $this->csv->toString(); 
+                ->each(function ($expense) {
+                    $this->csv->insertOne($this->buildRow($expense));
+                });
 
+        return $this->csv->toString();
     }
 
     private function buildRow(Expense $expense) :array
     {
-
         $transformed_expense = $this->expense_transformer->transform($expense);
 
         $entity = [];
 
-        foreach(array_values($this->input['report_keys']) as $key){
-
+        foreach (array_values($this->input['report_keys']) as $key) {
             $keyval = array_search($key, $this->entity_keys);
 
-            if(array_key_exists($key, $transformed_expense))
+            if (array_key_exists($key, $transformed_expense)) {
                 $entity[$keyval] = $transformed_expense[$key];
-            else
+            } else {
                 $entity[$keyval] = '';
-
+            }
         }
 
         return $this->decorateAdvancedFields($expense, $entity);
-
     }
 
     private function decorateAdvancedFields(Expense $expense, array $entity) :array
     {
-        if(in_array('currency_id', $this->input['report_keys']))
-            $entity['currency'] = $expense->currency ? $expense->currency->code : "";
+        if (in_array('currency_id', $this->input['report_keys'])) {
+            $entity['currency'] = $expense->currency ? $expense->currency->code : '';
+        }
 
-        if(in_array('client_id', $this->input['report_keys']))
-            $entity['client'] = $expense->client ? $expense->client->present()->name() : "";
+        if (in_array('client_id', $this->input['report_keys'])) {
+            $entity['client'] = $expense->client ? $expense->client->present()->name() : '';
+        }
 
-        if(in_array('invoice_id', $this->input['report_keys']))
-            $entity['invoice'] = $expense->invoice ? $expense->invoice->number : "";
+        if (in_array('invoice_id', $this->input['report_keys'])) {
+            $entity['invoice'] = $expense->invoice ? $expense->invoice->number : '';
+        }
 
-        if(in_array('category_id', $this->input['report_keys']))
-            $entity['category'] = $expense->category ? $expense->category->name : "";
+        if (in_array('category_id', $this->input['report_keys'])) {
+            $entity['category'] = $expense->category ? $expense->category->name : '';
+        }
 
-        if(in_array('vendor_id', $this->input['report_keys']))
-            $entity['vendor'] = $expense->vendor ? $expense->vendor->name : "";
+        if (in_array('vendor_id', $this->input['report_keys'])) {
+            $entity['vendor'] = $expense->vendor ? $expense->vendor->name : '';
+        }
 
-        if(in_array('payment_type_id', $this->input['report_keys']))
-            $entity['payment_type'] = $expense->payment_type ? $expense->payment_type->name : "";
-
-        if(in_array('project_id', $this->input['report_keys']))
-            $entity['project'] = $expense->project ? $expense->project->name : "";
+        if (in_array('payment_type_id', $this->input['report_keys'])) {
+            $entity['payment_type'] = $expense->payment_type ? $expense->payment_type->name : '';
+        }
 
+        if (in_array('project_id', $this->input['report_keys'])) {
+            $entity['project'] = $expense->project ? $expense->project->name : '';
+        }
 
         return $entity;
     }
-
 }
diff --git a/app/Export/CSV/InvoiceExport.php b/app/Export/CSV/InvoiceExport.php
index 76ecf16a18c4..be13d99c3a9f 100644
--- a/app/Export/CSV/InvoiceExport.php
+++ b/app/Export/CSV/InvoiceExport.php
@@ -63,7 +63,7 @@ class InvoiceExport extends BaseExport
         'tax_rate3' => 'tax_rate3',
         'terms' => 'terms',
         'total_taxes' => 'total_taxes',
-        'currency_id' => 'currency_id'
+        'currency_id' => 'currency_id',
     ];
 
     private array $decorate_keys = [
@@ -84,7 +84,6 @@ class InvoiceExport extends BaseExport
 
     public function run()
     {
-
         MultiDB::setDb($this->company->db);
         App::forgetInstance('translator');
         App::setLocale($this->company->locale());
@@ -94,9 +93,10 @@ class InvoiceExport extends BaseExport
         //load the CSV document from a string
         $this->csv = Writer::createFromString();
 
-        if(count($this->input['report_keys']) == 0)
+        if (count($this->input['report_keys']) == 0) {
             $this->input['report_keys'] = array_values($this->entity_keys);
-        
+        }
+
         //insert the header
         $this->csv->insertOne($this->buildHeader());
 
@@ -104,57 +104,55 @@ class InvoiceExport extends BaseExport
                         ->withTrashed()
                         ->with('client')
                         ->where('company_id', $this->company->id)
-                        ->where('is_deleted',0);
+                        ->where('is_deleted', 0);
 
         $query = $this->addDateRange($query);
 
         $query->cursor()
-            ->each(function ($invoice){
-
-                $this->csv->insertOne($this->buildRow($invoice)); 
-
-        });
-
-        return $this->csv->toString(); 
+            ->each(function ($invoice) {
+                $this->csv->insertOne($this->buildRow($invoice));
+            });
 
+        return $this->csv->toString();
     }
 
     private function buildRow(Invoice $invoice) :array
     {
-
         $transformed_invoice = $this->invoice_transformer->transform($invoice);
 
         $entity = [];
 
-        foreach(array_values($this->input['report_keys']) as $key){
-
+        foreach (array_values($this->input['report_keys']) as $key) {
             $keyval = array_search($key, $this->entity_keys);
 
-            if(array_key_exists($key, $transformed_invoice))
+            if (array_key_exists($key, $transformed_invoice)) {
                 $entity[$keyval] = $transformed_invoice[$key];
-            else
+            } else {
                 $entity[$keyval] = '';
+            }
         }
 
         return $this->decorateAdvancedFields($invoice, $entity);
-
     }
 
     private function decorateAdvancedFields(Invoice $invoice, array $entity) :array
     {
-        if(in_array('country_id', $this->input['report_keys']))
-            $entity['country'] = $invoice->client->country ? ctrans("texts.country_{$invoice->client->country->name}") : ""; 
+        if (in_array('country_id', $this->input['report_keys'])) {
+            $entity['country'] = $invoice->client->country ? ctrans("texts.country_{$invoice->client->country->name}") : '';
+        }
 
-        if(in_array('currency_id', $this->input['report_keys']))
+        if (in_array('currency_id', $this->input['report_keys'])) {
             $entity['currency_id'] = $invoice->client->currency() ? $invoice->client->currency()->code : $invoice->company->currency()->code;
+        }
 
-        if(in_array('client_id', $this->input['report_keys']))
+        if (in_array('client_id', $this->input['report_keys'])) {
             $entity['client'] = $invoice->client->present()->name();
+        }
 
-        if(in_array('status_id',$this->input['report_keys']))
+        if (in_array('status_id', $this->input['report_keys'])) {
             $entity['status'] = $invoice->stringStatus($invoice->status_id);
+        }
 
         return $entity;
     }
-
 }
diff --git a/app/Export/CSV/PaymentExport.php b/app/Export/CSV/PaymentExport.php
index 0b5b4f309772..ccd49d84e109 100644
--- a/app/Export/CSV/PaymentExport.php
+++ b/app/Export/CSV/PaymentExport.php
@@ -73,7 +73,6 @@ class PaymentExport extends BaseExport
 
     public function run()
     {
-
         MultiDB::setDb($this->company->db);
         App::forgetInstance('translator');
         App::setLocale($this->company->locale());
@@ -83,8 +82,9 @@ class PaymentExport extends BaseExport
         //load the CSV document from a string
         $this->csv = Writer::createFromString();
 
-        if(count($this->input['report_keys']) == 0)
+        if (count($this->input['report_keys']) == 0) {
             $this->input['report_keys'] = array_values($this->entity_keys);
+        }
 
         //insert the header
         $this->csv->insertOne($this->buildHeader());
@@ -94,66 +94,66 @@ class PaymentExport extends BaseExport
         $query = $this->addDateRange($query);
 
         $query->cursor()
-              ->each(function ($entity){
-
-            $this->csv->insertOne($this->buildRow($entity)); 
-
-        });
-
-        return $this->csv->toString(); 
+              ->each(function ($entity) {
+                  $this->csv->insertOne($this->buildRow($entity));
+              });
 
+        return $this->csv->toString();
     }
 
     private function buildRow(Payment $payment) :array
     {
-
         $transformed_entity = $this->entity_transformer->transform($payment);
 
         $entity = [];
 
-        foreach(array_values($this->input['report_keys']) as $key){
-
+        foreach (array_values($this->input['report_keys']) as $key) {
             $keyval = array_search($key, $this->entity_keys);
 
-            if(array_key_exists($key, $transformed_entity))
+            if (array_key_exists($key, $transformed_entity)) {
                 $entity[$keyval] = $transformed_entity[$key];
-            else
+            } else {
                 $entity[$keyval] = '';
-        
+            }
         }
 
         return $this->decorateAdvancedFields($payment, $entity);
-
     }
 
     private function decorateAdvancedFields(Payment $payment, array $entity) :array
     {
-
-        if(in_array('status_id', $this->input['report_keys']))
+        if (in_array('status_id', $this->input['report_keys'])) {
             $entity['status'] = $payment->stringStatus($payment->status_id);
+        }
 
-        if(in_array('vendor_id', $this->input['report_keys']))
+        if (in_array('vendor_id', $this->input['report_keys'])) {
             $entity['vendor'] = $payment->vendor()->exists() ? $payment->vendor->name : '';
+        }
 
-        if(in_array('project_id', $this->input['report_keys']))
+        if (in_array('project_id', $this->input['report_keys'])) {
             $entity['project'] = $payment->project()->exists() ? $payment->project->name : '';
+        }
 
-        if(in_array('currency_id', $this->input['report_keys']))
+        if (in_array('currency_id', $this->input['report_keys'])) {
             $entity['currency'] = $payment->currency()->exists() ? $payment->currency->code : '';
+        }
 
-        if(in_array('exchange_currency_id', $this->input['report_keys']))
+        if (in_array('exchange_currency_id', $this->input['report_keys'])) {
             $entity['exchange_currency'] = $payment->exchange_currency()->exists() ? $payment->exchange_currency->code : '';
+        }
 
-        if(in_array('client_id', $this->input['report_keys']))
+        if (in_array('client_id', $this->input['report_keys'])) {
             $entity['client'] = $payment->client->present()->name();
+        }
 
-        if(in_array('type_id', $this->input['report_keys']))
+        if (in_array('type_id', $this->input['report_keys'])) {
             $entity['type'] = $payment->translatedType();
+        }
 
-        if(in_array('gateway_type_id', $this->input['report_keys']))
-            $entity['gateway'] = $payment->gateway_type ? $payment->gateway_type->name : "Unknown Type";
+        if (in_array('gateway_type_id', $this->input['report_keys'])) {
+            $entity['gateway'] = $payment->gateway_type ? $payment->gateway_type->name : 'Unknown Type';
+        }
 
         return $entity;
     }
-
 }
diff --git a/app/Export/CSV/ProductExport.php b/app/Export/CSV/ProductExport.php
index 9523f8ad050a..ff96841951d0 100644
--- a/app/Export/CSV/ProductExport.php
+++ b/app/Export/CSV/ProductExport.php
@@ -66,7 +66,6 @@ class ProductExport extends BaseExport
 
     public function run()
     {
-
         MultiDB::setDb($this->company->db);
         App::forgetInstance('translator');
         App::setLocale($this->company->locale());
@@ -76,8 +75,9 @@ class ProductExport extends BaseExport
         //load the CSV document from a string
         $this->csv = Writer::createFromString();
 
-        if(count($this->input['report_keys']) == 0)
+        if (count($this->input['report_keys']) == 0) {
             $this->input['report_keys'] = array_values($this->entity_keys);
+        }
 
         //insert the header
         $this->csv->insertOne($this->buildHeader());
@@ -87,49 +87,42 @@ class ProductExport extends BaseExport
         $query = $this->addDateRange($query);
 
         $query->cursor()
-              ->each(function ($entity){
-
-            $this->csv->insertOne($this->buildRow($entity)); 
-
-        });
-
-        return $this->csv->toString(); 
+              ->each(function ($entity) {
+                  $this->csv->insertOne($this->buildRow($entity));
+              });
 
+        return $this->csv->toString();
     }
 
     private function buildRow(Product $product) :array
     {
-
         $transformed_entity = $this->entity_transformer->transform($product);
 
         $entity = [];
 
-        foreach(array_values($this->input['report_keys']) as $key){
-
+        foreach (array_values($this->input['report_keys']) as $key) {
             $keyval = array_search($key, $this->entity_keys);
 
-            if(array_key_exists($key, $transformed_entity))
+            if (array_key_exists($key, $transformed_entity)) {
                 $entity[$keyval] = $transformed_entity[$key];
-            else
+            } else {
                 $entity[$keyval] = '';
-        
-        
+            }
         }
 
         return $this->decorateAdvancedFields($product, $entity);
-
     }
 
     private function decorateAdvancedFields(Product $product, array $entity) :array
     {
-
-        if(in_array('vendor_id', $this->input['report_keys']))
+        if (in_array('vendor_id', $this->input['report_keys'])) {
             $entity['vendor'] = $product->vendor()->exists() ? $product->vendor->name : '';
+        }
 
-        if(array_key_exists('project_id', $this->input['report_keys']))
+        if (array_key_exists('project_id', $this->input['report_keys'])) {
             $entity['project'] = $product->project()->exists() ? $product->project->name : '';
+        }
 
         return $entity;
     }
-
 }
diff --git a/app/Export/CSV/QuoteExport.php b/app/Export/CSV/QuoteExport.php
index fe1dff206eb6..a48f4c4ef4a8 100644
--- a/app/Export/CSV/QuoteExport.php
+++ b/app/Export/CSV/QuoteExport.php
@@ -70,7 +70,7 @@ class QuoteExport extends BaseExport
     private array $decorate_keys = [
         'client',
         'currency',
-        'invoice'
+        'invoice',
     ];
 
     public function __construct(Company $company, array $input)
@@ -82,7 +82,6 @@ class QuoteExport extends BaseExport
 
     public function run()
     {
-
         MultiDB::setDb($this->company->db);
         App::forgetInstance('translator');
         App::setLocale($this->company->locale());
@@ -92,8 +91,9 @@ class QuoteExport extends BaseExport
         //load the CSV document from a string
         $this->csv = Writer::createFromString();
 
-        if(count($this->input['report_keys']) == 0)
+        if (count($this->input['report_keys']) == 0) {
             $this->input['report_keys'] = array_values($this->entity_keys);
+        }
 
         //insert the header
         $this->csv->insertOne($this->buildHeader());
@@ -101,58 +101,55 @@ class QuoteExport extends BaseExport
         $query = Quote::query()
                         ->with('client')
                         ->where('company_id', $this->company->id)
-                        ->where('is_deleted',0);
+                        ->where('is_deleted', 0);
 
         $query = $this->addDateRange($query);
 
         $query->cursor()
-            ->each(function ($quote){
-
-                $this->csv->insertOne($this->buildRow($quote)); 
-
-        });
-
-
-        return $this->csv->toString(); 
+            ->each(function ($quote) {
+                $this->csv->insertOne($this->buildRow($quote));
+            });
 
+        return $this->csv->toString();
     }
 
     private function buildRow(Quote $quote) :array
     {
-
         $transformed_quote = $this->quote_transformer->transform($quote);
 
         $entity = [];
 
-        foreach(array_values($this->input['report_keys']) as $key){
-
+        foreach (array_values($this->input['report_keys']) as $key) {
             $keyval = array_search($key, $this->entity_keys);
 
-            if(array_key_exists($key, $transformed_quote))
+            if (array_key_exists($key, $transformed_quote)) {
                 $entity[$keyval] = $transformed_quote[$key];
-            else
+            } else {
                 $entity[$keyval] = '';
+            }
         }
 
         return $this->decorateAdvancedFields($quote, $entity);
-
     }
 
     private function decorateAdvancedFields(Quote $quote, array $entity) :array
     {
-        if(in_array('currency_id', $this->input['report_keys']))
+        if (in_array('currency_id', $this->input['report_keys'])) {
             $entity['currency'] = $quote->client->currency()->code;
+        }
 
-        if(in_array('client_id', $this->input['report_keys']))
+        if (in_array('client_id', $this->input['report_keys'])) {
             $entity['client'] = $quote->client->present()->name();
+        }
 
-        if(in_array('status_id',$this->input['report_keys']))
+        if (in_array('status_id', $this->input['report_keys'])) {
             $entity['status'] = $quote->stringStatus($quote->status_id);
+        }
 
-        if(in_array('invoice_id', $this->input['report_keys']))
-            $entity['invoice'] = $quote->invoice ? $quote->invoice->number : "";
+        if (in_array('invoice_id', $this->input['report_keys'])) {
+            $entity['invoice'] = $quote->invoice ? $quote->invoice->number : '';
+        }
 
         return $entity;
     }
-
 }
diff --git a/app/Export/CSV/QuoteItemExport.php b/app/Export/CSV/QuoteItemExport.php
index ad1ded90ca73..e89d56311601 100644
--- a/app/Export/CSV/QuoteItemExport.php
+++ b/app/Export/CSV/QuoteItemExport.php
@@ -85,7 +85,6 @@ class QuoteItemExport extends BaseExport
         'custom_value4' => 'item.custom_value4',
     ];
 
-
     private array $decorate_keys = [
         'client',
         'currency',
@@ -100,7 +99,6 @@ class QuoteItemExport extends BaseExport
 
     public function run()
     {
-
         MultiDB::setDb($this->company->db);
         App::forgetInstance('translator');
         App::setLocale($this->company->locale());
@@ -110,28 +108,25 @@ class QuoteItemExport extends BaseExport
         //load the CSV document from a string
         $this->csv = Writer::createFromString();
 
-        if(count($this->input['report_keys']) == 0)
+        if (count($this->input['report_keys']) == 0) {
             $this->input['report_keys'] = array_values($this->entity_keys);
-
+        }
 
         //insert the header
         $this->csv->insertOne($this->buildHeader());
 
         $query = Quote::query()
                         ->with('client')->where('company_id', $this->company->id)
-                        ->where('is_deleted',0);
+                        ->where('is_deleted', 0);
 
         $query = $this->addDateRange($query);
 
         $query->cursor()
-            ->each(function ($quote){
-
+            ->each(function ($quote) {
                 $this->iterateItems($quote);
+            });
 
-        });
-
-        return $this->csv->toString(); 
-
+        return $this->csv->toString();
     }
 
     private function iterateItems(Quote $quote)
@@ -140,76 +135,68 @@ class QuoteItemExport extends BaseExport
 
         $transformed_items = [];
 
-        foreach($quote->line_items as $item)
-        {
+        foreach ($quote->line_items as $item) {
             $item_array = [];
 
-            foreach(array_values($this->input['report_keys']) as $key){
-            
-                if(str_contains($key, "item.")){
-
-                    $key = str_replace("item.", "", $key);
+            foreach (array_values($this->input['report_keys']) as $key) {
+                if (str_contains($key, 'item.')) {
+                    $key = str_replace('item.', '', $key);
                     $item_array[$key] = $item->{$key};
                 }
-
             }
 
             $entity = [];
 
-            foreach(array_values($this->input['report_keys']) as $key)
-            {
+            foreach (array_values($this->input['report_keys']) as $key) {
                 $keyval = array_search($key, $this->entity_keys);
 
-                if(array_key_exists($key, $transformed_items))
+                if (array_key_exists($key, $transformed_items)) {
                     $entity[$keyval] = $transformed_items[$key];
-                else 
-                    $entity[$keyval] = "";
+                } else {
+                    $entity[$keyval] = '';
+                }
             }
 
-
             $transformed_items = array_merge($transformed_quote, $item_array);
             $entity = $this->decorateAdvancedFields($quote, $transformed_items);
 
-            $this->csv->insertOne($entity); 
-
+            $this->csv->insertOne($entity);
         }
-
     }
 
     private function buildRow(Quote $quote) :array
     {
-
         $transformed_quote = $this->quote_transformer->transform($quote);
 
         $entity = [];
 
-        foreach(array_values($this->input['report_keys']) as $key){
-
+        foreach (array_values($this->input['report_keys']) as $key) {
             $keyval = array_search($key, $this->entity_keys);
 
-            if(array_key_exists($key, $transformed_quote))
+            if (array_key_exists($key, $transformed_quote)) {
                 $entity[$keyval] = $transformed_quote[$key];
-            else
-                $entity[$keyval] = "";
-
+            } else {
+                $entity[$keyval] = '';
+            }
         }
 
         return $this->decorateAdvancedFields($quote, $entity);
-
     }
 
     private function decorateAdvancedFields(Quote $quote, array $entity) :array
     {
-        if(in_array('currency_id', $this->input['report_keys']))
+        if (in_array('currency_id', $this->input['report_keys'])) {
             $entity['currency'] = $quote->client->currency() ? $quote->client->currency()->code : $quote->company->currency()->code;
+        }
 
-        if(in_array('client_id', $this->input['report_keys']))
+        if (in_array('client_id', $this->input['report_keys'])) {
             $entity['client'] = $quote->client->present()->name();
+        }
 
-        if(in_array('status_id', $this->input['report_keys']))
+        if (in_array('status_id', $this->input['report_keys'])) {
             $entity['status'] = $quote->stringStatus($quote->status_id);
+        }
 
         return $entity;
     }
-
 }
diff --git a/app/Export/CSV/RecurringInvoiceExport.php b/app/Export/CSV/RecurringInvoiceExport.php
index 47232ebcfa12..30accbd22511 100644
--- a/app/Export/CSV/RecurringInvoiceExport.php
+++ b/app/Export/CSV/RecurringInvoiceExport.php
@@ -74,7 +74,7 @@ class RecurringInvoiceExport extends BaseExport
         'currency',
         'status',
         'vendor',
-        'project'
+        'project',
     ];
 
     public function __construct(Company $company, array $input)
@@ -86,7 +86,6 @@ class RecurringInvoiceExport extends BaseExport
 
     public function run()
     {
-
         MultiDB::setDb($this->company->db);
         App::forgetInstance('translator');
         App::setLocale($this->company->locale());
@@ -96,8 +95,9 @@ class RecurringInvoiceExport extends BaseExport
         //load the CSV document from a string
         $this->csv = Writer::createFromString();
 
-        if(count($this->input['report_keys']) == 0)
+        if (count($this->input['report_keys']) == 0) {
             $this->input['report_keys'] = array_values($this->entity_keys);
+        }
 
         //insert the header
         $this->csv->insertOne($this->buildHeader());
@@ -105,64 +105,63 @@ class RecurringInvoiceExport extends BaseExport
         $query = RecurringInvoice::query()
                         ->withTrashed()
                         ->with('client')->where('company_id', $this->company->id)
-                        ->where('is_deleted',0);
+                        ->where('is_deleted', 0);
 
         $query = $this->addDateRange($query);
 
         $query->cursor()
-            ->each(function ($invoice){
-
-                $this->csv->insertOne($this->buildRow($invoice)); 
-
-        });
-
-        return $this->csv->toString(); 
+            ->each(function ($invoice) {
+                $this->csv->insertOne($this->buildRow($invoice));
+            });
 
+        return $this->csv->toString();
     }
 
     private function buildRow(RecurringInvoice $invoice) :array
     {
-
         $transformed_invoice = $this->invoice_transformer->transform($invoice);
 
         $entity = [];
 
-        foreach(array_values($this->input['report_keys']) as $key){
-
+        foreach (array_values($this->input['report_keys']) as $key) {
             $keyval = array_search($key, $this->entity_keys);
 
-            if(array_key_exists($key, $transformed_invoice))
+            if (array_key_exists($key, $transformed_invoice)) {
                 $entity[$keyval] = $transformed_invoice[$key];
-            else
+            } else {
                 $entity[$keyval] = '';
-
+            }
         }
 
         return $this->decorateAdvancedFields($invoice, $entity);
-
     }
 
     private function decorateAdvancedFields(RecurringInvoice $invoice, array $entity) :array
     {
-        if(in_array('country_id', $this->input['report_keys']))
-            $entity['country'] = $invoice->client->country ? ctrans("texts.country_{$invoice->client->country->name}") : ""; 
+        if (in_array('country_id', $this->input['report_keys'])) {
+            $entity['country'] = $invoice->client->country ? ctrans("texts.country_{$invoice->client->country->name}") : '';
+        }
 
-        if(in_array('currency_id', $this->input['report_keys']))
+        if (in_array('currency_id', $this->input['report_keys'])) {
             $entity['currency'] = $invoice->client->currency() ? $invoice->client->currency()->code : $invoice->company->currency()->code;
+        }
 
-        if(in_array('client_id', $this->input['report_keys']))
+        if (in_array('client_id', $this->input['report_keys'])) {
             $entity['client'] = $invoice->client->present()->name();
+        }
 
-        if(in_array('status_id',$this->input['report_keys']))
+        if (in_array('status_id', $this->input['report_keys'])) {
             $entity['status'] = $invoice->stringStatus($invoice->status_id);
+        }
 
-        if(in_array('project_id',$this->input['report_keys']))
-            $entity['project'] = $invoice->project ? $invoice->project->name : "";
+        if (in_array('project_id', $this->input['report_keys'])) {
+            $entity['project'] = $invoice->project ? $invoice->project->name : '';
+        }
 
-        if(in_array('vendor_id',$this->input['report_keys']))
-            $entity['vendor'] = $invoice->vendor ? $invoice->vendor->name : "";
+        if (in_array('vendor_id', $this->input['report_keys'])) {
+            $entity['vendor'] = $invoice->vendor ? $invoice->vendor->name : '';
+        }
 
         return $entity;
     }
-
 }
diff --git a/app/Export/CSV/TaskExport.php b/app/Export/CSV/TaskExport.php
index f700c8c83063..7ee9007f520c 100644
--- a/app/Export/CSV/TaskExport.php
+++ b/app/Export/CSV/TaskExport.php
@@ -71,7 +71,6 @@ class TaskExport extends BaseExport
 
     public function run()
     {
-
         MultiDB::setDb($this->company->db);
         App::forgetInstance('translator');
         App::setLocale($this->company->locale());
@@ -79,15 +78,15 @@ class TaskExport extends BaseExport
         $t->replace(Ninja::transformTranslations($this->company->settings));
 
         $this->date_format = DateFormat::find($this->company->settings->date_format_id)->format;
-    
+
         //load the CSV document from a string
         $this->csv = Writer::createFromString();
-        
+
         ksort($this->entity_keys);
 
-        if(count($this->input['report_keys']) == 0)
+        if (count($this->input['report_keys']) == 0) {
             $this->input['report_keys'] = array_values($this->entity_keys);
-
+        }
 
         //insert the header
         $this->csv->insertOne($this->buildHeader());
@@ -97,59 +96,50 @@ class TaskExport extends BaseExport
         $query = $this->addDateRange($query);
 
         $query->cursor()
-              ->each(function ($entity){
-
-                $this->buildRow($entity); 
-
-        });
-
-        return $this->csv->toString(); 
+              ->each(function ($entity) {
+                  $this->buildRow($entity);
+              });
 
+        return $this->csv->toString();
     }
 
-    private function buildRow(Task $task) 
+    private function buildRow(Task $task)
     {
-
         $entity = [];
         $transformed_entity = $this->entity_transformer->transform($task);
 
-        if(is_null($task->time_log) || (is_array(json_decode($task->time_log,1)) && count(json_decode($task->time_log,1)) == 0)){
-
-            foreach(array_values($this->input['report_keys']) as $key){
-
+        if (is_null($task->time_log) || (is_array(json_decode($task->time_log, 1)) && count(json_decode($task->time_log, 1)) == 0)) {
+            foreach (array_values($this->input['report_keys']) as $key) {
                 $keyval = array_search($key, $this->entity_keys);
 
-                if(array_key_exists($key, $transformed_entity))
+                if (array_key_exists($key, $transformed_entity)) {
                     $entity[$keyval] = $transformed_entity[$key];
-                else
-                    $entity[$keyval] = '';            
+                } else {
+                    $entity[$keyval] = '';
+                }
             }
 
-            $entity['start_date'] = "";
-            $entity['end_date'] = "";
-            $entity['duration'] = "";
+            $entity['start_date'] = '';
+            $entity['end_date'] = '';
+            $entity['duration'] = '';
 
             $entity = $this->decorateAdvancedFields($task, $entity);
 
             ksort($entity);
             $this->csv->insertOne($entity);
-
-        }
-        elseif(is_array(json_decode($task->time_log,1)) && count(json_decode($task->time_log,1)) > 0) {
-
-            foreach(array_values($this->input['report_keys']) as $key){
-
+        } elseif (is_array(json_decode($task->time_log, 1)) && count(json_decode($task->time_log, 1)) > 0) {
+            foreach (array_values($this->input['report_keys']) as $key) {
                 $keyval = array_search($key, $this->entity_keys);
 
-                if(array_key_exists($key, $transformed_entity))
+                if (array_key_exists($key, $transformed_entity)) {
                     $entity[$keyval] = $transformed_entity[$key];
-                else
-                    $entity[$keyval] = '';            
+                } else {
+                    $entity[$keyval] = '';
+                }
             }
 
             $this->iterateLogs($task, $entity);
         }
-
     }
 
     private function iterateLogs(Task $task, array $entity)
@@ -157,48 +147,51 @@ class TaskExport extends BaseExport
         $timezone = Timezone::find($task->company->settings->timezone_id);
         $timezone_name = 'US/Eastern';
 
-        if($timezone)
+        if ($timezone) {
             $timezone_name = $timezone->name;
+        }
 
-        $logs = json_decode($task->time_log,1);
-        
-        $date_format_default = "Y-m-d";
+        $logs = json_decode($task->time_log, 1);
+
+        $date_format_default = 'Y-m-d';
 
         $date_format = DateFormat::find($task->company->settings->date_format_id);
 
-        if($date_format)
+        if ($date_format) {
             $date_format_default = $date_format->format;
+        }
 
-        foreach($logs as $key => $item)
-        {
-
-            if(in_array("start_date", $this->input['report_keys'])){
+        foreach ($logs as $key => $item) {
+            if (in_array('start_date', $this->input['report_keys'])) {
                 $entity['start_date'] = Carbon::createFromTimeStamp($item[0])->setTimezone($timezone_name)->format($date_format_default);
             }
 
-            if(in_array("end_date", $this->input['report_keys']) && $item[1] > 0){
+            if (in_array('end_date', $this->input['report_keys']) && $item[1] > 0) {
                 $entity['end_date'] = Carbon::createFromTimeStamp($item[1])->setTimezone($timezone_name)->format($date_format_default);
             }
 
-            if(in_array("end_date", $this->input['report_keys']) && $item[1] == 0){
+            if (in_array('end_date', $this->input['report_keys']) && $item[1] == 0) {
                 $entity['end_date'] = ctrans('texts.is_running');
             }
 
-            if(in_array("duration", $this->input['report_keys'])){
+            if (in_array('duration', $this->input['report_keys'])) {
                 $entity['duration'] = $task->calcDuration();
             }
 
-            if(!array_key_exists('duration', $entity))
-                $entity['duration'] = "";
+            if (! array_key_exists('duration', $entity)) {
+                $entity['duration'] = '';
+            }
 
-            if(!array_key_exists('start_date', $entity))
-                $entity['start_date'] = "";
+            if (! array_key_exists('start_date', $entity)) {
+                $entity['start_date'] = '';
+            }
 
-            if(!array_key_exists('end_date', $entity))
-                $entity['end_date'] = "";
+            if (! array_key_exists('end_date', $entity)) {
+                $entity['end_date'] = '';
+            }
 
             $entity = $this->decorateAdvancedFields($task, $entity);
-            
+
             ksort($entity);
             $this->csv->insertOne($entity);
 
@@ -206,25 +199,26 @@ class TaskExport extends BaseExport
             unset($entity['end_date']);
             unset($entity['duration']);
         }
-
     }
 
     private function decorateAdvancedFields(Task $task, array $entity) :array
     {
-
-        if(in_array('status_id', $this->input['report_keys']))
+        if (in_array('status_id', $this->input['report_keys'])) {
             $entity['status'] = $task->status()->exists() ? $task->status->name : '';
+        }
 
-        if(in_array('project_id', $this->input['report_keys']))
+        if (in_array('project_id', $this->input['report_keys'])) {
             $entity['project'] = $task->project()->exists() ? $task->project->name : '';
+        }
 
-        if(in_array('client_id', $this->input['report_keys']))
-            $entity['client'] = $task->client ? $task->client->present()->name() : "";
+        if (in_array('client_id', $this->input['report_keys'])) {
+            $entity['client'] = $task->client ? $task->client->present()->name() : '';
+        }
 
-        if(in_array('invoice_id', $this->input['report_keys']))
-            $entity['invoice'] = $task->invoice ? $task->invoice->number : "";
+        if (in_array('invoice_id', $this->input['report_keys'])) {
+            $entity['invoice'] = $task->invoice ? $task->invoice->number : '';
+        }
 
         return $entity;
     }
-
 }
diff --git a/app/Factory/ClientGatewayTokenFactory.php b/app/Factory/ClientGatewayTokenFactory.php
index fa46b327b020..0b3196ef4b73 100644
--- a/app/Factory/ClientGatewayTokenFactory.php
+++ b/app/Factory/ClientGatewayTokenFactory.php
@@ -25,7 +25,7 @@ class ClientGatewayTokenFactory
         $client_gateway_token->is_deleted = false;
         $client_gateway_token->token = '';
         $client_gateway_token->routing_number = '';
-        
+
         return $client_gateway_token;
     }
 }
diff --git a/app/Factory/CloneQuoteToInvoiceFactory.php b/app/Factory/CloneQuoteToInvoiceFactory.php
index 03d057987a99..9cb03ff22c83 100644
--- a/app/Factory/CloneQuoteToInvoiceFactory.php
+++ b/app/Factory/CloneQuoteToInvoiceFactory.php
@@ -28,11 +28,12 @@ class CloneQuoteToInvoiceFactory
         unset($quote_array['invoice_id']);
         unset($quote_array['id']);
         unset($quote_array['invitations']);
-        
+
         //preserve terms if they exist on Quotes
         //if(array_key_exists('terms', $quote_array) && strlen($quote_array['terms']) < 2)
-        if(!$quote->company->use_quote_terms_on_conversion)
+        if (! $quote->company->use_quote_terms_on_conversion) {
             unset($quote_array['terms']);
+        }
 
         // unset($quote_array['public_notes']);
         unset($quote_array['footer']);
diff --git a/app/Factory/CompanyFactory.php b/app/Factory/CompanyFactory.php
index e1a21a92ad04..bfb04daf1bc5 100644
--- a/app/Factory/CompanyFactory.php
+++ b/app/Factory/CompanyFactory.php
@@ -37,12 +37,13 @@ class CompanyFactory
         //$company->custom_fields = (object) ['invoice1' => '1', 'invoice2' => '2', 'client1'=>'3'];
         $company->custom_fields = (object) [];
         $company->client_registration_fields = ClientRegistrationFields::generate();
-        
-        if(Ninja::isHosted())
+
+        if (Ninja::isHosted()) {
             $company->subdomain = MultiDB::randomSubdomainGenerator();
-        else 
+        } else {
             $company->subdomain = '';
-        
+        }
+
         $company->enabled_modules = config('ninja.enabled_modules'); //32767;//8191; //4095
         $company->default_password_timeout = 1800000;
         $company->markdown_email_enabled = false;
diff --git a/app/Factory/CompanyGatewayFactory.php b/app/Factory/CompanyGatewayFactory.php
index d3030484d300..8f4743072cbe 100644
--- a/app/Factory/CompanyGatewayFactory.php
+++ b/app/Factory/CompanyGatewayFactory.php
@@ -24,7 +24,7 @@ class CompanyGatewayFactory
         $company_gateway->require_billing_address = false;
         $company_gateway->require_shipping_address = false;
         $company_gateway->config = encrypt(json_encode(new \stdClass));
-        
+
         return $company_gateway;
     }
 }
diff --git a/app/Factory/ExpenseCategoryFactory.php b/app/Factory/ExpenseCategoryFactory.php
index 88a702ca5fcf..f39da086d2a8 100644
--- a/app/Factory/ExpenseCategoryFactory.php
+++ b/app/Factory/ExpenseCategoryFactory.php
@@ -23,7 +23,7 @@ class ExpenseCategoryFactory
         $expense->name = '';
         $expense->is_deleted = false;
         $expense->color = '';
-        
+
         return $expense;
     }
 }
diff --git a/app/Factory/ExpenseFactory.php b/app/Factory/ExpenseFactory.php
index 997412ef1b5f..0ca0e0e1ba18 100644
--- a/app/Factory/ExpenseFactory.php
+++ b/app/Factory/ExpenseFactory.php
@@ -42,7 +42,7 @@ class ExpenseFactory
         $expense->tax_amount1 = 0;
         $expense->tax_amount2 = 0;
         $expense->tax_amount3 = 0;
-        
+
         return $expense;
     }
 }
diff --git a/app/Factory/GroupSettingFactory.php b/app/Factory/GroupSettingFactory.php
index 88c1c6f615cb..acea47af60f9 100644
--- a/app/Factory/GroupSettingFactory.php
+++ b/app/Factory/GroupSettingFactory.php
@@ -18,8 +18,8 @@ class GroupSettingFactory
 {
     public static function create(int $company_id, int $user_id) :GroupSetting
     {
-    	$settings = new \stdClass;
-    	$settings->entity = Client::class;
+        $settings = new \stdClass;
+        $settings->entity = Client::class;
 
         $gs = new GroupSetting;
         $gs->name = '';
diff --git a/app/Factory/InvoiceItemFactory.php b/app/Factory/InvoiceItemFactory.php
index 713035dce9e6..d88674f19adc 100644
--- a/app/Factory/InvoiceItemFactory.php
+++ b/app/Factory/InvoiceItemFactory.php
@@ -40,7 +40,7 @@ class InvoiceItemFactory
         $item->custom_value2 = '';
         $item->custom_value3 = '';
         $item->custom_value4 = '';
-        $item->type_id = "1";
+        $item->type_id = '1';
 
         return $item;
     }
@@ -71,7 +71,7 @@ class InvoiceItemFactory
             // $item->custom_value4 = $faker->realText(10);
             $item->tax_name1 = 'GST';
             $item->tax_rate1 = 10.00;
-            $item->type_id = "1";
+            $item->type_id = '1';
 
             $data[] = $item;
         }
@@ -105,7 +105,7 @@ class InvoiceItemFactory
             // $item->custom_value4 = $faker->realText(10);
             $item->tax_name1 = '';
             $item->tax_rate1 = 0;
-            $item->type_id = "1";
+            $item->type_id = '1';
 
             $data[] = $item;
         }
diff --git a/app/Factory/ProjectFactory.php b/app/Factory/ProjectFactory.php
index 77f9c7b8c81e..68cb9b04a88e 100644
--- a/app/Factory/ProjectFactory.php
+++ b/app/Factory/ProjectFactory.php
@@ -31,7 +31,7 @@ class ProjectFactory
         $project->custom_value3 = '';
         $project->custom_value4 = '';
         $project->is_deleted = 0;
-        
+
         return $project;
     }
 }
diff --git a/app/Factory/PurchaseOrderInvitationFactory.php b/app/Factory/PurchaseOrderInvitationFactory.php
index ee3987ea7e39..8d354d244c8e 100644
--- a/app/Factory/PurchaseOrderInvitationFactory.php
+++ b/app/Factory/PurchaseOrderInvitationFactory.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace App\Factory;
 
 use App\Models\PurchaseOrderInvitation;
diff --git a/app/Factory/RecurringExpenseFactory.php b/app/Factory/RecurringExpenseFactory.php
index 2698d3794458..7e946cc2864b 100644
--- a/app/Factory/RecurringExpenseFactory.php
+++ b/app/Factory/RecurringExpenseFactory.php
@@ -47,7 +47,7 @@ class RecurringExpenseFactory
         $recurring_expense->custom_value4 = '';
         $recurring_expense->uses_inclusive_taxes = true;
         $recurring_expense->calculate_tax_by_amount = true;
-        
+
         return $recurring_expense;
     }
 }
diff --git a/app/Factory/RecurringExpenseToExpenseFactory.php b/app/Factory/RecurringExpenseToExpenseFactory.php
index 503a167a2cf3..1f44a75d5a77 100644
--- a/app/Factory/RecurringExpenseToExpenseFactory.php
+++ b/app/Factory/RecurringExpenseToExpenseFactory.php
@@ -65,27 +65,25 @@ class RecurringExpenseToExpenseFactory
         $expense->tax_amount3 = $recurring_expense->tax_amount3 ?: 0;
         $expense->uses_inclusive_taxes = $recurring_expense->uses_inclusive_taxes;
         $expense->calculate_tax_by_amount = $recurring_expense->calculate_tax_by_amount;
-        
+
         return $expense;
     }
 
     public static function transformObject(?string $value, $recurring_expense): ?string
     {
-        if(!$value)
+        if (! $value) {
             return '';
-    
-        if($recurring_expense->client){
-        
+        }
+
+        if ($recurring_expense->client) {
             $locale = $recurring_expense->client->locale();
             $date_format = $recurring_expense->client->date_format();
-            
-        }
-        else {
+        } else {
             $locale = $recurring_expense->company->locale();
 
             $date_formats = Cache::get('date_formats');
 
-            $date_format = $date_formats->filter(function ($item) use($recurring_expense){
+            $date_format = $date_formats->filter(function ($item) use ($recurring_expense) {
                 return $item->id == $recurring_expense->company->settings->date_format_id;
             })->first()->format;
         }
@@ -96,7 +94,7 @@ class RecurringExpenseToExpenseFactory
             'literal' => [
                 ':MONTH' => Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F'),
                 ':YEAR' => now()->year,
-                ':QUARTER' => 'Q' . now()->quarter,
+                ':QUARTER' => 'Q'.now()->quarter,
                 ':WEEK_BEFORE' => \sprintf(
                     '%s %s %s',
                     Carbon::now()->subDays(7)->translatedFormat($date_format),
@@ -110,9 +108,9 @@ class RecurringExpenseToExpenseFactory
                     Carbon::now()->addDays(14)->translatedFormat($date_format)
                 ),
                 ':WEEK' => \sprintf(
-                    '%s %s %s', 
-                    Carbon::now()->translatedFormat($date_format), 
-                    ctrans('texts.to'), 
+                    '%s %s %s',
+                    Carbon::now()->translatedFormat($date_format),
+                    ctrans('texts.to'),
                     Carbon::now()->addDays(7)->translatedFormat($date_format)
                 ),
             ],
@@ -122,7 +120,7 @@ class RecurringExpenseToExpenseFactory
                 ':QUARTER' => now()->quarter,
             ],
             'ranges' => [
-              'MONTHYEAR' => Carbon::createFromDate(now()->year, now()->month),
+                'MONTHYEAR' => Carbon::createFromDate(now()->year, now()->month),
             ],
             'ranges_raw' => [
                 'MONTH' => now()->month,
@@ -136,7 +134,7 @@ class RecurringExpenseToExpenseFactory
         $matches = array_shift($ranges);
 
         foreach ($matches as $match) {
-            if (!Str::contains($match, '|')) {
+            if (! Str::contains($match, '|')) {
                 continue;
             }
 
@@ -147,7 +145,7 @@ class RecurringExpenseToExpenseFactory
                 $right = substr($parts[1], 0, -1); // MONTH+2
 
                 // If left side is not part of replacements, skip.
-                if (!array_key_exists($left, $replacements['ranges'])) {
+                if (! array_key_exists($left, $replacements['ranges'])) {
                     continue;
                 }
 
@@ -155,7 +153,7 @@ class RecurringExpenseToExpenseFactory
                 $_right = '';
 
                 // If right side doesn't have any calculations, replace with raw ranges keyword.
-                if (!Str::contains($right, ['-', '+', '/', '*'])) {
+                if (! Str::contains($right, ['-', '+', '/', '*'])) {
                     $_right = Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F Y');
                 }
 
@@ -178,7 +176,6 @@ class RecurringExpenseToExpenseFactory
             }
         }
 
-
         // Second case with more common calculations.
         preg_match_all('/:([^:\s]+)/', $value, $common);
 
@@ -193,7 +190,7 @@ class RecurringExpenseToExpenseFactory
                 continue;
             }
 
-            if (!Str::contains($match, ['-', '+', '/', '*'])) {
+            if (! Str::contains($match, ['-', '+', '/', '*'])) {
                 $value = preg_replace(
                     sprintf('/%s/', $matches->keys()->first()), $replacements['literal'][$matches->keys()->first()], $value, 1
                 );
@@ -208,26 +205,26 @@ class RecurringExpenseToExpenseFactory
 
                 $raw = strtr($matches->keys()->first(), $replacements['raw']); // :MONTH => 1
 
-                $number = $res = preg_replace("/[^0-9]/", '', $_value[1]); // :MONTH+1. || :MONTH+2! => 1 || 2
+                $number = $res = preg_replace('/[^0-9]/', '', $_value[1]); // :MONTH+1. || :MONTH+2! => 1 || 2
 
                 $target = "/{$matches->keys()->first()}\\{$_operation}{$number}/"; // /:$KEYWORD\\$OPERATION$VALUE => /:MONTH\\+1
 
-                $output = (int) $raw + (int)$_value[1];
+                $output = (int) $raw + (int) $_value[1];
 
                 if ($operation == '+') {
-                    $output = (int) $raw + (int)$_value[1]; // 1 (:MONTH) + 4
+                    $output = (int) $raw + (int) $_value[1]; // 1 (:MONTH) + 4
                 }
 
                 if ($_operation == '-') {
-                    $output = (int)$raw - (int)$_value[1]; // 1 (:MONTH) - 4
+                    $output = (int) $raw - (int) $_value[1]; // 1 (:MONTH) - 4
                 }
 
-                if ($_operation == '/' && (int)$_value[1] != 0) {
-                    $output = (int)$raw / (int)$_value[1]; // 1 (:MONTH) / 4
+                if ($_operation == '/' && (int) $_value[1] != 0) {
+                    $output = (int) $raw / (int) $_value[1]; // 1 (:MONTH) / 4
                 }
 
                 if ($_operation == '*') {
-                    $output = (int)$raw * (int)$_value[1]; // 1 (:MONTH) * 4
+                    $output = (int) $raw * (int) $_value[1]; // 1 (:MONTH) * 4
                 }
 
                 if ($matches->keys()->first() == ':MONTH') {
@@ -242,5 +239,4 @@ class RecurringExpenseToExpenseFactory
 
         return $value;
     }
-
 }
diff --git a/app/Factory/RecurringInvoiceToInvoiceFactory.php b/app/Factory/RecurringInvoiceToInvoiceFactory.php
index a4b428d230ea..a1101972dd6b 100644
--- a/app/Factory/RecurringInvoiceToInvoiceFactory.php
+++ b/app/Factory/RecurringInvoiceToInvoiceFactory.php
@@ -67,24 +67,21 @@ class RecurringInvoiceToInvoiceFactory
         $invoice->auto_bill_enabled = $recurring_invoice->auto_bill_enabled;
         $invoice->paid_to_date = 0;
         $invoice->design_id = $recurring_invoice->design_id;
-        
+
         return $invoice;
     }
 
     private static function transformItems($recurring_invoice, $client)
     {
-        
         $line_items = $recurring_invoice->line_items;
 
-        foreach($line_items as $key => $item){
-
-            if(property_exists($line_items[$key], 'notes'))
+        foreach ($line_items as $key => $item) {
+            if (property_exists($line_items[$key], 'notes')) {
                 $line_items[$key]->notes = Helpers::processReservedKeywords($item->notes, $client);
-
+            }
         }
 
         return $line_items;
-
     }
 
     private static function tranformObject($object, $client)
diff --git a/app/Factory/RecurringQuoteToQuoteFactory.php b/app/Factory/RecurringQuoteToQuoteFactory.php
index b23e2567b93e..f5e0f765db44 100644
--- a/app/Factory/RecurringQuoteToQuoteFactory.php
+++ b/app/Factory/RecurringQuoteToQuoteFactory.php
@@ -54,7 +54,7 @@ class RecurringQuoteToQuoteFactory
         $quote->auto_bill_enabled = $recurring_quote->auto_bill_enabled;
         $quote->paid_to_date = 0;
         $quote->design_id = $recurring_quote->design_id;
-        
+
         return $quote;
     }
 }
diff --git a/app/Factory/TaskStatusFactory.php b/app/Factory/TaskStatusFactory.php
index a59d2e9247ff..4f98d76e14f0 100644
--- a/app/Factory/TaskStatusFactory.php
+++ b/app/Factory/TaskStatusFactory.php
@@ -23,7 +23,7 @@ class TaskStatusFactory
         $task_status->name = '';
         $task_status->color = '';
         $task_status->status_order = 9999;
-        
+
         return $task_status;
     }
 }
diff --git a/app/Factory/UserFactory.php b/app/Factory/UserFactory.php
index da56a183875e..bee6a6d6070d 100644
--- a/app/Factory/UserFactory.php
+++ b/app/Factory/UserFactory.php
@@ -29,7 +29,7 @@ class UserFactory
         $user->failed_logins = 0;
         $user->signature = '';
         $user->theme_id = 0;
-        
+
         return $user;
     }
 }
diff --git a/app/Factory/VendorContactFactory.php b/app/Factory/VendorContactFactory.php
index 196694e36bc2..b46ce74de13d 100644
--- a/app/Factory/VendorContactFactory.php
+++ b/app/Factory/VendorContactFactory.php
@@ -12,6 +12,7 @@
 namespace App\Factory;
 
 use App\Models\VendorContact;
+use Illuminate\Support\Str;
 
 class VendorContactFactory
 {
@@ -21,6 +22,7 @@ class VendorContactFactory
         $vendor_contact->first_name = '';
         $vendor_contact->user_id = $user_id;
         $vendor_contact->company_id = $company_id;
+        $vendor_contact->contact_key = Str::random(40);
         $vendor_contact->id = 0;
 
         return $vendor_contact;
diff --git a/app/Factory/WebhookFactory.php b/app/Factory/WebhookFactory.php
index a9e8ce04d0f8..4d61c00f3d8e 100644
--- a/app/Factory/WebhookFactory.php
+++ b/app/Factory/WebhookFactory.php
@@ -25,7 +25,7 @@ class WebhookFactory
         $webhook->format = 'JSON';
         $webhook->rest_method = 'post';
         $webhook->headers = [];
-        
+
         return $webhook;
     }
 }
diff --git a/app/Filters/ClientFilters.php b/app/Filters/ClientFilters.php
index a373038667ec..d7b63d7d74a5 100644
--- a/app/Filters/ClientFilters.php
+++ b/app/Filters/ClientFilters.php
@@ -22,7 +22,6 @@ use Illuminate\Support\Facades\Gate;
  */
 class ClientFilters extends QueryFilters
 {
-
     /**
      * Filter by name.
      *
@@ -57,8 +56,9 @@ class ClientFilters extends QueryFilters
     {
         $parts = explode(':', $balance);
 
-        if(!is_array($parts))
+        if (! is_array($parts)) {
             return $this->builder;
+        }
 
         return $this->builder->whereBetween('balance', [$parts[0], $parts[1]]);
     }
@@ -70,7 +70,6 @@ class ClientFilters extends QueryFilters
         $this->builder->whereHas('contacts', function ($query) use ($email) {
             $query->where('email', $email);
         });
-
     }
 
     public function client_id(string $client_id = '') :Builder
@@ -80,7 +79,6 @@ class ClientFilters extends QueryFilters
         }
 
         return $this->builder->where('id', $this->decodePrimaryKey($client_id));
-        
     }
 
     public function id_number(string $id_number = ''):Builder
@@ -109,10 +107,10 @@ class ClientFilters extends QueryFilters
         return  $this->builder->where(function ($query) use ($filter) {
             $query->where('clients.name', 'like', '%'.$filter.'%')
                           ->orWhere('clients.id_number', 'like', '%'.$filter.'%')
-                          ->orWhereHas('contacts', function ($query) use($filter){
-                            $query->where('first_name', 'like', '%'.$filter.'%');
-                            $query->orWhere('last_name', 'like', '%'.$filter.'%');
-                            $query->orWhere('email', 'like', '%'.$filter.'%');
+                          ->orWhereHas('contacts', function ($query) use ($filter) {
+                              $query->where('first_name', 'like', '%'.$filter.'%');
+                              $query->orWhere('last_name', 'like', '%'.$filter.'%');
+                              $query->orWhere('email', 'like', '%'.$filter.'%');
                           })
                           ->orWhere('clients.custom_value1', 'like', '%'.$filter.'%')
                           ->orWhere('clients.custom_value2', 'like', '%'.$filter.'%')
diff --git a/app/Filters/CompanyGatewayFilters.php b/app/Filters/CompanyGatewayFilters.php
index 7bff1b2a3144..ef2d6594da87 100644
--- a/app/Filters/CompanyGatewayFilters.php
+++ b/app/Filters/CompanyGatewayFilters.php
@@ -35,7 +35,6 @@ class CompanyGatewayFilters extends QueryFilters
         return  $this->builder->where(function ($query) use ($filter) {
             $query->where('company_gateways.label', 'like', '%'.$filter.'%');
         });
-
     }
 
     /**
diff --git a/app/Filters/DocumentFilters.php b/app/Filters/DocumentFilters.php
index 195d6a18ffed..fade4950705a 100644
--- a/app/Filters/DocumentFilters.php
+++ b/app/Filters/DocumentFilters.php
@@ -19,7 +19,6 @@ use Illuminate\Database\Eloquent\Builder;
  */
 class DocumentFilters extends QueryFilters
 {
-
     /**
      * Filter based on search text.
      *
@@ -39,9 +38,7 @@ class DocumentFilters extends QueryFilters
     /* If client ID passed to this entity, simply return */
     public function client_id(string $client_id = '') :Builder
     {
-        
         return $this->builder;
-        
     }
 
     /**
diff --git a/app/Filters/ExpenseFilters.php b/app/Filters/ExpenseFilters.php
index c0c3ef362185..174acff790af 100644
--- a/app/Filters/ExpenseFilters.php
+++ b/app/Filters/ExpenseFilters.php
@@ -93,8 +93,9 @@ class ExpenseFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
-        if(is_array($sort_col) && in_array($sort_col[1], ['asc', 'desc']) && in_array($sort_col[0], ['public_notes', 'date', 'id_number', 'custom_value1', 'custom_value2', 'custom_value3', 'custom_value4']))
+        if (is_array($sort_col) && in_array($sort_col[1], ['asc', 'desc']) && in_array($sort_col[0], ['public_notes', 'date', 'id_number', 'custom_value1', 'custom_value2', 'custom_value3', 'custom_value4'])) {
             return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        }
 
         return $this->builder;
     }
diff --git a/app/Filters/InvoiceFilters.php b/app/Filters/InvoiceFilters.php
index d46a9b058848..c155d2061516 100644
--- a/app/Filters/InvoiceFilters.php
+++ b/app/Filters/InvoiceFilters.php
@@ -23,6 +23,7 @@ use Illuminate\Support\Carbon;
 class InvoiceFilters extends QueryFilters
 {
     use MakesHash;
+
     /**
      * Filter based on client status.
      *
@@ -98,7 +99,6 @@ class InvoiceFilters extends QueryFilters
         });
     }
 
-
     /**
      * Filters the list based on the status
      * archived, active, deleted - legacy from V1.
@@ -161,7 +161,7 @@ class InvoiceFilters extends QueryFilters
         $this->builder->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
                 ->where('is_deleted', 0)
                 ->where(function ($query) {
-                        $query->where('due_date', '<', now())
+                    $query->where('due_date', '<', now())
                         ->orWhere('partial_due_date', '<', now());
                 })
                 ->orderBy('due_date', 'ASC');
@@ -190,8 +190,9 @@ class InvoiceFilters extends QueryFilters
         $sort_col = explode('|', $sort);
 
         //catch invalid explode array count
-        if(count($sort_col) == 1)
+        if (count($sort_col) == 1) {
             return $this->builder;
+        }
 
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
diff --git a/app/Filters/PaymentFilters.php b/app/Filters/PaymentFilters.php
index 8667583c59a8..823cb9fcf741 100644
--- a/app/Filters/PaymentFilters.php
+++ b/app/Filters/PaymentFilters.php
@@ -94,7 +94,6 @@ class PaymentFilters extends QueryFilters
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
-
     public function number(string $number) : Builder
     {
         return $this->builder->where('number', $number);
diff --git a/app/Filters/ProductFilters.php b/app/Filters/ProductFilters.php
index e4e98f2a415b..a406b6521f19 100644
--- a/app/Filters/ProductFilters.php
+++ b/app/Filters/ProductFilters.php
@@ -19,6 +19,8 @@ use Illuminate\Database\Eloquent\Builder;
  */
 class ProductFilters extends QueryFilters
 {
+    protected $with_property = 'product_key';
+
     /**
      * Filter based on search text.
      *
@@ -42,6 +44,15 @@ class ProductFilters extends QueryFilters
         });
     }
 
+    public function product_key(string $filter = '') : Builder
+    {
+        if (strlen($filter) == 0) {
+            return $this->builder;
+        }
+
+        return  $this->builder->where('product_key', $filter);
+    }
+
     /**
      * Filters the list based on the status
      * archived, active, deleted.
diff --git a/app/Filters/ProjectFilters.php b/app/Filters/ProjectFilters.php
index 8c17b6c3a836..f6202c25ee60 100644
--- a/app/Filters/ProjectFilters.php
+++ b/app/Filters/ProjectFilters.php
@@ -141,6 +141,5 @@ class ProjectFilters extends QueryFilters
         //return $this->builder->whereCompanyId(auth()->user()->company()->id);
         // return $this->builder->whereCompanyId(auth()->user()->company()->id)->orWhere('company_id', null);
         return $this->builder->company();
-
     }
 }
diff --git a/app/Filters/PurchaseOrderFilters.php b/app/Filters/PurchaseOrderFilters.php
index 38be4155d694..3aa91958ef36 100644
--- a/app/Filters/PurchaseOrderFilters.php
+++ b/app/Filters/PurchaseOrderFilters.php
@@ -11,8 +11,6 @@
 
 namespace App\Filters;
 
-
-
 use App\Models\PurchaseOrder;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Builder;
@@ -157,7 +155,6 @@ class PurchaseOrderFilters extends QueryFilters
      *
      * We need to ensure we are using the correct company ID
      * as we could be hitting this from either the client or company auth guard
-     *
      */
     public function entityFilter()
     {
diff --git a/app/Filters/QueryFilters.php b/app/Filters/QueryFilters.php
index d16619ce85a0..83fb8a36fdc6 100644
--- a/app/Filters/QueryFilters.php
+++ b/app/Filters/QueryFilters.php
@@ -22,7 +22,7 @@ use Illuminate\Http\Request;
 abstract class QueryFilters
 {
     use MakesHash;
-    
+
     /**
      * active status.
      */
@@ -52,6 +52,13 @@ abstract class QueryFilters
      */
     protected $builder;
 
+    /**
+     * The "with" filter property column.
+     * 
+     * var string
+     */
+    protected $with_property = 'id';
+
     /**
      * Create a new QueryFilters instance.
      *
@@ -168,7 +175,7 @@ abstract class QueryFilters
 
     public function created_at($value)
     {
-        $created_at = $value ? (int)$value : 0;
+        $created_at = $value ? (int) $value : 0;
 
         $created_at = date('Y-m-d H:i:s', $value);
 
@@ -177,11 +184,11 @@ abstract class QueryFilters
 
     public function is_deleted($value)
     {
-        if($value == 'true')
+        if ($value == 'true') {
             return $this->builder->where('is_deleted', $value)->withTrashed();
+        }
 
         return $this->builder->where('is_deleted', $value);
-
     }
 
     public function client_id(string $client_id = '') :Builder
@@ -191,20 +198,14 @@ abstract class QueryFilters
         }
 
         return $this->builder->where('client_id', $this->decodePrimaryKey($client_id));
-        
     }
 
     public function filter_deleted_clients($value)
     {
-
-        if($value == 'true'){
-
+        if ($value == 'true') {
             return $this->builder->whereHas('client', function (Builder $query) {
-
-              $query->where('is_deleted', 0);
-              
+                $query->where('is_deleted', 0);
             });
-
         }
 
         return $this->builder;
@@ -212,11 +213,8 @@ abstract class QueryFilters
 
     public function with_trashed($value)
     {
-
-        if($value == 'false'){
-
+        if ($value == 'false') {
             return $this->builder->where('is_deleted', 0);
-
         }
 
         // if($value == 'true'){
@@ -226,6 +224,12 @@ abstract class QueryFilters
         // }
 
         return $this->builder;
+    }
 
+    public function with(string $value): Builder
+    {
+        return $this->builder
+            ->orWhere($this->with_property, $value)
+            ->orderByRaw("{$this->with_property} = ? DESC", [$value]);
     }
 }
diff --git a/app/Filters/TaskStatusFilters.php b/app/Filters/TaskStatusFilters.php
index d77f353be677..67886d83aad4 100644
--- a/app/Filters/TaskStatusFilters.php
+++ b/app/Filters/TaskStatusFilters.php
@@ -35,7 +35,6 @@ class TaskStatusFilters extends QueryFilters
         return  $this->builder->where(function ($query) use ($filter) {
             $query->where('task_statuses.name', 'like', '%'.$filter.'%');
         });
-
     }
 
     /**
diff --git a/app/Filters/TaxRateFilters.php b/app/Filters/TaxRateFilters.php
index 31d21084f726..ab8bdbfc79b9 100644
--- a/app/Filters/TaxRateFilters.php
+++ b/app/Filters/TaxRateFilters.php
@@ -35,7 +35,6 @@ class TaxRateFilters extends QueryFilters
         return  $this->builder->where(function ($query) use ($filter) {
             $query->where('tax_rates.name', 'like', '%'.$filter.'%');
         });
-
     }
 
     /**
diff --git a/app/Filters/VendorFilters.php b/app/Filters/VendorFilters.php
index 2e8daa253969..dd2c7e885824 100644
--- a/app/Filters/VendorFilters.php
+++ b/app/Filters/VendorFilters.php
@@ -38,7 +38,7 @@ class VendorFilters extends QueryFilters
         return  $this->builder->where(function ($query) use ($filter) {
             $query->where('vendors.name', 'like', '%'.$filter.'%')
                           ->orWhere('vendors.id_number', 'like', '%'.$filter.'%')
-                          ->orWhereHas('contacts', function ($query) use($filter){
+                          ->orWhereHas('contacts', function ($query) use ($filter) {
                               $query->where('vendor_contacts.first_name', 'like', '%'.$filter.'%');
                               $query->orWhere('vendor_contacts.last_name', 'like', '%'.$filter.'%');
                               $query->orWhere('vendor_contacts.email', 'like', '%'.$filter.'%');
diff --git a/app/Helpers/Document/WithTypeHelpers.php b/app/Helpers/Document/WithTypeHelpers.php
index 45984e12d6d1..eb43316f68c8 100644
--- a/app/Helpers/Document/WithTypeHelpers.php
+++ b/app/Helpers/Document/WithTypeHelpers.php
@@ -16,8 +16,8 @@ trait WithTypeHelpers
 {
     /**
      * Returns boolean based on checks for image.
-     * 
-     * @return bool 
+     *
+     * @return bool
      */
     public function isImage(): bool
     {
diff --git a/app/Helpers/Generic.php b/app/Helpers/Generic.php
index 87cbb4a3c803..feb40dd030e9 100644
--- a/app/Helpers/Generic.php
+++ b/app/Helpers/Generic.php
@@ -22,34 +22,22 @@ use App\Utils\Ninja;
  */
 function nlog($output, $context = []): void
 {
-    
-    if (!config('ninja.expanded_logging')) 
+    if (! config('ninja.expanded_logging')) {
         return;
+    }
 
-        if (gettype($output) == 'object') {
-            $output = print_r($output, 1);
-        }
+    if (gettype($output) == 'object') {
+        $output = print_r($output, 1);
+    }
 
-        $trace = debug_backtrace();
-        //nlog( debug_backtrace()[1]['function']);
-        // \Illuminate\Support\Facades\Log::channel('invoiceninja')->info(print_r($trace[1]['class'],1), []);
-        if(Ninja::isHosted()) {
-            try{
-                info($output);
-            }
-            catch(\Exception $e){
-
-            }
-        }
-        else
-            \Illuminate\Support\Facades\Log::channel('invoiceninja')->info($output, $context);
+    // $trace = debug_backtrace();
     
-}
-
-// if (!function_exists('ray'))   {
-// 	function ray($payload)
-// 	{
-// 		return true;
-// 	}
-// }
-
+    if (Ninja::isHosted()) {
+        try {
+            info($output);
+        } catch (\Exception $e) {
+        }
+    } else {
+        \Illuminate\Support\Facades\Log::channel('invoiceninja')->info($output, $context);
+    }
+}
\ No newline at end of file
diff --git a/app/Helpers/Invoice/CustomValuer.php b/app/Helpers/Invoice/CustomValuer.php
index b4df53a725ee..378e418ceb3f 100644
--- a/app/Helpers/Invoice/CustomValuer.php
+++ b/app/Helpers/Invoice/CustomValuer.php
@@ -27,7 +27,6 @@ trait CustomValuer
 
     public function valuerTax($custom_value, $has_custom_invoice_taxes)
     {
-
         if (isset($custom_value) && is_numeric($custom_value) && $has_custom_invoice_taxes) {
             return round($custom_value * ($this->invoice->tax_rate1 / 100), 2) + round($custom_value * ($this->invoice->tax_rate2 / 100), 2) + round($custom_value * ($this->invoice->tax_rate3 / 100), 2);
         }
diff --git a/app/Helpers/Invoice/InvoiceItemSum.php b/app/Helpers/Invoice/InvoiceItemSum.php
index ba6e378a9ea2..8e3b702d7f6f 100644
--- a/app/Helpers/Invoice/InvoiceItemSum.php
+++ b/app/Helpers/Invoice/InvoiceItemSum.php
@@ -52,10 +52,11 @@ class InvoiceItemSum
 
         $this->invoice = $invoice;
 
-        if($this->invoice->client)
+        if ($this->invoice->client) {
             $this->currency = $this->invoice->client->currency();
-        else
+        } else {
             $this->currency = $this->invoice->vendor->currency();
+        }
 
         $this->line_items = [];
     }
@@ -98,7 +99,7 @@ class InvoiceItemSum
     }
 
     private function sumLineItem()
-    {   
+    {
         $this->setLineTotal($this->item->cost * $this->item->quantity);
 
         return $this;
@@ -134,23 +135,26 @@ class InvoiceItemSum
 
         $item_tax += $item_tax_rate1_total;
 
-        // if($item_tax_rate1_total != 0)           
-        if (strlen($this->item->tax_name1) > 1) 
-              $this->groupTax($this->item->tax_name1, $this->item->tax_rate1, $item_tax_rate1_total);
-        
+        // if($item_tax_rate1_total != 0)
+        if (strlen($this->item->tax_name1) > 1) {
+            $this->groupTax($this->item->tax_name1, $this->item->tax_rate1, $item_tax_rate1_total);
+        }
+
         $item_tax_rate2_total = $this->calcAmountLineTax($this->item->tax_rate2, $amount);
 
         $item_tax += $item_tax_rate2_total;
 
-        if (strlen($this->item->tax_name2) > 1) 
+        if (strlen($this->item->tax_name2) > 1) {
             $this->groupTax($this->item->tax_name2, $this->item->tax_rate2, $item_tax_rate2_total);
-        
+        }
+
         $item_tax_rate3_total = $this->calcAmountLineTax($this->item->tax_rate3, $amount);
 
         $item_tax += $item_tax_rate3_total;
 
-        if (strlen($this->item->tax_name3) > 1) 
+        if (strlen($this->item->tax_name3) > 1) {
             $this->groupTax($this->item->tax_name3, $this->item->tax_rate3, $item_tax_rate3_total);
+        }
 
         $this->setTotalTaxes($this->formatValue($item_tax, $this->currency->precision));
 
@@ -280,7 +284,6 @@ class InvoiceItemSum
             if ($item_tax_rate3_total != 0) {
                 $this->groupTax($this->item->tax_name3, $this->item->tax_rate3, $item_tax_rate3_total);
             }
-
         }
 
         $this->setTotalTaxes($item_tax);
diff --git a/app/Helpers/Invoice/InvoiceItemSumInclusive.php b/app/Helpers/Invoice/InvoiceItemSumInclusive.php
index 0b5628229353..213600d3501f 100644
--- a/app/Helpers/Invoice/InvoiceItemSumInclusive.php
+++ b/app/Helpers/Invoice/InvoiceItemSumInclusive.php
@@ -46,10 +46,11 @@ class InvoiceItemSumInclusive
 
         $this->invoice = $invoice;
 
-        if($this->invoice->client)
+        if ($this->invoice->client) {
             $this->currency = $this->invoice->client->currency();
-        else
+        } else {
             $this->currency = $this->invoice->vendor->currency();
+        }
 
         $this->line_items = [];
     }
@@ -122,24 +123,26 @@ class InvoiceItemSumInclusive
 
         $item_tax += $this->formatValue($item_tax_rate1_total, $this->currency->precision);
 
-        // if($item_tax_rate1_total != 0)     
-        if (strlen($this->item->tax_name1) > 1)     
-            $this->groupTax($this->item->tax_name1, $this->item->tax_rate1, $item_tax_rate1_total);        
+        // if($item_tax_rate1_total != 0)
+        if (strlen($this->item->tax_name1) > 1) {
+            $this->groupTax($this->item->tax_name1, $this->item->tax_rate1, $item_tax_rate1_total);
+        }
 
         $item_tax_rate2_total = $this->calcInclusiveLineTax($this->item->tax_rate2, $amount);
 
         $item_tax += $this->formatValue($item_tax_rate2_total, $this->currency->precision);
 
-        if (strlen($this->item->tax_name2) > 1)   
+        if (strlen($this->item->tax_name2) > 1) {
             $this->groupTax($this->item->tax_name2, $this->item->tax_rate2, $item_tax_rate2_total);
-        
+        }
+
         $item_tax_rate3_total = $this->calcInclusiveLineTax($this->item->tax_rate3, $amount);
 
         $item_tax += $this->formatValue($item_tax_rate3_total, $this->currency->precision);
 
-        if (strlen($this->item->tax_name3) > 1)   
+        if (strlen($this->item->tax_name3) > 1) {
             $this->groupTax($this->item->tax_name3, $this->item->tax_rate3, $item_tax_rate3_total);
-        
+        }
 
         $this->setTotalTaxes($this->formatValue($item_tax, $this->currency->precision));
 
@@ -239,12 +242,12 @@ class InvoiceItemSumInclusive
         $item_tax = 0;
 
         foreach ($this->line_items as $this->item) {
-
-            if($this->sub_total == 0)
+            if ($this->sub_total == 0) {
                 $amount = $this->item->line_total;
-            else
+            } else {
                 $amount = $this->item->line_total - ($this->item->line_total * ($this->invoice->discount / $this->sub_total));
-            
+            }
+
             $item_tax_rate1_total = $this->calcInclusiveLineTax($this->item->tax_rate1, $amount);
 
             $item_tax += $item_tax_rate1_total;
diff --git a/app/Helpers/Invoice/InvoiceSum.php b/app/Helpers/Invoice/InvoiceSum.php
index 40fb99e0a128..b1c170a26736 100644
--- a/app/Helpers/Invoice/InvoiceSum.php
+++ b/app/Helpers/Invoice/InvoiceSum.php
@@ -55,10 +55,11 @@ class InvoiceSum
     {
         $this->invoice = $invoice;
 
-        if($this->invoice->client)
+        if ($this->invoice->client) {
             $this->precision = $this->invoice->client->currency()->precision;
-        else
+        } else {
             $this->precision = $this->invoice->vendor->currency()->precision;
+        }
 
         $this->tax_map = new Collection;
     }
@@ -85,7 +86,7 @@ class InvoiceSum
         $this->total = $this->invoice_items->getSubTotal();
         $this->setSubTotal($this->invoice_items->getSubTotal());
         $this->setGrossSubTotal($this->invoice_items->getGrossSubTotal());
-        
+
         return $this;
     }
 
@@ -116,8 +117,7 @@ class InvoiceSum
 
     private function calculateInvoiceTaxes()
     {
-
-        if (strlen($this->invoice->tax_name1) > 1) {
+        if (is_string($this->invoice->tax_name1) && strlen($this->invoice->tax_name1) > 1) {
             $tax = $this->taxer($this->total, $this->invoice->tax_rate1);
             $tax += $this->getSurchargeTaxTotalForKey($this->invoice->tax_name1, $this->invoice->tax_rate1);
 
@@ -125,7 +125,7 @@ class InvoiceSum
             $this->total_tax_map[] = ['name' => $this->invoice->tax_name1.' '.floatval($this->invoice->tax_rate1).'%', 'total' => $tax];
         }
 
-        if (strlen($this->invoice->tax_name2) > 1) {
+        if (is_string($this->invoice->tax_name2) && strlen($this->invoice->tax_name2) > 1) {
             $tax = $this->taxer($this->total, $this->invoice->tax_rate2);
             $tax += $this->getSurchargeTaxTotalForKey($this->invoice->tax_name2, $this->invoice->tax_rate2);
 
@@ -133,14 +133,14 @@ class InvoiceSum
             $this->total_tax_map[] = ['name' => $this->invoice->tax_name2.' '.floatval($this->invoice->tax_rate2).'%', 'total' => $tax];
         }
 
-        if (strlen($this->invoice->tax_name3) > 1) {
+        if (is_string($this->invoice->tax_name3) && strlen($this->invoice->tax_name3) > 1) {
             $tax = $this->taxer($this->total, $this->invoice->tax_rate3);
             $tax += $this->getSurchargeTaxTotalForKey($this->invoice->tax_name3, $this->invoice->tax_rate3);
 
             $this->total_taxes += $tax;
             $this->total_tax_map[] = ['name' => $this->invoice->tax_name3.' '.floatval($this->invoice->tax_rate3).'%', 'total' => $tax];
         }
-        
+
         return $this;
     }
 
@@ -180,6 +180,7 @@ class InvoiceSum
     public function getTempEntity()
     {
         $this->setCalculatedAttributes();
+
         return $this->invoice;
     }
 
@@ -329,37 +330,29 @@ class InvoiceSum
 
     private function getSurchargeTaxTotalForKey($key, $rate)
     {
-
         $tax_component = 0;
 
-        if($this->invoice->custom_surcharge_tax1)
-        {
+        if ($this->invoice->custom_surcharge_tax1) {
             $tax_component += round($this->invoice->custom_surcharge1 * ($rate / 100), 2);
         }
 
-        if($this->invoice->custom_surcharge_tax2)
-        {
+        if ($this->invoice->custom_surcharge_tax2) {
             $tax_component += round($this->invoice->custom_surcharge2 * ($rate / 100), 2);
         }
 
-        if($this->invoice->custom_surcharge_tax3)
-        {
+        if ($this->invoice->custom_surcharge_tax3) {
             $tax_component += round($this->invoice->custom_surcharge3 * ($rate / 100), 2);
         }
 
-        if($this->invoice->custom_surcharge_tax4)
-        {
+        if ($this->invoice->custom_surcharge_tax4) {
             $tax_component += round($this->invoice->custom_surcharge4 * ($rate / 100), 2);
         }
-        
+
         return $tax_component;
-     
     }
 
-
-
     public function getTaxMap()
-    {        
+    {
         return $this->tax_map;
     }
 
diff --git a/app/Helpers/Invoice/InvoiceSumInclusive.php b/app/Helpers/Invoice/InvoiceSumInclusive.php
index 5e09187303cc..ad38f2754691 100644
--- a/app/Helpers/Invoice/InvoiceSumInclusive.php
+++ b/app/Helpers/Invoice/InvoiceSumInclusive.php
@@ -42,6 +42,7 @@ class InvoiceSumInclusive
     private $sub_total;
 
     private $precision;
+
     /**
      * Constructs the object with Invoice and Settings object.
      *
@@ -51,10 +52,11 @@ class InvoiceSumInclusive
     {
         $this->invoice = $invoice;
 
-        if($this->invoice->client)
+        if ($this->invoice->client) {
             $this->precision = $this->invoice->client->currency()->precision;
-        else
+        } else {
             $this->precision = $this->invoice->vendor->currency()->precision;
+        }
 
         $this->tax_map = new Collection;
     }
@@ -170,7 +172,6 @@ class InvoiceSumInclusive
 
     private function calculateTotals()
     {
-
         return $this;
     }
 
@@ -188,6 +189,7 @@ class InvoiceSumInclusive
     public function getTempEntity()
     {
         $this->setCalculatedAttributes();
+
         return $this->invoice;
     }
 
@@ -243,7 +245,7 @@ class InvoiceSumInclusive
                 $this->invoice->balance = $this->formatValue($this->getTotal(), $this->precision);
             }
         }
-        
+
         /* Set new calculated total */
         $this->invoice->amount = $this->formatValue($this->getTotal(), $this->precision);
 
diff --git a/app/Helpers/Invoice/ProRata.php b/app/Helpers/Invoice/ProRata.php
index 50b3fa108613..d79ae48d7d64 100644
--- a/app/Helpers/Invoice/ProRata.php
+++ b/app/Helpers/Invoice/ProRata.php
@@ -20,62 +20,62 @@ use Illuminate\Support\Carbon;
 
 class ProRata
 {
-
-
     /**
      * Returns the amount to refund based on
      * the time interval and the frequency duration
-     * 
-     * @param float $amount 
-     * @param Carbon $from_date 
-     * @param Carbon $to_date 
-     * @param int $frequency 
-     * @return float 
+     *
+     * @param float $amount
+     * @param Carbon $from_date
+     * @param Carbon $to_date
+     * @param int $frequency
+     * @return float
      */
     public function refund(float $amount, Carbon $from_date, Carbon $to_date, int $frequency) :float
     {
         $days = $from_date->copy()->diffInDays($to_date);
         $days_in_frequency = $this->getDaysInFrequency($frequency);
 
-        return round( (($days/$days_in_frequency) * $amount),2);
+        return round((($days / $days_in_frequency) * $amount), 2);
     }
 
     /**
      * Returns the amount to charge based on
      * the time interval and the frequency duration
-     * 
-     * @param float $amount 
-     * @param Carbon $from_date 
-     * @param Carbon $to_date 
-     * @param int $frequency 
-     * @return float 
+     *
+     * @param float $amount
+     * @param Carbon $from_date
+     * @param Carbon $to_date
+     * @param int $frequency
+     * @return float
      */
     public function charge(float $amount, Carbon $from_date, Carbon $to_date, int $frequency) :float
     {
         $days = $from_date->copy()->diffInDays($to_date);
         $days_in_frequency = $this->getDaysInFrequency($frequency);
 
-        return round( (($days/$days_in_frequency) * $amount),2);
+        return round((($days / $days_in_frequency) * $amount), 2);
     }
 
     /**
      * Prepares the line items of an invoice
      * to be pro rata refunded.
-     * 
-     * @param Invoice $invoice 
-     * @param bool $is_credit 
-     * @return array 
-     * @throws Exception 
+     *
+     * @param Invoice $invoice
+     * @param bool $is_credit
+     * @return array
+     * @throws Exception
      */
     public function refundItems(Invoice $invoice, $is_credit = false) :array
     {
-        if(!$invoice)
+        if (! $invoice) {
             return [];
+        }
 
         $recurring_invoice = RecurringInvoice::find($invoice->recurring_id)->first();
 
-        if(!$recurring_invoice)
+        if (! $recurring_invoice) {
             throw new \Exception("Invoice isn't attached to a recurring invoice");
+        }
 
         /* depending on whether we are creating an invoice or a credit*/
         $multiplier = $is_credit ? 1 : -1;
@@ -84,29 +84,22 @@ class ProRata
 
         $line_items = [];
 
-        foreach($invoice->line_items as $item)
-        {
-
-            if($item->product_key != ctrans('texts.refund'))
-            {
+        foreach ($invoice->line_items as $item) {
+            if ($item->product_key != ctrans('texts.refund')) {
                 $item->quantity = 1;
-                $item->cost = $this->refund($item->cost*$multiplier, $start_date, now(), $recurring_invoice->frequency_id);
+                $item->cost = $this->refund($item->cost * $multiplier, $start_date, now(), $recurring_invoice->frequency_id);
                 $item->product_key = ctrans('texts.refund');
-                $item->notes = ctrans('texts.refund') . ": ". $item->notes;
+                $item->notes = ctrans('texts.refund').': '.$item->notes;
 
                 $line_items[] = $item;
-
             }
         }
 
         return $line_items;
-
     }
 
-
     private function getDaysInFrequency($frequency)
     {
-
         switch ($frequency) {
             case RecurringInvoice::FREQUENCY_DAILY:
                 return 1;
@@ -135,7 +128,5 @@ class ProRata
             default:
                 return 0;
         }
-
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/Helpers/Mail/GmailTransport.php b/app/Helpers/Mail/GmailTransport.php
index 711c15e22d6e..6e36804720b4 100644
--- a/app/Helpers/Mail/GmailTransport.php
+++ b/app/Helpers/Mail/GmailTransport.php
@@ -11,92 +11,72 @@
 
 namespace App\Helpers\Mail;
 
-use App\Utils\TempFile;
-use Dacastro4\LaravelGmail\Facade\LaravelGmail;
-use Dacastro4\LaravelGmail\Services\Message\Mail;
-use Illuminate\Mail\Transport\Transport;
-use Swift_Mime_SimpleMessage;
+use Google\Service\Gmail;
+use Google\Service\Gmail\Message;
+use Google\Client;
+use Symfony\Component\Mailer\SentMessage;
+use Symfony\Component\Mailer\Transport\AbstractTransport;
+use Symfony\Component\Mime\MessageConverter;
 
 /**
  * GmailTransport.
  */
-class GmailTransport extends Transport
+class GmailTransport extends AbstractTransport
 {
-    /**
-     * The Gmail instance.
-     *
-     * @var Mail
-     */
-    protected $gmail;
 
-    /**
-     * Create a new Gmail transport instance.
-     *
-     * @param Mail $gmail
-     * @param string $token
-     */
-    public function __construct(Mail $gmail)
+    public function __construct()
     {
-        $this->gmail = $gmail;
+        parent::__construct();
     }
 
-    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
+    protected function doSend(SentMessage $message): void
     {
-        /* For some reason the Injected Mail class carries cached tokens, so we need to reinit the Mail class*/
-        $this->gmail = null;
-        $this->gmail = new Mail;
+        nlog("In Do Send");
+        $message = MessageConverter::toEmail($message->getOriginalMessage());
 
-        /*We should nest the token in the message and then discard it as needed*/
-        $token = $message->getHeaders()->get('GmailToken')->getValue();
+        $token = $message->getHeaders()->get('gmailtoken')->getValue();
+        $message->getHeaders()->remove('gmailtoken');
+
+        $client = new Client();
+        $client->setClientId(config('ninja.auth.google.client_id'));
+        $client->setClientSecret(config('ninja.auth.google.client_secret'));
+        $client->setAccessToken($token);
         
-        $message->getHeaders()->remove('GmailToken');
+        $service = new Gmail($client);
 
-        $this->beforeSendPerformed($message);
+        $body = new Message();
 
-        $this->gmail->using($token);
-        $this->gmail->to($message->getTo());
-        $this->gmail->from($message->getFrom());
-        $this->gmail->subject($message->getSubject());
-        $this->gmail->message($message->getBody());
+        $bccs = $message->getHeaders()->get('Bcc');
 
-        $this->gmail->cc($message->getCc());
+        $bcc_list = '';
 
-        if(is_array($message->getBcc()))
-            $this->gmail->bcc(array_keys($message->getBcc()));
-
-        foreach ($message->getChildren() as $child) 
+        if($bccs)
         {
+            $bcc_list = 'Bcc: ';
 
-            if($child->getContentType() != 'text/plain')
-            {
+            foreach($bccs->getAddresses() as $address){
+
+                $bcc_list .= $address->getAddress() .',';
 
-                $this->gmail->attach(TempFile::filePath($child->getBody(), $child->getHeaders()->get('Content-Type')->getParameter('name') ));
-            
             }
 
-        } 
+            $bcc_list = rtrim($bcc_list, ",") . "\r\n";
+        }  
 
-        /**
-         * Google is very strict with their
-         * sending limits, if we hit 429s, sleep and
-         * retry again later.
-         */
-        try{
+        $body->setRaw($this->base64_encode($bcc_list.$message->toString()));
 
-            $this->gmail->send();
-
-        }
-        catch(\Google\Service\Exception $e)
-        {
-            nlog("gmail exception");
-            nlog($e->getErrors());
-
-            sleep(5);
-            $this->gmail->send();
-        }
-
-        $this->sendPerformed($message);
-
-        return $this->numberOfRecipients($message);
+        $service->users_messages->send('me', $body, []);
+        
     }
+ 
+    private function base64_encode($data)
+    {
+        return rtrim(strtr(base64_encode($data), ['+' => '-', '/' => '_']), '=');
+    }
+
+    public function __toString(): string
+    {
+        return 'gmail';
+    }
+
 }
diff --git a/app/Helpers/Mail/GmailTransportManager.php b/app/Helpers/Mail/GmailTransportManager.php
deleted file mode 100644
index b6f574427f50..000000000000
--- a/app/Helpers/Mail/GmailTransportManager.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Invoice Ninja (https://invoiceninja.com).
- *
- * @link https://github.com/invoiceninja/invoiceninja source repository
- *
- * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
- *
- * @license https://www.elastic.co/licensing/elastic-license
- */
-namespace App\Helpers\Mail;
-
-use App\CustomMailDriver\CustomTransport;
-use App\Helpers\Mail\Office365MailTransport;
-use Dacastro4\LaravelGmail\Services\Message\Mail;
-use Illuminate\Mail\MailManager;
-use Illuminate\Support\Facades\Config;
-
-
-class GmailTransportManager extends MailManager
-{
-    protected function createGmailTransport()
-    {
-        return new GmailTransport(new Mail);
-    }
-
-    protected function createOffice365Transport()
-    {
-        return new Office365MailTransport();
-    }
-}
\ No newline at end of file
diff --git a/app/Helpers/Mail/Office365MailTransport.php b/app/Helpers/Mail/Office365MailTransport.php
index b7fa2546f67a..e396e8f42531 100644
--- a/app/Helpers/Mail/Office365MailTransport.php
+++ b/app/Helpers/Mail/Office365MailTransport.php
@@ -11,291 +11,67 @@
 
 namespace App\Helpers\Mail;
 
-use Illuminate\Mail\Transport\Transport;
 use Illuminate\Support\Str;
-use Swift_Mime_SimpleMessage;
 use Microsoft\Graph\Graph;
 use Microsoft\Graph\Model\UploadSession;
+use Symfony\Component\Mailer\SentMessage;
+use Symfony\Component\Mailer\Transport\AbstractTransport;
+use Symfony\Component\Mime\MessageConverter;
 
-class Office365MailTransport extends Transport
+class Office365MailTransport extends AbstractTransport
 {
 
     public function __construct()
     {
+        parent::__construct();
     }
 
-    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
+    protected function doSend(SentMessage $message): void
     {
 
-        $this->beforeSendPerformed($message);
+        $symfony_message = MessageConverter::toEmail($message->getOriginalMessage());
 
         $graph = new Graph();
-        $token = $message->getHeaders()->get('GmailToken')->getValue();
+        $token = $symfony_message->getHeaders()->get('gmailtoken')->getValue();
+        $symfony_message->getHeaders()->remove('gmailtoken');
 
         $graph->setAccessToken($token);
 
-        // Special treatment if the message has too large attachments
-        $messageBody = $this->getBody($message, true);
-        $messageBodySizeMb = json_encode($messageBody);
-        $messageBodySizeMb = strlen($messageBodySizeMb);
-        $messageBodySizeMb = $messageBodySizeMb / 1048576; //byte -> mb
+        $bccs = $symfony_message->getHeaders()->get('Bcc');
 
-        if ($messageBodySizeMb >= 4) {
-            unset($messageBody);
-            $graphMessage = $graph->createRequest("POST", "/users/" . key($message->getFrom()) . "/messages")
-                ->attachBody($this->getBody($message))
+        $bcc_list = '';
+
+        if($bccs)
+        {
+
+            foreach($bccs->getAddresses() as $address){
+
+                $bcc_list .= 'Bcc: "'.$address->getAddress().'" <'.$address->getAddress().'>\r\n';
+
+            }
+
+        }   
+
+        try {
+            $graphMessage = $graph->createRequest('POST', '/users/'.$symfony_message->getFrom()[0]->getAddress().'/sendmail')
+                ->attachBody(base64_encode($bcc_list.$message->toString()))
+                ->addHeaders(['Content-Type' => 'text/plain'])
+                ->setReturnType(\Microsoft\Graph\Model\Message::class)
+                ->execute();
+        } catch (\Exception $e) {
+            sleep(5);
+            $graphMessage = $graph->createRequest('POST', '/users/'.$symfony_message->getFrom()[0]->getAddress().'/sendmail')
+                ->attachBody(base64_encode($bcc_list.$message->toString()))
+                ->addHeaders(['Content-Type' => 'text/plain'])
                 ->setReturnType(\Microsoft\Graph\Model\Message::class)
                 ->execute();
-
-            foreach ($message->getChildren() as $attachment) {
-                if ($attachment instanceof \Swift_Mime_SimpleMimeEntity) {
-                    $fileName = $attachment->getHeaders()->get('Content-Type')->getParameter('name');
-                    $content = $attachment->getBody();
-                    $fileSize = strlen($content);
-                    $size = $fileSize / 1048576; //byte -> mb
-                    $id = $attachment->getId();
-                    $attachmentMessage = [
-                        'AttachmentItem' => [
-                            'attachmentType' => 'file',
-                            'name' => $fileName,
-                            'size' => strlen($content)
-                        ]
-                    ];
-
-                    if ($size <= 3) { //ErrorAttachmentSizeShouldNotBeLessThanMinimumSize if attachment <= 3mb, then we need to add this
-                        $attachmentBody = [
-                            "@odata.type" => "#microsoft.graph.fileAttachment",
-                            "name" => $attachment->getHeaders()->get('Content-Type')->getParameter('name'),
-                            "contentType" => $attachment->getBodyContentType(),
-                            "contentBytes" => base64_encode($attachment->getBody()),
-                            'contentId'    => $id
-                        ];
-
-                        $addAttachment = $graph->createRequest("POST", "/users/" . key($message->getFrom()) . "/messages/" . $graphMessage->getId() . "/attachments")
-                            ->attachBody($attachmentBody)
-                            ->setReturnType(UploadSession::class)
-                            ->execute();
-                    } else {
-                        //upload the files in chunks of 4mb....
-                        $uploadSession = $graph->createRequest("POST", "/users/" . key($message->getFrom()) . "/messages/" . $graphMessage->getId() . "/attachments/createUploadSession")
-                            ->attachBody($attachmentMessage)
-                            ->setReturnType(UploadSession::class)
-                            ->execute();
-
-                        $fragSize =  1024 * 1024 * 4; //4mb at once...
-                        $numFragments = ceil($fileSize / $fragSize);
-                        $contentChunked = str_split($content, $fragSize);
-                        $bytesRemaining = $fileSize;
-
-                        $i = 0;
-                        while ($i < $numFragments) {
-                            $chunkSize = $numBytes = $fragSize;
-                            $start = $i * $fragSize;
-                            $end = $i * $fragSize + $chunkSize - 1;
-                            if ($bytesRemaining < $chunkSize) {
-                                $chunkSize = $numBytes = $bytesRemaining;
-                                $end = $fileSize - 1;
-                            }
-                            $data = $contentChunked[$i];
-                            $content_range = "bytes " . $start . "-" . $end . "/" . $fileSize;
-                            $headers = [
-                                "Content-Length" => $numBytes,
-                                "Content-Range" => $content_range
-                            ];
-                            $client = new \GuzzleHttp\Client();
-                            $tmp = $client->put($uploadSession->getUploadUrl(), [
-                                'headers'         => $headers,
-                                'body'            => $data,
-                                'allow_redirects' => false,
-                                'timeout'         => 1000
-                            ]);
-                            $result = $tmp->getBody() . '';
-                            $result = json_decode($result); //if body == empty, then the file was successfully uploaded
-                            $bytesRemaining = $bytesRemaining - $chunkSize;
-                            $i++;
-                        }
-                    }
-                }
-            }
-
-            //definetly send the message
-            $graph->createRequest("POST", "/users/" . key($message->getFrom()) . "/messages/" . $graphMessage->getId() . "/send")->execute();
-        } else {
-
-            try {
-                $graphMessage = $graph->createRequest("POST", "/users/" . key($message->getFrom()) . "/sendmail")
-                    ->attachBody($messageBody)
-                    ->setReturnType(\Microsoft\Graph\Model\Message::class)
-                    ->execute();
-            }
-            catch(\Exception $e){
-
-                sleep(5);
-                $graphMessage = $graph->createRequest("POST", "/users/" . key($message->getFrom()) . "/sendmail")
-                    ->attachBody($messageBody)
-                    ->setReturnType(\Microsoft\Graph\Model\Message::class)
-                    ->execute();
-            }
         }
-
-        $this->sendPerformed($message);
-
-        return $this->numberOfRecipients($message);
+        
     }
 
-    /**
-     * Get body for the message.
-     *
-     * @param \Swift_Mime_SimpleMessage $message
-     * @param bool $withAttachments
-     * @return array
-     */
-
-    protected function getBody(Swift_Mime_SimpleMessage $message, $withAttachments = false)
+    public function __toString(): string
     {
-        $messageData = [
-            'from' => [
-                'emailAddress' => [
-                    'address' => key($message->getFrom()),
-                    'name' => current($message->getFrom())
-                ]
-            ],
-            'toRecipients' => $this->getTo($message),
-            'ccRecipients' => $this->getCc($message),
-            'bccRecipients' => $this->getBcc($message),
-            'replyTo' => $this->getReplyTo($message),
-            'subject' => $message->getSubject(),
-            'body' => [
-                'contentType' => $message->getBodyContentType() == "text/html" ? 'html' : 'text',
-                'content' => $message->getBody()
-            ]
-        ];
-
-        if ($withAttachments) {
-            $messageData = ['message' => $messageData];
-            //add attachments if any
-            $attachments = [];
-            foreach ($message->getChildren() as $attachment) {
-                if ($attachment instanceof \Swift_Mime_SimpleMimeEntity && $attachment->getContentType() != 'text/plain') {
-                    $attachments[] = [
-                        "@odata.type" => "#microsoft.graph.fileAttachment",
-                        "name" => $attachment->getHeaders()->get('Content-Type')->getParameter('name'),
-                        "contentType" => $attachment->getBodyContentType(),
-                        "contentBytes" => base64_encode($attachment->getBody()),
-                        'contentId'    => $attachment->getId()
-                    ];
-                }
-            }
-            if (count($attachments) > 0) {
-                $messageData['message']['attachments'] = $attachments;
-            }
-        }
-
-        return $messageData;
+        return 'office365';
     }
 
-    /**
-     * Get the "to" payload field for the API request.
-     *
-     * @param \Swift_Mime_SimpleMessage $message
-     * @return string
-     */
-    protected function getTo(Swift_Mime_SimpleMessage $message)
-    {
-        return collect((array) $message->getTo())->map(function ($display, $address) {
-            return $display ? [
-                'emailAddress' => [
-                    'address' => $address,
-                    'name' => $display
-                ]
-            ] : [
-                'emailAddress' => [
-                    'address' => $address
-                ]
-            ];
-        })->values()->toArray();
-    }
-
-    /**
-     * Get the "Cc" payload field for the API request.
-     *
-     * @param \Swift_Mime_SimpleMessage $message
-     * @return string
-     */
-    protected function getCc(Swift_Mime_SimpleMessage $message)
-    {
-        return collect((array) $message->getCc())->map(function ($display, $address) {
-            return $display ? [
-                'emailAddress' => [
-                    'address' => $address,
-                    'name' => $display
-                ]
-            ] : [
-                'emailAddress' => [
-                    'address' => $address
-                ]
-            ];
-        })->values()->toArray();
-    }
-
-    /**
-     * Get the "replyTo" payload field for the API request.
-     *
-     * @param \Swift_Mime_SimpleMessage $message
-     * @return string
-     */
-    protected function getReplyTo(Swift_Mime_SimpleMessage $message)
-    {
-        return collect((array) $message->getReplyTo())->map(function ($display, $address) {
-            return $display ? [
-                'emailAddress' => [
-                    'address' => $address,
-                    'name' => $display
-                ]
-            ] : [
-                'emailAddress' => [
-                    'address' => $address
-                ]
-            ];
-        })->values()->toArray();
-    }
-
-    /**
-     * Get the "Bcc" payload field for the API request.
-     *
-     * @param \Swift_Mime_SimpleMessage $message
-     * @return string
-     */
-    protected function getBcc(Swift_Mime_SimpleMessage $message)
-    {
-        return collect((array) $message->getBcc())->map(function ($display, $address) {
-            return $display ? [
-                'emailAddress' => [
-                    'address' => $address,
-                    'name' => $display
-                ]
-            ] : [
-                'emailAddress' => [
-                    'address' => $address
-                ]
-            ];
-        })->values()->toArray();
-    }
-
-    /**
-     * Get all of the contacts for the message.
-     *
-     * @param \Swift_Mime_SimpleMessage $message
-     * @return array
-     */
-    protected function allContacts(Swift_Mime_SimpleMessage $message)
-    {
-        return array_merge(
-            (array) $message->getTo(),
-            (array) $message->getCc(),
-            (array) $message->getBcc(),
-            (array) $message->getReplyTo()
-        );
-    }
-
-}
\ No newline at end of file
+}
diff --git a/app/Helpers/Mail/Office365TransportManager.php b/app/Helpers/Mail/Office365TransportManager.php
deleted file mode 100644
index 3c88383820e4..000000000000
--- a/app/Helpers/Mail/Office365TransportManager.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Invoice Ninja (https://invoiceninja.com).
- *
- * @link https://github.com/invoiceninja/invoiceninja source repository
- *
- * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
- *
- * @license https://www.elastic.co/licensing/elastic-license
- */
-
-namespace App\Helpers\Mail;
-
-use App\Helpers\Mail\Office365MailTransport;
-use Illuminate\Mail\MailManager;
-
-class Office365TransportManager extends MailManager
-{
-    protected function createOffice365Transport()
-    {
-        return new Office365MailTransport();
-    }
-}
\ No newline at end of file
diff --git a/app/Helpers/Subscription/SubscriptionCalculator.php b/app/Helpers/Subscription/SubscriptionCalculator.php
index 8cb9d903eed2..4fc5aca2fea2 100644
--- a/app/Helpers/Subscription/SubscriptionCalculator.php
+++ b/app/Helpers/Subscription/SubscriptionCalculator.php
@@ -20,9 +20,8 @@ use Illuminate\Support\Carbon;
 /**
  * SubscriptionCalculator.
  */
-class SubscriptionCalculator 
+class SubscriptionCalculator
 {
-
     public Subscription $target_subscription;
 
     public Invoice $invoice;
@@ -37,20 +36,18 @@ class SubscriptionCalculator
      * Tests if the user is currently up
      * to date with their payments for
      * a given recurring invoice
-     *     
+     *
      * @return bool
      */
     public function isPaidUp() :bool
     {
-
         $outstanding_invoices_exist = Invoice::whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
                                              ->where('subscription_id', $this->invoice->subscription_id)
                                              ->where('client_id', $this->invoice->client_id)
                                              ->where('balance', '>', 0)
                                              ->exists();
 
-       return ! $outstanding_invoices_exist;
-
+        return ! $outstanding_invoices_exist;
     }
 
     public function calcUpgradePlan()
@@ -63,21 +60,21 @@ class SubscriptionCalculator
         //are they paid up to date.
 
         //yes - calculate refund
-        if($this->isPaidUp())
+        if ($this->isPaidUp()) {
             $refund_invoice = $this->getRefundInvoice();
+        }
 
-        if($refund_invoice)
-        {
+        if ($refund_invoice) {
             $subscription = Subscription::find($this->invoice->subscription_id);
             $pro_rata = new ProRata;
 
-            $to_date = $subscription->service()->getNextDateForFrequency(Carbon::parse($refund_invoice->date), $subscription->frequency_id); 
+            $to_date = $subscription->service()->getNextDateForFrequency(Carbon::parse($refund_invoice->date), $subscription->frequency_id);
 
             $refund_amount = $pro_rata->refund($refund_invoice->amount, now(), $to_date, $subscription->frequency_id);
 
             $charge_amount = $pro_rata->charge($this->target_subscription->price, now(), $to_date, $this->target_subscription->frequency_id);
-        
-            return ($charge_amount - $refund_amount);
+
+            return $charge_amount - $refund_amount;
         }
 
         //no - return full freight charge.
@@ -86,7 +83,6 @@ class SubscriptionCalculator
 
     public function executeUpgradePlan()
     {
-
     }
 
     private function getRefundInvoice()
@@ -96,7 +92,5 @@ class SubscriptionCalculator
                       ->where('is_deleted', 0)
                       ->orderBy('id', 'desc')
                       ->first();
-
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 67d2ffca77a2..48dddbb64428 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -143,30 +143,28 @@ class AccountController extends BaseController
      */
     public function store(CreateAccountRequest $request)
     {
-        $account = CreateAccount::dispatchNow($request->all(), $request->getClientIp());
-
+        $account = (new CreateAccount($request->all(), $request->getClientIp()))->handle();
         if (! ($account instanceof Account)) {
             return $account;
         }
 
         $ct = CompanyUser::whereUserId(auth()->user()->id);
 
-            $truth = app()->make(TruthSource::class);
-            $truth->setCompanyUser($ct->first());
-            $truth->setUser(auth()->user());
-            $truth->setCompany($ct->first()->company);
-
+        $truth = app()->make(TruthSource::class);
+        $truth->setCompanyUser($ct->first());
+        $truth->setUser(auth()->user());
+        $truth->setCompany($ct->first()->company);
 
         return $this->listResponse($ct);
     }
 
     public function update(UpdateAccountRequest $request, Account $account)
     {
-
         $fi = new \FilesystemIterator(public_path('react'), \FilesystemIterator::SKIP_DOTS);
 
-        if(iterator_count($fi) < 30)
+        if (iterator_count($fi) < 30) {
             return response()->json(['message' => 'React App Not Installed, Please install the React app before attempting to switch.'], 400);
+        }
 
         $account->fill($request->all());
         $account->save();
diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index e216355c9d14..e64f3df8bec5 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -23,8 +23,8 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Storage;
-use Symfony\Component\HttpFoundation\StreamedResponse;
 use stdClass;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class ActivityController extends BaseController
 {
@@ -91,28 +91,25 @@ class ActivityController extends BaseController
         $activities = Activity::orderBy('created_at', 'DESC')->company()
                                 ->take($default_activities);
 
-        if($request->has('react')){
-
+        if ($request->has('react')) {
             $system = ctrans('texts.system');
 
-            $data = $activities->cursor()->map(function ($activity) use($system){
-
-                $arr=
+            $data = $activities->cursor()->map(function ($activity) use ($system) {
+                $arr =
                 [
-                      'client' => $activity->client ? $activity->client : '',
-                      'contact' => $activity->contact ? $activity->contact : '',
-                      'quote' => $activity->quote ? $activity->quote : '',
-                      'user' => $activity->user ? $activity->user : '',
-                      'expense' => $activity->expense ? $activity->expense : '',
-                      'invoice' => $activity->invoice ? $activity->invoice : '',
-                      'recurring_invoice' => $activity->recurring_invoice ? $activity->recurring_invoice : '',
-                      'payment' => $activity->payment ? $activity->payment : '',
-                      'credit' => $activity->credit ? $activity->credit : '',
-                      'task' => $activity->task ? $activity->task : '',
+                    'client' => $activity->client ? $activity->client : '',
+                    'contact' => $activity->contact ? $activity->contact : '',
+                    'quote' => $activity->quote ? $activity->quote : '',
+                    'user' => $activity->user ? $activity->user : '',
+                    'expense' => $activity->expense ? $activity->expense : '',
+                    'invoice' => $activity->invoice ? $activity->invoice : '',
+                    'recurring_invoice' => $activity->recurring_invoice ? $activity->recurring_invoice : '',
+                    'payment' => $activity->payment ? $activity->payment : '',
+                    'credit' => $activity->credit ? $activity->credit : '',
+                    'task' => $activity->task ? $activity->task : '',
                 ];
 
                 return array_merge($arr, $activity->toArray());
-
             });
 
             return response()->json(['data' => $data->toArray()], 200);
@@ -168,25 +165,23 @@ class ActivityController extends BaseController
         $backup = $activity->backup;
         $html_backup = '';
 
-        /* Refactor 20-10-2021 
+        /* Refactor 20-10-2021
          *
          * We have moved the backups out of the database and into object storage.
-         * In order to handle edge cases, we still check for the database backup 
+         * In order to handle edge cases, we still check for the database backup
          * in case the file no longer exists
         */
 
-        if($backup && $backup->filename && Storage::disk(config('filesystems.default'))->exists($backup->filename)){ //disk
+        if ($backup && $backup->filename && Storage::disk(config('filesystems.default'))->exists($backup->filename)) { //disk
 
-            if(Ninja::isHosted())
+            if (Ninja::isHosted()) {
                 $html_backup = file_get_contents(Storage::disk(config('filesystems.default'))->url($backup->filename));
-            else
+            } else {
                 $html_backup = file_get_contents(Storage::disk(config('filesystems.default'))->path($backup->filename));
-
-        }
-        elseif($backup && $backup->html_backup){ //db
+            }
+        } elseif ($backup && $backup->html_backup) { //db
             $html_backup = $backup->html_backup;
-        }
-        elseif (! $backup || ! $backup->html_backup) { //failed
+        } elseif (! $backup || ! $backup->html_backup) { //failed
             return response()->json(['message'=> ctrans('texts.no_backup_exists'), 'errors' => new stdClass], 404);
         }
 
@@ -195,32 +190,25 @@ class ActivityController extends BaseController
 
             $numbered_pdf = $this->pageNumbering($pdf, $activity->company);
 
-                if($numbered_pdf)
-                    $pdf = $numbered_pdf;
-                
-
-        }
-        elseif(config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja'){
+            if ($numbered_pdf) {
+                $pdf = $numbered_pdf;
+            }
+        } elseif (config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja') {
             $pdf = (new NinjaPdf())->build($html_backup);
 
-                $numbered_pdf = $this->pageNumbering($pdf, $activity->company);
+            $numbered_pdf = $this->pageNumbering($pdf, $activity->company);
 
-                if($numbered_pdf)
-                    $pdf = $numbered_pdf;
-                
-
-
-        }
-        else {
+            if ($numbered_pdf) {
+                $pdf = $numbered_pdf;
+            }
+        } else {
             $pdf = $this->makePdf(null, null, $html_backup);
 
-                $numbered_pdf = $this->pageNumbering($pdf, $activity->company);
-
-                if($numbered_pdf)
-                    $pdf = $numbered_pdf;
-                
-
+            $numbered_pdf = $this->pageNumbering($pdf, $activity->company);
 
+            if ($numbered_pdf) {
+                $pdf = $numbered_pdf;
+            }
         }
 
         if (isset($activity->invoice_id)) {
diff --git a/app/Http/Controllers/Auth/ContactForgotPasswordController.php b/app/Http/Controllers/Auth/ContactForgotPasswordController.php
index 84d4139b33ca..e26fbfc672c8 100644
--- a/app/Http/Controllers/Auth/ContactForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ContactForgotPasswordController.php
@@ -58,26 +58,24 @@ class ContactForgotPasswordController extends Controller
      */
     public function showLinkRequestForm(Request $request)
     {
-
         $account = false;
-        
-        if(Ninja::isHosted() && $request->session()->has('company_key'))
-        {
+
+        if (Ninja::isHosted() && $request->session()->has('company_key')) {
             MultiDB::findAndSetDbByCompanyKey($request->session()->get('company_key'));
             $company = Company::where('company_key', $request->session()->get('company_key'))->first();
             $account = $company->account;
         }
 
-        if(!$account){
+        if (! $account) {
             $account = Account::first();
             $company = $account->companies->first();
         }
-        
+
         return $this->render('auth.passwords.request', [
             'title' => 'Client Password Reset',
             'passwordEmailRoute' => 'client.password.email',
             'account' => $account,
-            'company' => $company
+            'company' => $company,
         ]);
     }
 
@@ -93,44 +91,41 @@ class ContactForgotPasswordController extends Controller
 
     public function sendResetLinkEmail(ContactPasswordResetRequest $request)
     {
-        if(Ninja::isHosted() && $request->has('company_key'))
+        if (Ninja::isHosted() && $request->has('company_key')) {
             MultiDB::findAndSetDbByCompanyKey($request->input('company_key'));
-        
+        }
+
         $this->validateEmail($request);
 
-        if(Ninja::isHosted() && $company = Company::where('company_key', $request->input('company_key'))->first())
-        {
+        if (Ninja::isHosted() && $company = Company::where('company_key', $request->input('company_key'))->first()) {
             $contact = ClientContact::where(['email' => $request->input('email'), 'company_id' => $company->id])
                                     ->whereHas('client', function ($query) {
-                                      $query->where('is_deleted',0);
-                                  })->first();
-        }
-        else {
-            
+                                        $query->where('is_deleted', 0);
+                                    })->first();
+        } else {
             $contact = ClientContact::where(['email' => $request->input('email')])
                                     ->whereHas('client', function ($query) {
-                                      $query->where('is_deleted',0);
-                                  })->first();
+                                        $query->where('is_deleted', 0);
+                                    })->first();
         }
 
         $response = false;
 
-        if($contact){
+        if ($contact) {
 
             /* Update all instances of the client */
             $token = Str::random(60);
             ClientContact::where('email', $contact->email)->update(['token' => $token]);
             $contact->sendPasswordResetNotification($token);
             $response = Password::RESET_LINK_SENT;
-            
-        }
-        else
+        } else {
             return $this->sendResetLinkFailedResponse($request, Password::INVALID_USER);
+        }
 
         if ($request->ajax()) {
-
-            if($response == Password::RESET_THROTTLED)
+            if ($response == Password::RESET_THROTTLED) {
                 return response()->json(['message' => ctrans('passwords.throttled'), 'status' => false], 429);
+            }
 
             return $response == Password::RESET_LINK_SENT
                 ? response()->json(['message' => 'Reset link sent to your email.', 'status' => true], 201)
@@ -141,5 +136,4 @@ class ContactForgotPasswordController extends Controller
             ? $this->sendResetLinkResponse($request, $response)
             : $this->sendResetLinkFailedResponse($request, $response);
     }
-
 }
diff --git a/app/Http/Controllers/Auth/ContactLoginController.php b/app/Http/Controllers/Auth/ContactLoginController.php
index e3118cb0fb73..e64acd510d6e 100644
--- a/app/Http/Controllers/Auth/ContactLoginController.php
+++ b/app/Http/Controllers/Auth/ContactLoginController.php
@@ -37,54 +37,55 @@ class ContactLoginController extends Controller
         $this->middleware('guest:contact', ['except' => ['logout']]);
     }
 
-    public function showLoginForm(Request $request)
+    public function showLoginForm(Request $request, $company_key = false)
     {
-        
         $company = false;
         $account = false;
 
-        if($request->session()->has('company_key')){
+        if ($request->session()->has('company_key')) {
             MultiDB::findAndSetDbByCompanyKey($request->session()->get('company_key'));
             $company = Company::where('company_key', $request->input('company_key'))->first();
         }
-
-        if($company){
-            $account = $company->account;
+        elseif($request->has('company_key')){
+             MultiDB::findAndSetDbByCompanyKey($request->input('company_key'));
+            $company = Company::where('company_key', $request->input('company_key'))->first();
+        }elseif($company_key){
+             MultiDB::findAndSetDbByCompanyKey($company_key);
+            $company = Company::where('company_key', $company_key)->first();
         }
-        elseif (!$company && strpos($request->getHost(), 'invoicing.co') !== false) {
+
+        if ($company) {
+            $account = $company->account;
+        } elseif (! $company && strpos($request->getHost(), 'invoicing.co') !== false) {
             $subdomain = explode('.', $request->getHost())[0];
             MultiDB::findAndSetDbByDomain(['subdomain' => $subdomain]);
             $company = Company::where('subdomain', $subdomain)->first();
-
-        } elseif(Ninja::isHosted()){
-
+        } elseif (Ninja::isHosted()) {
             MultiDB::findAndSetDbByDomain(['portal_domain' => $request->getSchemeAndHttpHost()]);
 
             $company = Company::where('portal_domain', $request->getSchemeAndHttpHost())->first();
-
-        }
-        elseif (Ninja::isSelfHost()) {
+        } elseif (Ninja::isSelfHost()) {
             $account = Account::first();
             $company = $account->default_company;
         } else {
             $company = null;
         }
 
-        if(!$account){
+        if (! $account) {
             $account_id = $request->get('account_id');
             $account = Account::find($account_id);
         }
 
         return $this->render('auth.login', ['account' => $account, 'company' => $company]);
-
     }
 
     public function login(Request $request)
     {
         Auth::shouldUse('contact');
 
-        if(Ninja::isHosted() && $request->has('company_key'))
+        if (Ninja::isHosted() && $request->has('company_key')) {
             MultiDB::findAndSetDbByCompanyKey($request->input('company_key'));
+        }
 
         $this->validateLogin($request);
         // If the class is using the ThrottlesLogins trait, we can automatically throttle
@@ -97,21 +98,20 @@ class ContactLoginController extends Controller
             return $this->sendLockoutResponse($request);
         }
 
-        if(Ninja::isHosted() && $request->has('password') && $company = Company::where('company_key', $request->input('company_key'))->first()){
-
+        if (Ninja::isHosted() && $request->has('password') && $company = Company::where('company_key', $request->input('company_key'))->first()) {
             $contact = ClientContact::where(['email' => $request->input('email'), 'company_id' => $company->id])
                                      ->whereHas('client', function ($query) {
-                                            $query->where('is_deleted',0);
-                                   })->first();
+                                         $query->where('is_deleted', 0);
+                                     })->first();
 
-            if(!$contact)
+            if (! $contact) {
                 return $this->sendFailedLoginResponse($request);
+            }
 
-            if(Hash::check($request->input('password'), $contact->password))
+            if (Hash::check($request->input('password'), $contact->password)) {
                 return $this->authenticated($request, $contact);
-
-        }
-        elseif ($this->attemptLogin($request)) {
+            }
+        } elseif ($this->attemptLogin($request)) {
             return $this->sendLoginResponse($request);
         }
         // If the login attempt was unsuccessful we will increment the number of attempts
@@ -164,19 +164,18 @@ class ContactLoginController extends Controller
 
     private function setRedirectPath()
     {
-
-        if(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES)
+        if (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES) {
             $this->redirectTo = '/client/invoices';
-        elseif(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES)
+        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES) {
             $this->redirectTo = '/client/recurring_invoices';
-        elseif(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES)
+        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES) {
             $this->redirectTo = '/client/quotes';
-        elseif(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS)
+        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS) {
             $this->redirectTo = '/client/credits';
-        elseif(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_TASKS)
+        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_TASKS) {
             $this->redirectTo = '/client/tasks';
-        elseif(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_EXPENSES)
+        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_EXPENSES) {
             $this->redirectTo = '/client/expenses';
-
+        }
     }
 }
diff --git a/app/Http/Controllers/Auth/ContactRegisterController.php b/app/Http/Controllers/Auth/ContactRegisterController.php
index 6d34694ce2c7..4bb551017a7d 100644
--- a/app/Http/Controllers/Auth/ContactRegisterController.php
+++ b/app/Http/Controllers/Auth/ContactRegisterController.php
@@ -19,9 +19,9 @@ use App\Models\Client;
 use App\Models\Company;
 use App\Utils\Ninja;
 use App\Utils\Traits\GeneratesCounter;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\App;
 
 class ContactRegisterController extends Controller
 {
@@ -34,11 +34,11 @@ class ContactRegisterController extends Controller
 
     public function showRegisterForm(string $company_key = '')
     {
-
-        if(strlen($company_key) > 2)
+        if (strlen($company_key) > 2) {
             $key = $company_key;
-        else
+        } else {
             $key = request()->session()->has('company_key') ? request()->session()->get('company_key') : $company_key;
+        }
 
         $company = Company::where('company_key', $key)->firstOrFail();
 
@@ -63,7 +63,6 @@ class ContactRegisterController extends Controller
 
     private function getClient(array $data)
     {
-
         $client = ClientFactory::create($data['company']->id, $data['company']->owner()->id);
 
         $client->fill($data);
@@ -71,10 +70,8 @@ class ContactRegisterController extends Controller
         $client->number = $this->getNextClientNumber($client);
         $client->save();
 
-        if(!array_key_exists('country_id', $data) && strlen($client->company->settings->country_id) > 1){
-
+        if (! array_key_exists('country_id', $data) && strlen($client->company->settings->country_id) > 1) {
             $client->update(['country_id' => $client->company->settings->country_id]);
-        
         }
 
         return $client;
@@ -88,8 +85,9 @@ class ContactRegisterController extends Controller
         $client_contact->client_id = $client->id;
         $client_contact->is_primary = true;
 
-        if(array_key_exists('password', $data))
+        if (array_key_exists('password', $data)) {
             $client_contact->password = Hash::make($data['password']);
+        }
 
         $client_contact->save();
 
diff --git a/app/Http/Controllers/Auth/ContactResetPasswordController.php b/app/Http/Controllers/Auth/ContactResetPasswordController.php
index 44ab7909ab20..2b060d0bb5b8 100644
--- a/app/Http/Controllers/Auth/ContactResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ContactResetPasswordController.php
@@ -69,63 +69,56 @@ class ContactResetPasswordController extends Controller
      */
     public function showResetForm(Request $request, $token = null)
     {
-
-        if($request->session()->has('company_key')){
+        if ($request->session()->has('company_key')) {
             MultiDB::findAndSetDbByCompanyKey($request->session()->get('company_key'));
             $company = Company::where('company_key', $request->session()->get('company_key'))->first();
             $db = $company->db;
             $account = $company->account;
-        }
-        else {
-
+        } else {
             $account_key = $request->session()->has('account_key') ? $request->session()->get('account_key') : false;
 
-            if($account_key){
-            
+            if ($account_key) {
                 MultiDB::findAndSetDbByAccountKey($account_key);
                 $account = Account::where('key', $account_key)->first();
                 $db = $account->companies->first()->db;
                 $company = $account->companies->first();
-            }
-            else{
-
+            } else {
                 $account = Account::first();
                 $db = $account->companies->first()->db;
                 $company = $account->companies->first();
             }
-
         }
 
-
         return $this->render('auth.passwords.reset')->with(
             ['token' => $token, 'email' => $request->email, 'account' => $account, 'db' => $db, 'company' => $company]
         );
-            
     }
 
     public function reset(Request $request)
     {
-        if($request->session()->has('company_key'))
+        if ($request->session()->has('company_key')) {
             MultiDB::findAndSetDbByCompanyKey($request->session()->get('company_key'));
-        
+        }
+
         $request->validate($this->rules(), $this->validationErrorMessages());
 
-        $user = ClientContact::where($request->only(['email','token']))->first();
+        $user = ClientContact::where($request->only(['email', 'token']))->first();
 
-        if(!$user)
+        if (! $user) {
             return $this->sendResetFailedResponse($request, PASSWORD::INVALID_USER);
+        }
 
         $hashed_password = Hash::make($request->input('password'));
 
         ClientContact::where('email', $user->email)->update([
             'password' => $hashed_password,
-            'remember_token' => Str::random(60)
+            'remember_token' => Str::random(60),
         ]);
 
         event(new PasswordReset($user));
 
         auth()->login($user, true);
-        
+
         $response = Password::PASSWORD_RESET;
 
         // Added this because it collides the session between
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
index ba041fc661f3..c8ce54988eb3 100644
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -60,12 +60,12 @@ class ForgotPasswordController extends Controller
         // need to show to the user. Finally, we'll send out a proper response.
         $response = $this->broker()->sendResetLink(
             $this->credentials($request)
-        );        
+        );
 
         if ($request->ajax()) {
-
-            if($response == Password::RESET_THROTTLED)
+            if ($response == Password::RESET_THROTTLED) {
                 return response()->json(['message' => ctrans('passwords.throttled'), 'status' => false], 429);
+            }
 
             return $response == Password::RESET_LINK_SENT
                 ? response()->json(['message' => 'Reset link sent to your email.', 'status' => true], 201)
@@ -79,16 +79,15 @@ class ForgotPasswordController extends Controller
 
     public function showLinkRequestForm(Request $request)
     {
-        if($request->has('company_key')){
+        if ($request->has('company_key')) {
             MultiDB::findAndSetDbByCompanyKey($request->input('company_key'));
             $company = Company::where('company_key', $request->input('company_key'))->first();
             $account = $company->account;
-        }
-        else{
+        } else {
             $account_id = $request->get('account_id');
             $account = Account::find($account_id);
         }
-        
+
         return $this->render('auth.passwords.request', ['root' => 'themes', 'account' => $account]);
     }
 }
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 7a473bbc9173..9f702bbe3174 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -32,8 +32,8 @@ use App\Models\SystemLog;
 use App\Models\User;
 use App\Transformers\CompanyUserTransformer;
 use App\Utils\Ninja;
-use App\Utils\Traits\UserSessionAttributes;
 use App\Utils\Traits\User\LoginCache;
+use App\Utils\Traits\UserSessionAttributes;
 use App\Utils\TruthSource;
 use Google_Client;
 use Illuminate\Database\Eloquent\Builder;
@@ -43,26 +43,25 @@ use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
 use Laravel\Socialite\Facades\Socialite;
+use Microsoft\Graph\Model;
 use PragmaRX\Google2FA\Google2FA;
 use Turbo124\Beacon\Facades\LightLogs;
-use Microsoft\Graph\Model;
 use Illuminate\Support\Facades\Http;
 
-
 class LoginController extends BaseController
 {
     /**
-      * @OA\Tag(
-      *     name="login",
-      *     description="Authentication",
-      *     @OA\ExternalDocumentation(
-      *         description="Find out more",
-      *         url="http://docs.invoiceninja.com"
-      *     )
-      * )
-      */
-
+     * @OA\Tag(
+     *     name="login",
+     *     description="Authentication",
+     *     @OA\ExternalDocumentation(
+     *         description="Find out more",
+     *         url="http://docs.invoiceninja.com"
+     *     )
+     * )
+     */
     use AuthenticatesUsers;
+
     use UserSessionAttributes;
     use LoginCache;
 
@@ -178,7 +177,6 @@ class LoginController extends BaseController
         }
 
         if ($this->attemptLogin($request)) {
-
             LightLogs::create(new LoginSuccess())
                 ->increment()
                 ->queue();
@@ -186,29 +184,24 @@ class LoginController extends BaseController
             $user = $this->guard()->user();
 
             //2FA
-            if($user->google_2fa_secret && $request->has('one_time_password'))
-            {
+            if ($user->google_2fa_secret && $request->has('one_time_password')) {
                 $google2fa = new Google2FA();
 
-                if(strlen($request->input('one_time_password')) == 0 || !$google2fa->verifyKey(decrypt($user->google_2fa_secret), $request->input('one_time_password')))
-                {
+                if (strlen($request->input('one_time_password')) == 0 || !$google2fa->verifyKey(decrypt($user->google_2fa_secret), $request->input('one_time_password'))) {
                     return response()
-                    ->json(['message' => ctrans('texts.invalid_one_time_password')], 401)
-                    ->header('X-App-Version', config('ninja.app_version'))
-                    ->header('X-Api-Version', config('ninja.minimum_client_version'));
+                        ->json(['message' => ctrans('texts.invalid_one_time_password')], 401)
+                        ->header('X-App-Version', config('ninja.app_version'))
+                        ->header('X-Api-Version', config('ninja.minimum_client_version'));
                 }
-
-            }
-            elseif($user->google_2fa_secret && !$request->has('one_time_password')) {
-
-                    return response()
+            } elseif ($user->google_2fa_secret && !$request->has('one_time_password')) {
+                return response()
                     ->json(['message' => ctrans('texts.invalid_one_time_password')], 401)
                     ->header('X-App-Version', config('ninja.app_version'))
                     ->header('X-Api-Version', config('ninja.minimum_client_version'));
             }
 
             /* If for some reason we lose state on the default company ie. a company is deleted - always make sure we can default to a company*/
-            if(!$user->account->default_company){
+            if (!$user->account->default_company) {
                 $account = $user->account;
                 $account->default_company_id = $user->companies->first()->id;
                 $account->save();
@@ -217,20 +210,19 @@ class LoginController extends BaseController
 
             $cu = $this->hydrateCompanyUser();
 
-            if($cu->count() == 0)
+            if ($cu->count() == 0) {
                 return response()->json(['message' => 'User found, but not attached to any companies, please see your administrator'], 400);
+            }
 
             /*On the hosted platform, only owners can login for free/pro accounts*/
-            if (Ninja::isHosted() && !$cu->first()->is_owner && !$user->account->isEnterpriseClient())
+            if (Ninja::isHosted() && !$cu->first()->is_owner && !$user->account->isEnterpriseClient()) {
                 return response()->json(['message' => 'Pro / Free accounts only the owner can log in. Please upgrade'], 403);
+            }
 
             event(new UserLoggedIn($user, $user->account->default_company, Ninja::eventVars($user->id)));
 
             return $this->timeConstrainedResponse($cu);
-
-
         } else {
-
             LightLogs::create(new LoginFailure())
                 ->increment()
                 ->queue();
@@ -241,7 +233,6 @@ class LoginController extends BaseController
                 ->json(['message' => ctrans('texts.invalid_credentials')], 401)
                 ->header('X-App-Version', config('ninja.app_version'))
                 ->header('X-Api-Version', config('ninja.minimum_client_version'));
-
         }
     }
 
@@ -288,29 +279,32 @@ class LoginController extends BaseController
     {
         $truth = app()->make(TruthSource::class);
 
-        if ($truth->getCompanyToken())
+        if ($truth->getCompanyToken()) {
             $company_token = $truth->getCompanyToken();
-        else
+        } else {
             $company_token = CompanyToken::where('token', $request->header('X-API-TOKEN'))->first();
+        }
 
         $cu = CompanyUser::query()
             ->where('user_id', $company_token->user_id);
 
-        if ($cu->count() == 0)
+        if ($cu->count() == 0) {
             return response()->json(['message' => 'User found, but not attached to any companies, please see your administrator'], 400);
+        }
 
         $cu->first()->account->companies->each(function ($company) use ($cu, $request) {
-
             if ($company->tokens()->where('is_system', true)->count() == 0) {
-                CreateCompanyToken::dispatchNow($company, $cu->first()->user, $request->server('HTTP_USER_AGENT'));
+                (new CreateCompanyToken($company, $cu->first()->user, $request->server('HTTP_USER_AGENT')))->handle();
             }
         });
 
-        if ($request->has('current_company') && $request->input('current_company') == 'true')
-            $cu->where("company_id", $company_token->company_id);
+        if ($request->has('current_company') && $request->input('current_company') == 'true') {
+            $cu->where('company_id', $company_token->company_id);
+        }
 
-        if (Ninja::isHosted() && !$cu->first()->is_owner && !$cu->first()->user->account->isEnterpriseClient())
+        if (Ninja::isHosted() && !$cu->first()->is_owner && !$cu->first()->user->account->isEnterpriseClient()) {
             return response()->json(['message' => 'Pro / Free accounts only the owner can log in. Please upgrade'], 403);
+        }
 
         return $this->refreshResponse($cu);
     }
@@ -329,7 +323,6 @@ class LoginController extends BaseController
      */
     public function oauthApiLogin()
     {
-
         $message = 'Provider not supported';
         if (request()->input('provider') == 'google') {
             return $this->handleGoogleOauth();
@@ -362,14 +355,13 @@ class LoginController extends BaseController
         if ($user) {
             return $this->loginOrCreateFromSocialite($user, $provider);
         }
+
         return response()
             ->json(['message' => ctrans('texts.invalid_credentials')], 401)
             ->header('X-App-Version', config('ninja.app_version'))
             ->header('X-Api-Version', config('ninja.minimum_client_version'));
-
     }
 
-
     private function loginOrCreateFromSocialite($user, $provider)
     {
         $query = [
@@ -377,27 +369,29 @@ class LoginController extends BaseController
             'oauth_provider_id' => $provider,
         ];
         if ($existing_user = MultiDB::hasUser($query)) {
-
-            if (!$existing_user->account)
+            if (!$existing_user->account) {
                 return response()->json(['message' => 'User exists, but not attached to any companies! Orphaned user!'], 400);
+            }
 
             Auth::login($existing_user, true);
 
             $cu = $this->hydrateCompanyUser();
 
-            if ($cu->count() == 0)
+            if ($cu->count() == 0) {
                 return response()->json(['message' => 'User found, but not attached to any companies, please see your administrator'], 400);
+            }
 
-            if (Ninja::isHosted() && !$cu->first()->is_owner && !$existing_user->account->isEnterpriseClient())
+            if (Ninja::isHosted() && !$cu->first()->is_owner && !$existing_user->account->isEnterpriseClient()) {
                 return response()->json(['message' => 'Pro / Free accounts only the owner can log in. Please upgrade'], 403);
+            }
 
             return $this->timeConstrainedResponse($cu);
-
         }
         //If this is a result user/email combo - lets add their OAuth details details
         if ($existing_login_user = MultiDB::hasUser(['email' => $user->email])) {
-            if (!$existing_login_user->account)
+            if (!$existing_login_user->account) {
                 return response()->json(['message' => 'User exists, but not attached to any companies! Orphaned user!'], 400);
+            }
 
             Auth::login($existing_login_user, true);
 
@@ -408,11 +402,13 @@ class LoginController extends BaseController
 
             $cu = $this->hydrateCompanyUser();
 
-            if ($cu->count() == 0)
+            if ($cu->count() == 0) {
                 return response()->json(['message' => 'User found, but not attached to any companies, please see your administrator'], 400);
+            }
 
-            if (Ninja::isHosted() && !$cu->first()->is_owner && !$existing_login_user->account->isEnterpriseClient())
+            if (Ninja::isHosted() && !$cu->first()->is_owner && !$existing_login_user->account->isEnterpriseClient()) {
                 return response()->json(['message' => 'Pro / Free accounts only the owner can log in. Please upgrade'], 403);
+            }
 
             return $this->timeConstrainedResponse($cu);
         }
@@ -429,7 +425,7 @@ class LoginController extends BaseController
 
         MultiDB::setDefaultDatabase();
 
-        $account = CreateAccount::dispatchNow($new_account, request()->getClientIp());
+        $account = (new CreateAccount($new_account, request()->getClientIp()))->handle();
 
         Auth::login($account->default_company->owner(), true);
         auth()->user()->email_verified_at = now();
@@ -437,27 +433,28 @@ class LoginController extends BaseController
 
         $cu = $this->hydrateCompanyUser();
 
-        if ($cu->count() == 0)
+        if ($cu->count() == 0) {
             return response()->json(['message' => 'User found, but not attached to any companies, please see your administrator'], 400);
+        }
 
-        if (Ninja::isHosted() && !$cu->first()->is_owner && !auth()->user()->account->isEnterpriseClient())
+        if (Ninja::isHosted() && !$cu->first()->is_owner && !auth()->user()->account->isEnterpriseClient()) {
             return response()->json(['message' => 'Pro / Free accounts only the owner can log in. Please upgrade'], 403);
+        }
 
         return $this->timeConstrainedResponse($cu);
     }
 
-
     private function hydrateCompanyUser(): Builder
     {
-
         $cu = CompanyUser::query()->where('user_id', auth()->user()->id);
 
-        if($cu->count() == 0)
+        if ($cu->count() == 0) {
             return $cu;
+        }
 
-        if (CompanyUser::query()->where('user_id', auth()->user()->id)->where('company_id', auth()->user()->account->default_company_id)->exists())
+        if (CompanyUser::query()->where('user_id', auth()->user()->id)->where('company_id', auth()->user()->account->default_company_id)->exists()) {
             $set_company = auth()->user()->account->default_company;
-        else {
+        } else {
             $set_company = $cu->first()->company;
         }
 
@@ -470,67 +467,63 @@ class LoginController extends BaseController
         $truth->setUser(auth()->user());
         $truth->setCompany($set_company);
 
-        if($cu->count() == 0)
+        if ($cu->count() == 0) {
             return $cu;
+        }
 
         if (auth()->user()->company_users()->count() != auth()->user()->tokens()->distinct('company_id')->count()) {
-
             auth()->user()->companies->each(function ($company) {
-
                 if (!CompanyToken::where('user_id', auth()->user()->id)->where('company_id', $company->id)->exists()) {
-
-                    CreateCompanyToken::dispatchNow($company, auth()->user(), "Google_O_Auth");
-
+                    (new CreateCompanyToken($company, auth()->user(), 'Google_O_Auth'))->handle();
                 }
-
-          });
-
+            });
         }
 
         $truth->setCompanyToken(CompanyToken::where('user_id', auth()->user()->id)->where('company_id', $set_company->id)->first());
 
         return $cu;
-
     }
 
     private function handleMicrosoftOauth()
     {
-        if(request()->has('accessToken'))
+        if (request()->has('accessToken')) 
             $accessToken = request()->input('accessToken');
         elseif(request()->has('access_token'))
             $accessToken = request()->input('access_token');
         else
             return response()->json(['message' => 'Invalid response from oauth server, no access token in response.'], 400);
 
+
         $graph = new \Microsoft\Graph\Graph();
         $graph->setAccessToken($accessToken);
 
-        $user = $graph->createRequest("GET", "/me")
-                      ->setReturnType(Model\User::class)
-                      ->execute();
+        $user = $graph->createRequest('GET', '/me')
+            ->setReturnType(Model\User::class)
+            ->execute();
 
-        if($user){
+        if ($user) {
+            $account = request()->input('account');
 
             $email = $user->getMail() ?: $user->getUserPrincipalName();
 
             $query = [
                 'oauth_user_id' => $user->getId(),
-                'oauth_provider_id'=> 'microsoft',
+                'oauth_provider_id' => 'microsoft',
             ];
 
             if ($existing_user = MultiDB::hasUser($query)) {
-
-                if(!$existing_user->account)
+                if (!$existing_user->account) {
                     return response()->json(['message' => 'User exists, but not attached to any companies! Orphaned user!'], 400);
+                }
 
                 return $this->existingOauthUser($existing_user);
             }
 
             //If this is a result user/email combo - lets add their OAuth details details
-            if($existing_login_user = MultiDB::hasUser(['email' => $email]))
-            {
-                if(!$existing_login_user->account)
+            if ($existing_login_user = MultiDB::hasUser(['email' => $email])) {
+                if (!$existing_login_user->account) {
                     return response()->json(['message' => 'User exists, but not attached to any companies! Orphaned user!'], 400);
+                }
 
                 Auth::login($existing_login_user, true);
 
@@ -540,7 +533,7 @@ class LoginController extends BaseController
             // Signup!
             $new_account = [
                 'first_name' => $user->getGivenName() ?: '',
-                'last_name' => $user->getSurname() ?: '' ,
+                'last_name' => $user->getSurname() ?: '',
                 'password' => '',
                 'email' => $email,
                 'oauth_user_id' => $user->getId(),
@@ -548,9 +541,9 @@ class LoginController extends BaseController
             ];
 
             return $this->createNewAccount($new_account);
-
         }
 
+
         return response()->json(['message' => 'Unable to authenticate this user'], 400);
 
     }
@@ -561,33 +554,35 @@ class LoginController extends BaseController
 
         $cu = $this->hydrateCompanyUser();
 
-        if($cu->count() == 0)
+        if ($cu->count() == 0) {
             return response()->json(['message' => 'User found, but not attached to any companies, please see your administrator'], 400);
+        }
 
-        if(Ninja::isHosted() && !$cu->first()->is_owner && !$existing_user->account->isEnterpriseClient())
+        if (Ninja::isHosted() && !$cu->first()->is_owner && !$existing_user->account->isEnterpriseClient()) {
             return response()->json(['message' => 'Pro / Free accounts only the owner can log in. Please upgrade'], 403);
+        }
 
         return $this->timeConstrainedResponse($cu);
     }
 
     private function existingLoginUser($oauth_user_id, $provider)
     {
-
         auth()->user()->update([
             'oauth_user_id' => $oauth_user_id,
-            'oauth_provider_id'=> $provider,
-            ]);
+            'oauth_provider_id' => $provider,
+        ]);
 
         $cu = $this->hydrateCompanyUser();
 
-        if($cu->count() == 0)
+        if ($cu->count() == 0) {
             return response()->json(['message' => 'User found, but not attached to any companies, please see your administrator'], 400);
+        }
 
-        if(Ninja::isHosted() && !$cu->first()->is_owner && !auth()->user()->account->isEnterpriseClient())
+        if (Ninja::isHosted() && !$cu->first()->is_owner && !auth()->user()->account->isEnterpriseClient()) {
             return response()->json(['message' => 'Pro / Free accounts only the owner can log in. Please upgrade'], 403);
+        }
 
         return $this->timeConstrainedResponse($cu);
-
     }
 
     private function handleGoogleOauth()
@@ -599,40 +594,38 @@ class LoginController extends BaseController
         $user = $google->getTokenResponse(request()->input('id_token'));
 
         if (is_array($user)) {
-
             $query = [
                 'oauth_user_id' => $google->harvestSubField($user),
-                'oauth_provider_id'=> 'google',
+                'oauth_provider_id' => 'google',
             ];
 
             if ($existing_user = MultiDB::hasUser($query)) {
-
-                if(!$existing_user->account)
+                if (!$existing_user->account) {
                     return response()->json(['message' => 'User exists, but not attached to any companies! Orphaned user!'], 400);
+                }
 
                 return $this->existingOauthUser($existing_user);
             }
 
             //If this is a result user/email combo - lets add their OAuth details details
-            if($existing_login_user = MultiDB::hasUser(['email' => $google->harvestEmail($user)]))
-            {
-                if(!$existing_login_user->account)
+            if ($existing_login_user = MultiDB::hasUser(['email' => $google->harvestEmail($user)])) {
+                if (!$existing_login_user->account) {
                     return response()->json(['message' => 'User exists, but not attached to any companies! Orphaned user!'], 400);
+                }
 
                 Auth::login($existing_login_user, true);
 
                 return $this->existingLoginUser($google->harvestSubField($user), 'google');
             }
-
         }
 
         if ($user) {
 
             //check the user doesn't already exist in some form
-            if($existing_login_user = MultiDB::hasUser(['email' => $google->harvestEmail($user)]))
-            {
-                if(!$existing_login_user->account)
+            if ($existing_login_user = MultiDB::hasUser(['email' => $google->harvestEmail($user)])) {
+                if (!$existing_login_user->account) {
                     return response()->json(['message' => 'User exists, but not attached to any companies! Orphaned user!'], 400);
+                }
 
                 Auth::login($existing_login_user, true);
 
@@ -655,20 +648,19 @@ class LoginController extends BaseController
         }
 
         return response()
-        ->json(['message' => ctrans('texts.invalid_credentials')], 401)
-        ->header('X-App-Version', config('ninja.app_version'))
-        ->header('X-Api-Version', config('ninja.minimum_client_version'));
+            ->json(['message' => ctrans('texts.invalid_credentials')], 401)
+            ->header('X-App-Version', config('ninja.app_version'))
+            ->header('X-Api-Version', config('ninja.minimum_client_version'));
     }
 
     private function createNewAccount($new_account)
     {
-
         MultiDB::setDefaultDatabase();
 
-        $account = CreateAccount::dispatchNow($new_account, request()->getClientIp());
-
-        if(!$account instanceOf Account)
+        $account = (new CreateAccount($new_account, request()->getClientIp()))->handle();
+        if (!$account instanceof Account) {
             return $account;
+        }
 
         Auth::login($account->default_company->owner(), true);
         auth()->user()->email_verified_at = now();
@@ -676,27 +668,26 @@ class LoginController extends BaseController
 
         $cu = $this->hydrateCompanyUser();
 
-        if($cu->count() == 0)
+        if ($cu->count() == 0) {
             return response()->json(['message' => 'User found, but not attached to any companies, please see your administrator'], 400);
+        }
 
-        if(Ninja::isHosted() && !$cu->first()->is_owner && !auth()->user()->account->isEnterpriseClient())
+        if (Ninja::isHosted() && !$cu->first()->is_owner && !auth()->user()->account->isEnterpriseClient()) {
             return response()->json(['message' => 'Pro / Free accounts only the owner can log in. Please upgrade'], 403);
+        }
 
         return $this->timeConstrainedResponse($cu);
-
     }
 
     public function redirectToProvider(string $provider)
     {
-
         $scopes = [];
 
         $parameters = [];
 
-        if($provider == 'google'){
-
-            $scopes = ['https://www.googleapis.com/auth/gmail.send','email','profile','openid'];
-            $parameters = ['access_type' => 'offline', "prompt" => "consent select_account", 'redirect_uri' => config('ninja.app_url')."/auth/google"];
+        if ($provider == 'google') {
+            $scopes = ['https://www.googleapis.com/auth/gmail.send', 'email', 'profile', 'openid'];
+            $parameters = ['access_type' => 'offline', 'prompt' => 'consent select_account', 'redirect_uri' => config('ninja.app_url') . '/auth/google'];
         }
 
         if($provider == 'microsoft'){
@@ -707,9 +698,9 @@ class LoginController extends BaseController
         if (request()->has('code')) {
             return $this->handleProviderCallback($provider);
         } else {
-
-            if(!in_array($provider, ['google','microsoft']))
+            if (!in_array($provider, ['google', 'microsoft'])) {
                 return abort(400, 'Invalid provider');
+            }
 
             return Socialite::driver($provider)->with($parameters)->scopes($scopes)->redirect();
         }
@@ -717,27 +708,23 @@ class LoginController extends BaseController
 
     public function handleProviderCallback(string $provider)
     {
-
-        if($provider == 'microsoft')
+        if ($provider == 'microsoft') {
             return $this->handleMicrosoftProviderCallback();
+        }
 
         $socialite_user = Socialite::driver($provider)->user();
 
         $oauth_user_token = '';
 
-            if($socialite_user->refreshToken){
-
-                $client = new Google_Client();
-                $client->setClientId(config('ninja.auth.google.client_id'));
-                $client->setClientSecret(config('ninja.auth.google.client_secret'));
-                $client->fetchAccessTokenWithRefreshToken($socialite_user->refreshToken);
-                $oauth_user_token = $client->getAccessToken();
-
-            }
-
-        if($user = OAuth::handleAuth($socialite_user, $provider))
-        {
+        if ($socialite_user->refreshToken) {
+            $client = new Google_Client();
+            $client->setClientId(config('ninja.auth.google.client_id'));
+            $client->setClientSecret(config('ninja.auth.google.client_secret'));
+            $client->fetchAccessTokenWithRefreshToken($socialite_user->refreshToken);
+            $oauth_user_token = $client->getAccessToken();
+        }
 
+        if ($user = OAuth::handleAuth($socialite_user, $provider)) {
             nlog('found user and updating their user record');
             $name = OAuth::splitName($socialite_user->getName());
 
@@ -748,14 +735,12 @@ class LoginController extends BaseController
                 'oauth_user_id' => $socialite_user->getId(),
                 'oauth_provider_id' => $provider,
                 'oauth_user_token' => $oauth_user_token,
-                'oauth_user_refresh_token' => $socialite_user->refreshToken
+                'oauth_user_refresh_token' => $socialite_user->refreshToken,
             ];
 
             $user->update($update_user);
-
-        }
-        else {
-            nlog("user not found for oauth");
+        } else {
+            nlog('user not found for oauth');
         }
 
         return redirect('/#/');
@@ -763,12 +748,11 @@ class LoginController extends BaseController
 
     public function handleMicrosoftProviderCallback($provider = 'microsoft')
     {
-
         $socialite_user = Socialite::driver($provider)->user();
         nlog($socialite_user);
 
-        nlog("refresh token " . $socialite_user->accessTokenResponseBody['refresh_token']);
-        nlog("access token " . $socialite_user->accessTokenResponseBody['access_token']);
+        nlog('refresh token ' . $socialite_user->accessTokenResponseBody['refresh_token']);
+        nlog('access token ' . $socialite_user->accessTokenResponseBody['access_token']);
 
         $oauth_user_token = $socialite_user->accessTokenResponseBody['access_token'];
 
@@ -776,7 +760,6 @@ class LoginController extends BaseController
 
         if($user = OAuth::handleAuth($socialite_user, $provider))
         {
-
             nlog('found user and updating their user record');
             $name = OAuth::splitName($socialite_user->getName());
 
@@ -792,14 +775,10 @@ class LoginController extends BaseController
             ];
 
             $user->update($update_user);
-
-        }
-        else {
-            nlog("user not found for oauth");
+        } else {
+            nlog('user not found for oauth');
         }
 
         return redirect('/#/');
-
     }
-
 }
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index 43b20fb795de..63b850d38c13 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -57,19 +57,18 @@ class ResetPasswordController extends Controller
     public function showResetForm(Request $request, $token = null)
     {
         $company = false;
-        
-        if(Ninja::isHosted()){
 
+        if (Ninja::isHosted()) {
             MultiDB::findAndSetDbByCompanyKey($request->session()->get('company_key'));
             $company = Company::where('company_key', $request->session()->get('company_key'))->first();
-
         }
 
-        if($company)
+        if ($company) {
             $account = $company->account;
-        else
+        } else {
             $account = Account::first();
-        
+        }
+
         return $this->render('auth.passwords.reset', ['root' => 'themes', 'token' => $token, 'account' => $account]);
     }
 
diff --git a/app/Http/Controllers/Auth/VendorContactLoginController.php b/app/Http/Controllers/Auth/VendorContactLoginController.php
index 59fb20004e8f..212a2b2630be 100644
--- a/app/Http/Controllers/Auth/VendorContactLoginController.php
+++ b/app/Http/Controllers/Auth/VendorContactLoginController.php
@@ -40,7 +40,7 @@ class VendorContactLoginController extends Controller
     public function catch()
     {
         $data = [
-        
+
         ];
 
         return $this->render('purchase_orders.catch');
@@ -53,6 +53,4 @@ class VendorContactLoginController extends Controller
 
         return redirect('/vendors');
     }
-
-
 }
diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 7137e2e75a8b..b142609f9986 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -36,6 +36,7 @@ use League\Fractal\Serializer\JsonApiSerializer;
 class BaseController extends Controller
 {
     use AppSetup;
+
     /**
      * Passed from the parent when we need to force
      * includes internally rather than externally via
@@ -107,21 +108,21 @@ class BaseController extends Controller
         ];
 
     private $mini_load = [
-          'account',
-          'user.company_user',
-          'token',
-          'company.activities',
-          'company.tax_rates',
-          'company.documents',
-          'company.company_gateways.gateway',
-          'company.users.company_user',
-          'company.task_statuses',
-          'company.payment_terms',
-          'company.groups',
-          'company.designs.company',
-          'company.expense_categories',
-          'company.subscriptions',
-        ];
+        'account',
+        'user.company_user',
+        'token',
+        'company.activities',
+        'company.tax_rates',
+        'company.documents',
+        'company.company_gateways.gateway',
+        'company.users.company_user',
+        'company.task_statuses',
+        'company.payment_terms',
+        'company.groups',
+        'company.designs.company',
+        'company.expense_categories',
+        'company.subscriptions',
+    ];
 
     public function __construct()
     {
@@ -216,159 +217,160 @@ class BaseController extends Controller
         $transformer = new $this->entity_transformer($this->serializer);
         $updated_at = request()->has('updated_at') ? request()->input('updated_at') : 0;
 
-        if ($user->getCompany()->is_large && $updated_at == 0){
-          $updated_at = time();
+        if ($user->getCompany()->is_large && $updated_at == 0) {
+            $updated_at = time();
         }
 
         $updated_at = date('Y-m-d H:i:s', $updated_at);
 
         $query->with(
             [
-            'company' => function ($query) use ($updated_at, $user) {
-                $query->whereNotNull('updated_at')->with('documents','users');
-            },
-            'company.clients' => function ($query) use ($updated_at, $user) {
-                $query->where('clients.updated_at', '>=', $updated_at)->with('contacts.company', 'gateway_tokens', 'documents');
+                'company' => function ($query) use ($updated_at, $user) {
+                    $query->whereNotNull('updated_at')->with('documents', 'users');
+                },
+                'company.clients' => function ($query) use ($updated_at, $user) {
+                    $query->where('clients.updated_at', '>=', $updated_at)->with('contacts.company', 'gateway_tokens', 'documents');
 
-                if(!$user->hasPermission('view_client'))
-                  $query->where('clients.user_id', $user->id)->orWhere('clients.assigned_user_id', $user->id);
+                    if (! $user->hasPermission('view_client')) {
+                        $query->where('clients.user_id', $user->id)->orWhere('clients.assigned_user_id', $user->id);
+                    }
+                },
+                'company.company_gateways' => function ($query) use ($user) {
+                    $query->whereNotNull('updated_at')->with('gateway');
 
-            },
-            'company.company_gateways' => function ($query) use ($user) {
-                $query->whereNotNull('updated_at')->with('gateway');
+                    if (! $user->isAdmin()) {
+                        $query->where('company_gateways.user_id', $user->id);
+                    }
+                },
+                'company.credits'=> function ($query) use ($updated_at, $user) {
+                    $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents');
 
-                if(!$user->isAdmin())
-                  $query->where('company_gateways.user_id', $user->id);
+                    if (! $user->hasPermission('view_credit')) {
+                        $query->where('credits.user_id', $user->id)->orWhere('credits.assigned_user_id', $user->id);
+                    }
+                },
+                'company.designs'=> function ($query) use ($updated_at, $user) {
+                    $query->where('updated_at', '>=', $updated_at)->with('company');
 
-            },
-            'company.credits'=> function ($query) use ($updated_at, $user) {
-                $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents');
+                    if (! $user->isAdmin()) {
+                        $query->where('designs.user_id', $user->id);
+                    }
+                },
+                'company.documents'=> function ($query) use ($updated_at, $user) {
+                    $query->where('updated_at', '>=', $updated_at);
+                },
+                'company.expenses'=> function ($query) use ($updated_at, $user) {
+                    $query->where('updated_at', '>=', $updated_at)->with('documents');
 
-                if(!$user->hasPermission('view_credit'))
-                  $query->where('credits.user_id', $user->id)->orWhere('credits.assigned_user_id', $user->id);
-
-            },
-            'company.designs'=> function ($query) use ($updated_at, $user) {
-                $query->where('updated_at', '>=', $updated_at)->with('company');
-
-                if(!$user->isAdmin())
-                  $query->where('designs.user_id', $user->id);
-            },
-            'company.documents'=> function ($query) use ($updated_at, $user) {
-                $query->where('updated_at', '>=', $updated_at);
-            },
-            'company.expenses'=> function ($query) use ($updated_at, $user) {
-                $query->where('updated_at', '>=', $updated_at)->with('documents');
-
-                if(!$user->hasPermission('view_expense'))
-                  $query->where('expenses.user_id', $user->id)->orWhere('expenses.assigned_user_id', $user->id);
-            },
-            'company.groups' => function ($query) use ($updated_at, $user) {
-                $query->whereNotNull('updated_at')->with('documents');
+                    if (! $user->hasPermission('view_expense')) {
+                        $query->where('expenses.user_id', $user->id)->orWhere('expenses.assigned_user_id', $user->id);
+                    }
+                },
+                'company.groups' => function ($query) use ($updated_at, $user) {
+                    $query->whereNotNull('updated_at')->with('documents');
 
                 // if(!$user->isAdmin())
-                //   $query->where('group_settings.user_id', $user->id);
-            },
-            'company.invoices'=> function ($query) use ($updated_at, $user) {
-                $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents');
+                    //   $query->where('group_settings.user_id', $user->id);
+                },
+                'company.invoices'=> function ($query) use ($updated_at, $user) {
+                    $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents');
 
-                if(!$user->hasPermission('view_invoice'))
-                  $query->where('invoices.user_id', $user->id)->orWhere('invoices.assigned_user_id', $user->id);
+                    if (! $user->hasPermission('view_invoice')) {
+                        $query->where('invoices.user_id', $user->id)->orWhere('invoices.assigned_user_id', $user->id);
+                    }
+                },
+                'company.payments'=> function ($query) use ($updated_at, $user) {
+                    $query->where('updated_at', '>=', $updated_at)->with('paymentables', 'documents');
 
-            },
-            'company.payments'=> function ($query) use ($updated_at, $user) {
-                $query->where('updated_at', '>=', $updated_at)->with('paymentables', 'documents');
+                    if (! $user->hasPermission('view_payment')) {
+                        $query->where('payments.user_id', $user->id)->orWhere('payments.assigned_user_id', $user->id);
+                    }
+                },
+                'company.payment_terms'=> function ($query) use ($updated_at, $user) {
+                    $query->whereNotNull('updated_at');
 
-                if(!$user->hasPermission('view_payment'))
-                  $query->where('payments.user_id', $user->id)->orWhere('payments.assigned_user_id', $user->id);
+                    if (! $user->isAdmin()) {
+                        $query->where('payment_terms.user_id', $user->id);
+                    }
+                },
+                'company.products' => function ($query) use ($updated_at, $user) {
+                    $query->where('updated_at', '>=', $updated_at)->with('documents');
 
-            },
-            'company.payment_terms'=> function ($query) use ($updated_at, $user) {
-                $query->whereNotNull('updated_at');
+                    if (! $user->hasPermission('view_product')) {
+                        $query->where('products.user_id', $user->id)->orWhere('products.assigned_user_id', $user->id);
+                    }
+                },
+                'company.projects'=> function ($query) use ($updated_at, $user) {
+                    $query->where('updated_at', '>=', $updated_at)->with('documents');
 
-                if(!$user->isAdmin())
-                  $query->where('payment_terms.user_id', $user->id);
+                    if (! $user->hasPermission('view_project')) {
+                        $query->where('projects.user_id', $user->id)->orWhere('projects.assigned_user_id', $user->id);
+                    }
+                },
+                'company.purchase_orders'=> function ($query) use ($updated_at, $user) {
+                    $query->where('updated_at', '>=', $updated_at)->with('documents');
 
-            },
-            'company.products' => function ($query) use ($updated_at, $user) {
-                $query->where('updated_at', '>=', $updated_at)->with('documents');
+                    if (! $user->hasPermission('view_purchase_order')) {
+                        $query->where('purchase_orders.user_id', $user->id)->orWhere('purchase_orders.assigned_user_id', $user->id);
+                    }
+                },
+                'company.quotes'=> function ($query) use ($updated_at, $user) {
+                    $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents');
 
-                if(!$user->hasPermission('view_product'))
-                  $query->where('products.user_id', $user->id)->orWhere('products.assigned_user_id', $user->id);
+                    if (! $user->hasPermission('view_quote')) {
+                        $query->where('quotes.user_id', $user->id)->orWhere('quotes.assigned_user_id', $user->id);
+                    }
+                },
+                'company.recurring_invoices'=> function ($query) use ($updated_at, $user) {
+                    $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents', 'client.gateway_tokens', 'client.group_settings', 'client.company');
 
-            },
-            'company.projects'=> function ($query) use ($updated_at, $user) {
-                $query->where('updated_at', '>=', $updated_at)->with('documents');
+                    if (! $user->hasPermission('view_recurring_invoice')) {
+                        $query->where('recurring_invoices.user_id', $user->id)->orWhere('recurring_invoices.assigned_user_id', $user->id);
+                    }
+                },
+                'company.recurring_expenses'=> function ($query) use ($updated_at, $user) {
+                    $query->where('updated_at', '>=', $updated_at)->with('documents');
 
-                if(!$user->hasPermission('view_project'))
-                  $query->where('projects.user_id', $user->id)->orWhere('projects.assigned_user_id', $user->id);
+                    if (! $user->hasPermission('view_recurring_expense')) {
+                        $query->where('recurring_expenses.user_id', $user->id)->orWhere('recurring_expenses.assigned_user_id', $user->id);
+                    }
+                },
+                'company.tasks'=> function ($query) use ($updated_at, $user) {
+                    $query->where('updated_at', '>=', $updated_at)->with('documents');
 
-            },
-            'company.purchase_orders'=> function ($query) use ($updated_at, $user) {
-                $query->where('updated_at', '>=', $updated_at)->with('documents');
+                    if (! $user->hasPermission('view_task')) {
+                        $query->where('tasks.user_id', $user->id)->orWhere('tasks.assigned_user_id', $user->id);
+                    }
+                },
+                'company.tax_rates'=> function ($query) use ($updated_at, $user) {
+                    $query->whereNotNull('updated_at');
+                },
+                'company.vendors'=> function ($query) use ($updated_at, $user) {
+                    $query->where('updated_at', '>=', $updated_at)->with('contacts', 'documents');
 
-                if(!$user->hasPermission('view_purchase_order'))
-                  $query->where('purchase_orders.user_id', $user->id)->orWhere('purchase_orders.assigned_user_id', $user->id);
+                    if (! $user->hasPermission('view_vendor')) {
+                        $query->where('vendors.user_id', $user->id)->orWhere('vendors.assigned_user_id', $user->id);
+                    }
+                },
+                'company.expense_categories'=> function ($query) use ($updated_at, $user) {
+                    $query->whereNotNull('updated_at');
+                },
+                'company.task_statuses'=> function ($query) use ($updated_at, $user) {
+                    $query->whereNotNull('updated_at');
+                },
+                'company.activities'=> function ($query) use ($user) {
+                    if (! $user->isAdmin()) {
+                        $query->where('activities.user_id', $user->id);
+                    }
+                },
+                'company.subscriptions'=> function ($query) use ($updated_at, $user) {
+                    $query->whereNotNull('updated_at');
 
-            },
-            'company.quotes'=> function ($query) use ($updated_at, $user) {
-                $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents');
-
-                if(!$user->hasPermission('view_quote'))
-                  $query->where('quotes.user_id', $user->id)->orWhere('quotes.assigned_user_id', $user->id);
-
-            },
-            'company.recurring_invoices'=> function ($query) use ($updated_at, $user) {
-                $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents', 'client.gateway_tokens', 'client.group_settings', 'client.company');
-
-                if(!$user->hasPermission('view_recurring_invoice'))
-                  $query->where('recurring_invoices.user_id', $user->id)->orWhere('recurring_invoices.assigned_user_id', $user->id);
-
-            },
-            'company.recurring_expenses'=> function ($query) use ($updated_at, $user) {
-                $query->where('updated_at', '>=', $updated_at)->with('documents');
-
-                if(!$user->hasPermission('view_recurring_expense'))
-                  $query->where('recurring_expenses.user_id', $user->id)->orWhere('recurring_expenses.assigned_user_id', $user->id);
-
-            },
-            'company.tasks'=> function ($query) use ($updated_at, $user) {
-                $query->where('updated_at', '>=', $updated_at)->with('documents');
-
-                if(!$user->hasPermission('view_task'))
-                  $query->where('tasks.user_id', $user->id)->orWhere('tasks.assigned_user_id', $user->id);
-
-            },
-            'company.tax_rates'=> function ($query) use ($updated_at, $user) {
-                $query->whereNotNull('updated_at');
-            },
-            'company.vendors'=> function ($query) use ($updated_at, $user) {
-                $query->where('updated_at', '>=', $updated_at)->with('contacts', 'documents');
-
-                if(!$user->hasPermission('view_vendor'))
-                  $query->where('vendors.user_id', $user->id)->orWhere('vendors.assigned_user_id', $user->id);
-
-            },
-            'company.expense_categories'=> function ($query) use ($updated_at, $user) {
-                $query->whereNotNull('updated_at');
-            },
-            'company.task_statuses'=> function ($query) use ($updated_at, $user) {
-                $query->whereNotNull('updated_at');
-            },
-            'company.activities'=> function ($query) use($user) {
-
-              if(!$user->isAdmin())
-                  $query->where('activities.user_id', $user->id);
-
-            },
-            'company.subscriptions'=> function ($query) use($updated_at, $user) {
-                $query->whereNotNull('updated_at');
-
-              if(!$user->isAdmin())
-                  $query->where('subscriptions.user_id', $user->id);
-
-            }
-          ]
+                    if (! $user->isAdmin()) {
+                        $query->where('subscriptions.user_id', $user->id);
+                    }
+                },
+            ]
         );
 
         if ($query instanceof Builder) {
@@ -387,8 +389,7 @@ class BaseController extends Controller
 
     protected function miniLoadResponse($query)
     {
-      $user = auth()->user();
-
+        $user = auth()->user();
 
         $this->serializer = request()->input('serializer') ?: EntityTransformer::API_SERIALIZER_ARRAY;
 
@@ -405,35 +406,30 @@ class BaseController extends Controller
 
         $query->with(
             [
-            'company' => function ($query) use ($created_at, $user) {
-                $query->whereNotNull('created_at')->with('documents','users');
-            },
-            'company.designs'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at)->with('company');
-
-            },
-            'company.documents'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at);
-            },
-            'company.groups'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at)->with('documents');
-
-            },
-            'company.payment_terms'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at);
-
-            },
-            'company.tax_rates'=> function ($query) use ($created_at, $user) {
-                $query->whereNotNull('created_at');
-
-            },
-            'company.activities'=> function ($query) use($user) {
-
-              if(!$user->isAdmin())
-                  $query->where('activities.user_id', $user->id);
-
-            }
-          ]
+                'company' => function ($query) use ($created_at, $user) {
+                    $query->whereNotNull('created_at')->with('documents', 'users');
+                },
+                'company.designs'=> function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at)->with('company');
+                },
+                'company.documents'=> function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at);
+                },
+                'company.groups'=> function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at)->with('documents');
+                },
+                'company.payment_terms'=> function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at);
+                },
+                'company.tax_rates'=> function ($query) use ($created_at, $user) {
+                    $query->whereNotNull('created_at');
+                },
+                'company.activities'=> function ($query) use ($user) {
+                    if (! $user->isAdmin()) {
+                        $query->where('activities.user_id', $user->id);
+                    }
+                },
+            ]
         );
 
         if ($query instanceof Builder) {
@@ -448,21 +444,19 @@ class BaseController extends Controller
         }
 
         return $this->response($this->manager->createData($resource)->toArray());
-
-
     }
 
     protected function timeConstrainedResponse($query)
     {
-
         $user = auth()->user();
 
-        if ($user->getCompany()->is_large){
-          $this->manager->parseIncludes($this->mini_load);
-          return $this->miniLoadResponse($query);
+        if ($user->getCompany()->is_large) {
+            $this->manager->parseIncludes($this->mini_load);
+
+            return $this->miniLoadResponse($query);
+        } else {
+            $this->manager->parseIncludes($this->first_load);
         }
-        else
-          $this->manager->parseIncludes($this->first_load);
 
         $this->serializer = request()->input('serializer') ?: EntityTransformer::API_SERIALIZER_ARRAY;
 
@@ -479,153 +473,147 @@ class BaseController extends Controller
 
         $query->with(
             [
-            'company' => function ($query) use ($created_at, $user) {
-                $query->whereNotNull('created_at')->with('documents','users');
-            },
-            'company.clients' => function ($query) use ($created_at, $user) {
-                $query->where('clients.created_at', '>=', $created_at)->with('contacts.company', 'gateway_tokens', 'documents');
+                'company' => function ($query) use ($created_at, $user) {
+                    $query->whereNotNull('created_at')->with('documents', 'users');
+                },
+                'company.clients' => function ($query) use ($created_at, $user) {
+                    $query->where('clients.created_at', '>=', $created_at)->with('contacts.company', 'gateway_tokens', 'documents');
 
-                if(!$user->hasPermission('view_client'))
-                  $query->where('clients.user_id', $user->id)->orWhere('clients.assigned_user_id', $user->id);
+                    if (! $user->hasPermission('view_client')) {
+                        $query->where('clients.user_id', $user->id)->orWhere('clients.assigned_user_id', $user->id);
+                    }
+                },
+                'company.company_gateways' => function ($query) use ($user) {
+                    $query->whereNotNull('created_at')->with('gateway');
 
-            },
-            'company.company_gateways' => function ($query) use ($user) {
-                $query->whereNotNull('created_at')->with('gateway');
+                    if (! $user->isAdmin()) {
+                        $query->where('company_gateways.user_id', $user->id);
+                    }
+                },
+                'company.credits'=> function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at)->with('invitations', 'documents');
 
-                if(!$user->isAdmin())
-                  $query->where('company_gateways.user_id', $user->id);
+                    if (! $user->hasPermission('view_credit')) {
+                        $query->where('credits.user_id', $user->id)->orWhere('credits.assigned_user_id', $user->id);
+                    }
+                },
+                'company.documents'=> function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at);
+                },
+                'company.expenses'=> function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at)->with('documents');
 
-            },
-            'company.credits'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at)->with('invitations', 'documents');
+                    if (! $user->hasPermission('view_expense')) {
+                        $query->where('expenses.user_id', $user->id)->orWhere('expenses.assigned_user_id', $user->id);
+                    }
+                },
+                'company.groups' => function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at)->with('documents');
+                },
+                'company.invoices'=> function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at)->with('invitations', 'documents');
 
-                if(!$user->hasPermission('view_credit'))
-                  $query->where('credits.user_id', $user->id)->orWhere('credits.assigned_user_id', $user->id);
+                    if (! $user->hasPermission('view_invoice')) {
+                        $query->where('invoices.user_id', $user->id)->orWhere('invoices.assigned_user_id', $user->id);
+                    }
+                },
+                'company.payments'=> function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at)->with('paymentables', 'documents');
 
-            },
-            'company.documents'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at);
-            },
-            'company.expenses'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at)->with('documents');
+                    if (! $user->hasPermission('view_payment')) {
+                        $query->where('payments.user_id', $user->id)->orWhere('payments.assigned_user_id', $user->id);
+                    }
+                },
+                'company.payment_terms'=> function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at);
+                },
+                'company.products' => function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at)->with('documents');
 
-                if(!$user->hasPermission('view_expense'))
-                  $query->where('expenses.user_id', $user->id)->orWhere('expenses.assigned_user_id', $user->id);
-            },
-            'company.groups' => function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at)->with('documents');
-            },
-            'company.invoices'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at)->with('invitations', 'documents');
+                    if (! $user->hasPermission('view_product')) {
+                        $query->where('products.user_id', $user->id)->orWhere('products.assigned_user_id', $user->id);
+                    }
+                },
+                'company.projects'=> function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at)->with('documents');
 
-                if(!$user->hasPermission('view_invoice'))
-                  $query->where('invoices.user_id', $user->id)->orWhere('invoices.assigned_user_id', $user->id);
+                    if (! $user->hasPermission('view_project')) {
+                        $query->where('projects.user_id', $user->id)->orWhere('projects.assigned_user_id', $user->id);
+                    }
+                },
+                'company.purchase_orders'=> function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at)->with('documents');
 
-            },
-            'company.payments'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at)->with('paymentables', 'documents');
+                    if (! $user->hasPermission('view_purchase_order')) {
+                        $query->where('purchase_orders.user_id', $user->id)->orWhere('purchase_orders.assigned_user_id', $user->id);
+                    }
+                },
+                'company.quotes'=> function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at)->with('invitations', 'documents');
 
-                if(!$user->hasPermission('view_payment'))
-                  $query->where('payments.user_id', $user->id)->orWhere('payments.assigned_user_id', $user->id);
+                    if (! $user->hasPermission('view_quote')) {
+                        $query->where('quotes.user_id', $user->id)->orWhere('quotes.assigned_user_id', $user->id);
+                    }
+                },
+                'company.recurring_invoices'=> function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at)->with('invitations', 'documents', 'client.gateway_tokens', 'client.group_settings', 'client.company');
 
-            },
-            'company.payment_terms'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at);
+                    if (! $user->hasPermission('view_recurring_invoice')) {
+                        $query->where('recurring_invoices.user_id', $user->id)->orWhere('recurring_invoices.assigned_user_id', $user->id);
+                    }
+                },
+                'company.tasks'=> function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at)->with('documents');
 
+                    if (! $user->hasPermission('view_task')) {
+                        $query->where('tasks.user_id', $user->id)->orWhere('tasks.assigned_user_id', $user->id);
+                    }
+                },
+                'company.tax_rates' => function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at);
+                },
+                'company.vendors'=> function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at)->with('contacts', 'documents');
 
-            },
-            'company.products' => function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at)->with('documents');
+                    if (! $user->hasPermission('view_vendor')) {
+                        $query->where('vendors.user_id', $user->id)->orWhere('vendors.assigned_user_id', $user->id);
+                    }
+                },
+                'company.expense_categories'=> function ($query) use ($created_at, $user) {
+                    $query->whereNotNull('created_at');
+                },
+                'company.task_statuses'=> function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at);
+                },
+                'company.activities'=> function ($query) use ($user) {
+                    if (! $user->isAdmin()) {
+                        $query->where('activities.user_id', $user->id);
+                    }
+                },
+                'company.webhooks'=> function ($query) use ($user) {
+                    if (! $user->isAdmin()) {
+                        $query->where('webhooks.user_id', $user->id);
+                    }
+                },
+                'company.tokens'=> function ($query) use ($user) {
+                    $query->where('company_tokens.user_id', $user->id);
+                },
+                'company.system_logs',
+                'company.subscriptions'=> function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at);
 
-                if(!$user->hasPermission('view_product'))
-                  $query->where('products.user_id', $user->id)->orWhere('products.assigned_user_id', $user->id);
+                    if (! $user->isAdmin()) {
+                        $query->where('subscriptions.user_id', $user->id);
+                    }
+                },
+                'company.recurring_expenses'=> function ($query) use ($created_at, $user) {
+                    $query->where('created_at', '>=', $created_at)->with('documents');
 
-            },
-            'company.projects'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at)->with('documents');
-
-                if(!$user->hasPermission('view_project'))
-                  $query->where('projects.user_id', $user->id)->orWhere('projects.assigned_user_id', $user->id);
-
-            },
-            'company.purchase_orders'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at)->with('documents');
-
-                if(!$user->hasPermission('view_purchase_order'))
-                  $query->where('purchase_orders.user_id', $user->id)->orWhere('purchase_orders.assigned_user_id', $user->id);
-
-            },
-            'company.quotes'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at)->with('invitations', 'documents');
-
-                if(!$user->hasPermission('view_quote'))
-                  $query->where('quotes.user_id', $user->id)->orWhere('quotes.assigned_user_id', $user->id);
-
-            },
-            'company.recurring_invoices'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at)->with('invitations', 'documents', 'client.gateway_tokens', 'client.group_settings', 'client.company');
-
-                if(!$user->hasPermission('view_recurring_invoice'))
-                  $query->where('recurring_invoices.user_id', $user->id)->orWhere('recurring_invoices.assigned_user_id', $user->id);
-
-            },
-            'company.tasks'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at)->with('documents');
-
-                if(!$user->hasPermission('view_task'))
-                  $query->where('tasks.user_id', $user->id)->orWhere('tasks.assigned_user_id', $user->id);
-
-            },
-            'company.tax_rates' => function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at);
-
-            },
-            'company.vendors'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at)->with('contacts', 'documents');
-
-                if(!$user->hasPermission('view_vendor'))
-                  $query->where('vendors.user_id', $user->id)->orWhere('vendors.assigned_user_id', $user->id);
-
-            },
-            'company.expense_categories'=> function ($query) use ($created_at, $user) {
-                $query->whereNotNull('created_at');
-
-            },
-            'company.task_statuses'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at);
-
-            },
-            'company.activities'=> function ($query) use($user) {
-
-              if(!$user->isAdmin())
-                  $query->where('activities.user_id', $user->id);
-
-            },
-            'company.webhooks'=> function ($query) use($user) {
-
-              if(!$user->isAdmin())
-                  $query->where('webhooks.user_id', $user->id);
-
-            },
-            'company.tokens'=> function ($query) use($user) {
-                  $query->where('company_tokens.user_id', $user->id);
-            },
-            'company.system_logs',
-            'company.subscriptions'=> function ($query) use($created_at, $user) {
-              $query->where('created_at', '>=', $created_at);
-
-              if(!$user->isAdmin())
-                  $query->where('subscriptions.user_id', $user->id);
-
-            },
-            'company.recurring_expenses'=> function ($query) use ($created_at, $user) {
-                $query->where('created_at', '>=', $created_at)->with('documents');
-
-                if(!$user->hasPermission('view_recurring_expense'))
-                  $query->where('recurring_expenses.user_id', $user->id)->orWhere('recurring_expenses.assigned_user_id', $user->id);
-
-            },
-          ]
+                    if (! $user->hasPermission('view_recurring_expense')) {
+                        $query->where('recurring_expenses.user_id', $user->id)->orWhere('recurring_expenses.assigned_user_id', $user->id);
+                    }
+                },
+            ]
         );
 
         if ($query instanceof Builder) {
@@ -640,13 +628,10 @@ class BaseController extends Controller
         }
 
         return $this->response($this->manager->createData($resource)->toArray());
-
-
     }
 
     protected function listResponse($query)
     {
-
         $this->buildManager();
 
         $transformer = new $this->entity_transformer(request()->input('serializer'));
@@ -737,9 +722,9 @@ class BaseController extends Controller
     public static function getApiHeaders($count = 0)
     {
         return [
-          'Content-Type' => 'application/json',
-          'X-Api-Version' => config('ninja.minimum_client_version'),
-          'X-App-Version' => config('ninja.app_version'),
+            'Content-Type' => 'application/json',
+            'X-Api-Version' => config('ninja.minimum_client_version'),
+            'X-App-Version' => config('ninja.app_version'),
         ];
     }
 
@@ -812,11 +797,11 @@ class BaseController extends Controller
 
             $this->buildCache();
 
-            if(Ninja::isSelfHost() && $account->set_react_as_default_ap)
+            if (Ninja::isSelfHost() && $account->set_react_as_default_ap) {
                 return response()->view('react.index', $data)->header('X-Frame-Options', 'SAMEORIGIN', false);
-            else
+            } else {
                 return response()->view('index.index', $data)->header('X-Frame-Options', 'SAMEORIGIN', false);
-
+            }
         }
 
         return redirect('/setup');
@@ -826,10 +811,9 @@ class BaseController extends Controller
     {
         $build = '';
 
-        if(request()->has('build')) {
+        if (request()->has('build')) {
             $build = request()->input('build');
-        }
-        elseif(Ninja::isHosted()){
+        } elseif (Ninja::isHosted()) {
             return 'main.dart.js';
         }
 
@@ -841,29 +825,28 @@ class BaseController extends Controller
             case 'last':
                 return 'main.last.dart.js';
             case 'next':
-                return 'main.next.dart.js';      
+                return 'main.next.dart.js';
             case 'profile':
-                return 'main.profile.dart.js';  
-            case 'html':             
-                return 'main.html.dart.js';                        
+                return 'main.profile.dart.js';
+            case 'html':
+                return 'main.html.dart.js';
             default:
                 return 'main.foss.dart.js';
 
         }
-
     }
 
     public function checkFeature($feature)
     {
+        if (auth()->user()->account->hasFeature($feature)) {
+            return true;
+        }
 
-      if(auth()->user()->account->hasFeature($feature))
-        return true;
-
-      return false;
+        return false;
     }
 
     public function featureFailure()
     {
-      return response()->json(['message' => 'Upgrade to a paid plan for this feature.'], 403);
+        return response()->json(['message' => 'Upgrade to a paid plan for this feature.'], 403);
     }
 }
diff --git a/app/Http/Controllers/ChartController.php b/app/Http/Controllers/ChartController.php
index 2e39aa4fd736..8dac67dafdf4 100644
--- a/app/Http/Controllers/ChartController.php
+++ b/app/Http/Controllers/ChartController.php
@@ -18,7 +18,6 @@ use Illuminate\Http\Response;
 
 class ChartController extends BaseController
 {
-
     public function __construct()
     {
         parent::__construct();
@@ -81,5 +80,4 @@ class ChartController extends BaseController
 
         return response()->json($cs->chart_summary($request->input('start_date'), $request->input('end_date')), 200);
     }
-
 }
diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
index 6006987f6fdf..b99917040a0e 100644
--- a/app/Http/Controllers/ClientController.php
+++ b/app/Http/Controllers/ClientController.php
@@ -38,6 +38,7 @@ use App\Utils\Traits\Uploadable;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Storage;
+
 /**
  * Class ClientController.
  * @covers App\Http\Controllers\ClientController
@@ -277,7 +278,6 @@ class ClientController extends BaseController
      */
     public function update(UpdateClientRequest $request, Client $client)
     {
-
         if ($request->entityIsDeleted($client)) {
             return $request->disallowUpdate();
         }
@@ -383,10 +383,8 @@ class ClientController extends BaseController
         $client->load('contacts', 'primary_contact');
 
         /* Set the client country to the company if none is set */
-        if(!$client->country_id && strlen($client->company->settings->country_id) > 1){
-
+        if (! $client->country_id && strlen($client->company->settings->country_id) > 1) {
             $client->update(['country_id' => $client->company->settings->country_id]);
-        
         }
 
         $this->uploadLogo($request->file('company_logo'), $client->company, $client);
@@ -448,11 +446,9 @@ class ClientController extends BaseController
      */
     public function destroy(DestroyClientRequest $request, Client $client)
     {
+        $this->client_repo->delete($client);
 
-       $this->client_repo->delete($client);
-
-       return $this->itemResponse($client->fresh());
-
+        return $this->itemResponse($client->fresh());
     }
 
     /**
@@ -513,8 +509,9 @@ class ClientController extends BaseController
         $ids = request()->input('ids');
         $clients = Client::withTrashed()->whereIn('id', $this->transformKeys($ids))->cursor();
 
-        if(!in_array($action, ['restore','archive','delete']))
+        if (! in_array($action, ['restore', 'archive', 'delete'])) {
             return response()->json(['message' => 'That action is not available.'], 400);
+        }
 
         $clients->each(function ($client, $key) use ($action) {
             if (auth()->user()->can('edit', $client)) {
@@ -578,15 +575,15 @@ class ClientController extends BaseController
      */
     public function upload(UploadClientRequest $request, Client $client)
     {
-
-        if(!$this->checkFeature(Account::FEATURE_DOCUMENTS))
+        if (! $this->checkFeature(Account::FEATURE_DOCUMENTS)) {
             return $this->featureFailure();
-        
-        if ($request->has('documents')) 
+        }
+
+        if ($request->has('documents')) {
             $this->saveDocuments($request->file('documents'), $client);
+        }
 
         return $this->itemResponse($client->fresh());
-
     }
 
     /**
@@ -642,10 +639,8 @@ class ClientController extends BaseController
     public function purge(PurgeClientRequest $request, Client $client)
     {
         //delete all documents
-        $client->documents->each(function ($document){
-
+        $client->documents->each(function ($document) {
             Storage::disk(config('filesystems.default'))->delete($document->url);
-
         });
 
         //force delete the client
diff --git a/app/Http/Controllers/ClientGatewayTokenController.php b/app/Http/Controllers/ClientGatewayTokenController.php
index 83242b744691..44912c5647a4 100644
--- a/app/Http/Controllers/ClientGatewayTokenController.php
+++ b/app/Http/Controllers/ClientGatewayTokenController.php
@@ -273,7 +273,6 @@ class ClientGatewayTokenController extends BaseController
      */
     public function update(UpdateClientGatewayTokenRequest $request, ClientGatewayToken $client_gateway_token)
     {
-
         $client_gateway_token = $this->client_gateway_token_repo->save($request->all(), $client_gateway_token);
 
         return $this->itemResponse($client_gateway_token->fresh());
@@ -427,11 +426,8 @@ class ClientGatewayTokenController extends BaseController
      */
     public function destroy(DestroyClientGatewayTokenRequest $request, ClientGatewayToken $client_gateway_token)
     {
+        $this->client_gateway_token_repo->delete($client_gateway_token);
 
-       $this->client_gateway_token_repo->delete($client_gateway_token);
-
-       return $this->itemResponse($client_gateway_token->fresh());
-
+        return $this->itemResponse($client_gateway_token->fresh());
     }
-
 }
diff --git a/app/Http/Controllers/ClientPortal/ApplePayDomainController.php b/app/Http/Controllers/ClientPortal/ApplePayDomainController.php
index 2565c7f57942..199f500016e4 100644
--- a/app/Http/Controllers/ClientPortal/ApplePayDomainController.php
+++ b/app/Http/Controllers/ClientPortal/ApplePayDomainController.php
@@ -21,7 +21,6 @@ use Illuminate\Support\Facades\Storage;
 
 class ApplePayDomainController extends Controller
 {
-
     private array $stripe_keys = ['d14dd26a47cecc30fdd65700bfb67b34', 'd14dd26a37cecc30fdd65700bfb55b23'];
 
     public function showAppleMerchantId(Request $request)
@@ -29,20 +28,15 @@ class ApplePayDomainController extends Controller
 
         /* Self Host */
 
-        if(Ninja::isSelfHost()){
-
+        if (Ninja::isSelfHost()) {
             $cgs = CompanyGateway::whereIn('gateway_key', $this->stripe_keys)
                                  ->where('is_deleted', false)
                                  ->get();
 
-            foreach($cgs as $cg)
-            {
-
-                if($cg->getConfigField('appleDomainVerification')){
-                   return response($cg->getConfigField('appleDomainVerification'),200);
-                                    
+            foreach ($cgs as $cg) {
+                if ($cg->getConfigField('appleDomainVerification')) {
+                    return response($cg->getConfigField('appleDomainVerification'), 200);
                 }
-
             }
 
             return response('', 400);
@@ -52,52 +46,44 @@ class ApplePayDomainController extends Controller
 
         $domain_name = $request->getHost();
 
-        if (strpos($domain_name, 'invoicing.co') !== false) 
-        {
+        if (strpos($domain_name, 'invoicing.co') !== false) {
             $subdomain = explode('.', $domain_name)[0];
-            
+
             $query = [
                 'subdomain' => $subdomain,
                 'portal_mode' => 'subdomain',
             ];
 
-            if($company = MultiDB::findAndSetDbByDomain($query)){
-               return $this->resolveAppleMerchantId($company);
+            if ($company = MultiDB::findAndSetDbByDomain($query)) {
+                return $this->resolveAppleMerchantId($company);
             }
         }
 
-       $query = [
+        $query = [
             'portal_domain' => $request->getSchemeAndHttpHost(),
             'portal_mode' => 'domain',
         ];
 
-        if($company = MultiDB::findAndSetDbByDomain($query)){
+        if ($company = MultiDB::findAndSetDbByDomain($query)) {
             return $this->resolveAppleMerchantId($company);
         }
 
         return response('', 400);
-
     }
 
     private function resolveAppleMerchantId($company)
     {
-
         $cgs = $company->company_gateways()
                        ->whereIn('gateway_key', $this->stripe_keys)
                        ->where('is_deleted', false)
                        ->get();
 
-        foreach($cgs as $cg)
-        {
-
-            if($cg->getConfigField('appleDomainVerification')){
-               return response($cg->getConfigField('appleDomainVerification'),200);
+        foreach ($cgs as $cg) {
+            if ($cg->getConfigField('appleDomainVerification')) {
+                return response($cg->getConfigField('appleDomainVerification'), 200);
             }
-
         }
 
         return response('', 400);
-
     }
-
 }
diff --git a/app/Http/Controllers/ClientPortal/ContactHashLoginController.php b/app/Http/Controllers/ClientPortal/ContactHashLoginController.php
index 4bff4678c92b..1b97219077f0 100644
--- a/app/Http/Controllers/ClientPortal/ContactHashLoginController.php
+++ b/app/Http/Controllers/ClientPortal/ContactHashLoginController.php
@@ -18,7 +18,6 @@ use Auth;
 
 class ContactHashLoginController extends Controller
 {
-
     /**
      * Logs a user into the client portal using their contact_key
      * @param  string $contact_key  The contact key
@@ -26,23 +25,20 @@ class ContactHashLoginController extends Controller
      */
     public function login(string $contact_key)
     {
-        if(request()->has('subscription') && request()->subscription == 'true') {
-
+        if (request()->has('subscription') && request()->subscription == 'true') {
             $recurring_invoice = RecurringInvoice::where('client_id', auth()->guard('contact')->client->id)
                                                  ->whereNotNull('subscription_id')
                                                  ->whereNull('deleted_at')
                                                  ->first();
 
             return redirect()->route('client.recurring_invoice.show', $recurring_invoice->hashed_id);
-
         }
 
-       return redirect($this->setRedirectPath());
+        return redirect($this->setRedirectPath());
     }
 
     public function magicLink(string $magic_link)
     {
-
         return redirect($this->setRedirectPath());
     }
 
@@ -53,20 +49,18 @@ class ContactHashLoginController extends Controller
 
     private function setRedirectPath()
     {
-
-        if(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES)
+        if (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES) {
             return '/client/invoices';
-        elseif(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES)
+        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES) {
             return '/client/recurring_invoices';
-        elseif(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES)
+        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES) {
             return '/client/quotes';
-        elseif(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS)
+        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS) {
             return '/client/credits';
-        elseif(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_TASKS)
+        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_TASKS) {
             return '/client/tasks';
-        elseif(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_EXPENSES)
+        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_EXPENSES) {
             return '/client/expenses';
-
+        }
     }
-
 }
diff --git a/app/Http/Controllers/ClientPortal/CreditController.php b/app/Http/Controllers/ClientPortal/CreditController.php
index 9bf792ef76a2..9b6ee3fefed8 100644
--- a/app/Http/Controllers/ClientPortal/CreditController.php
+++ b/app/Http/Controllers/ClientPortal/CreditController.php
@@ -34,17 +34,15 @@ class CreditController extends Controller
 
         $data = [
             'credit' => $credit,
-            'key' => $invitation ? $invitation->key : false
+            'key' => $invitation ? $invitation->key : false,
         ];
 
-            if ($invitation && auth()->guard('contact') && ! request()->has('silent') && ! $invitation->viewed_date) {
+        if ($invitation && auth()->guard('contact') && ! request()->has('silent') && ! $invitation->viewed_date) {
+            $invitation->markViewed();
 
-                $invitation->markViewed();
-
-                event(new InvitationWasViewed($credit, $invitation, $credit->company, Ninja::eventVars()));
-                event(new CreditWasViewed($invitation, $invitation->company, Ninja::eventVars()));
-            
-            }
+            event(new InvitationWasViewed($credit, $invitation, $credit->company, Ninja::eventVars()));
+            event(new CreditWasViewed($invitation, $invitation->company, Ninja::eventVars()));
+        }
 
         if ($request->query('mode') === 'fullscreen') {
             return render('credits.show-fullscreen', $data);
diff --git a/app/Http/Controllers/ClientPortal/DashboardController.php b/app/Http/Controllers/ClientPortal/DashboardController.php
index 3e58d53166cc..fbf159ecd461 100644
--- a/app/Http/Controllers/ClientPortal/DashboardController.php
+++ b/app/Http/Controllers/ClientPortal/DashboardController.php
@@ -22,7 +22,7 @@ class DashboardController extends Controller
      */
     public function index()
     {
-    	return redirect()->route('client.invoices.index');
+        return redirect()->route('client.invoices.index');
         //return $this->render('dashboard.index');
     }
 }
diff --git a/app/Http/Controllers/ClientPortal/DocumentController.php b/app/Http/Controllers/ClientPortal/DocumentController.php
index 60a087a29d4c..835c1bb640c1 100644
--- a/app/Http/Controllers/ClientPortal/DocumentController.php
+++ b/app/Http/Controllers/ClientPortal/DocumentController.php
@@ -60,8 +60,9 @@ class DocumentController extends Controller
 
         $headers = [];
 
-        if(request()->input('inline') == 'true') 
+        if (request()->input('inline') == 'true') {
             $headers = array_merge($headers, ['Content-Disposition' => 'inline']);
+        }
 
         return Storage::disk($document->disk)->download($document->url, $document->name, $headers);
     }
@@ -74,29 +75,22 @@ class DocumentController extends Controller
 
         $zipFile = new \PhpZip\ZipFile();
 
-        try{
-            
+        try {
             foreach ($documents as $document) {
                 $zipFile->addFile(TempFile::path($document->filePath()), $document->name);
             }
 
-            $filename = now() . '-documents.zip';
-            $filepath = sys_get_temp_dir() . '/' . $filename;
+            $filename = now().'-documents.zip';
+            $filepath = sys_get_temp_dir().'/'.$filename;
 
-           $zipFile->saveAsFile($filepath) // save the archive to a file
+            $zipFile->saveAsFile($filepath) // save the archive to a file
                    ->close(); // close archive
-                    
-           return response()->download($filepath, $filename)->deleteFileAfterSend(true);
 
-        }
-        catch(\PhpZip\Exception\ZipException $e){
+           return response()->download($filepath, $filename)->deleteFileAfterSend(true);
+        } catch (\PhpZip\Exception\ZipException $e) {
             // handle exception
-        }
-        finally{
+        } finally {
             $zipFile->close();
         }
-
     }
-
-
 }
diff --git a/app/Http/Controllers/ClientPortal/EntityViewController.php b/app/Http/Controllers/ClientPortal/EntityViewController.php
index f521f21fa736..fb73c3ce4a07 100644
--- a/app/Http/Controllers/ClientPortal/EntityViewController.php
+++ b/app/Http/Controllers/ClientPortal/EntityViewController.php
@@ -45,7 +45,6 @@ class EntityViewController extends Controller
 
         $key = $entity_type.'_id';
 
-
         $invitation = $invitation_entity::where('key', $invitation_key)
                                         ->with('contact.client')
                                         ->firstOrFail();
@@ -139,7 +138,7 @@ class EntityViewController extends Controller
 
         $invitation = $entity_obj::where('key', $request->invitation_key)
                                     ->whereHas($request->entity_type, function ($query) {
-                                         $query->where('is_deleted',0);
+                                        $query->where('is_deleted', 0);
                                     })
                                     ->with('contact.client')
                                     ->first();
@@ -154,15 +153,16 @@ class EntityViewController extends Controller
         if (! $invitation->viewed_date) {
             $invitation->markViewed();
 
-            if(!session()->get('is_silent'))
+            if (! session()->get('is_silent')) {
                 event(new InvitationWasViewed($invitation->{$request->entity_type}, $invitation, $invitation->{$request->entity_type}->company, Ninja::eventVars()));
+            }
 
-            if(!session()->get('is_silent'))
+            if (! session()->get('is_silent')) {
                 $this->fireEntityViewedEvent($invitation, $request->entity_type);
+            }
         }
-        
+
         return redirect()->route('client.'.$request->entity_type.'.show', [$request->entity_type => $this->encodePrimaryKey($invitation->{$key})]);
-        
     }
 
     private function fireEntityViewedEvent($invitation, $entity_string)
@@ -182,5 +182,4 @@ class EntityViewController extends Controller
                 break;
         }
     }
-
 }
diff --git a/app/Http/Controllers/ClientPortal/InvitationController.php b/app/Http/Controllers/ClientPortal/InvitationController.php
index ab353600c698..5d421a2f026a 100644
--- a/app/Http/Controllers/ClientPortal/InvitationController.php
+++ b/app/Http/Controllers/ClientPortal/InvitationController.php
@@ -83,11 +83,8 @@ class InvitationController extends Controller
         $invitation = $entity_obj::withTrashed()
                                     ->with($entity)
                                     ->where('key', $invitation_key)
-                                    // ->whereHas($entity, function ($query) {
-                                    //      $query->where('is_deleted',0);
-                                    // })
                                     ->with('contact.client')
-                                    ->first();
+                                    ->firstOrFail();
 
         if($invitation->{$entity}->is_deleted)
             return $this->render('generic.not_available', ['account' => $invitation->company->account, 'company' => $invitation->company]);
@@ -122,7 +119,6 @@ class InvitationController extends Controller
             return redirect()->route('client.login');
 
         } else {
-            nlog("else - default - login contact");
             request()->session()->invalidate();
             auth()->guard('contact')->loginUsingId($client_contact->id, true);
         }
@@ -198,7 +194,7 @@ class InvitationController extends Controller
 
         $file_name = $invitation->{$entity}->numberFormatter().'.pdf';
 
-        $file = CreateRawPdf::dispatchNow($invitation, $invitation->company->db);
+        $file = (new CreateRawPdf($invitation, $invitation->company->db))->handle();
 
         $headers = ['Content-Type' => 'application/pdf'];
 
diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php
index f3a49b20ead1..b5f42beb0783 100644
--- a/app/Http/Controllers/ClientPortal/InvoiceController.php
+++ b/app/Http/Controllers/ClientPortal/InvoiceController.php
@@ -26,9 +26,9 @@ use App\Utils\Traits\MakesHash;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\View\View;
-use Illuminate\Http\Request;
 
 class InvoiceController extends Controller
 {
@@ -41,7 +41,6 @@ class InvoiceController extends Controller
      */
     public function index(ShowInvoicesRequest $request)
     {
-
         return $this->render('invoices.index');
     }
 
@@ -61,23 +60,22 @@ class InvoiceController extends Controller
 
         $invitation = $invoice->invitations()->where('client_contact_id', auth()->guard('contact')->user()->id)->first();
 
-            if ($invitation && auth()->guard('contact') && !session()->get('is_silent') && ! $invitation->viewed_date) {
+        if ($invitation && auth()->guard('contact') && ! session()->get('is_silent') && ! $invitation->viewed_date) {
+            $invitation->markViewed();
 
-                $invitation->markViewed();
-
-                event(new InvitationWasViewed($invoice, $invitation, $invoice->company, Ninja::eventVars()));
-                event(new InvoiceWasViewed($invitation, $invitation->company, Ninja::eventVars()));
-            
-            }
+            event(new InvitationWasViewed($invoice, $invitation, $invoice->company, Ninja::eventVars()));
+            event(new InvoiceWasViewed($invitation, $invitation->company, Ninja::eventVars()));
+        }
 
         $data = [
             'invoice' => $invoice,
-            'key' => $invitation ? $invitation->key : false
+            'key' => $invitation ? $invitation->key : false,
         ];
 
         if ($request->query('mode') === 'fullscreen') {
             return render('invoices.show-fullscreen', $data);
         }
+
         return $this->render('invoices.show', $data);
     }
 
@@ -87,7 +85,6 @@ class InvoiceController extends Controller
      * @param ProcessInvoicesInBulkRequest $request
      * @return mixed
      */
-
     public function catch_bulk()
     {
         return $this->render('invoices.index');
@@ -110,14 +107,14 @@ class InvoiceController extends Controller
 
     public function downloadInvoices($ids)
     {
-
         $data['invoices'] = Invoice::whereIn('id', $ids)
                             ->whereClientId(auth()->guard('contact')->user()->client->id)
                             ->withTrashed()
                             ->get();
 
-        if(count($data['invoices']) == 0)
+        if (count($data['invoices']) == 0) {
             return back()->with(['message' => ctrans('texts.no_items_selected')]);
+        }
 
         return $this->render('invoices.download', $data);
     }
@@ -125,11 +122,13 @@ class InvoiceController extends Controller
     public function download(Request $request)
     {
         $transformed_ids = $this->transformKeys($request->invoices);
+
         return $this->downloadInvoicePDF((array) $transformed_ids);
     }
+
     /**
-     * @param array $ids 
-     * @return Factory|View|RedirectResponse 
+     * @param array $ids
+     * @return Factory|View|RedirectResponse
      */
     private function makePayment(array $ids)
     {
@@ -151,21 +150,19 @@ class InvoiceController extends Controller
 
         //iterate and sum the payable amounts either partial or balance
         $total = 0;
-        foreach($invoices as $invoice)
-        {
-
-            if($invoice->partial > 0)
+        foreach ($invoices as $invoice) {
+            if ($invoice->partial > 0) {
                 $total += $invoice->partial;
-            else
+            } else {
                 $total += $invoice->balance;
-
+            }
         }
 
         //format data
         $invoices->map(function ($invoice) {
             $invoice->service()->removeUnpaidGatewayFees();
             $invoice->balance = $invoice->balance > 0 ? Number::formatValue($invoice->balance, $invoice->client->currency()) : 0;
-            $invoice->partial =  $invoice->partial > 0 ? Number::formatValue($invoice->partial, $invoice->client->currency()) : 0;
+            $invoice->partial = $invoice->partial > 0 ? Number::formatValue($invoice->partial, $invoice->client->currency()) : 0;
 
             return $invoice;
         });
@@ -212,46 +209,39 @@ class InvoiceController extends Controller
         if ($invoices->count() == 1) {
             $invoice = $invoices->first();
 
-           $file = $invoice->service()->getInvoicePdf(auth()->guard('contact')->user());
+            $file = $invoice->service()->getInvoicePdf(auth()->guard('contact')->user());
 
-           // return response()->download(file_get_contents(public_path($file)));
+            // return response()->download(file_get_contents(public_path($file)));
 
-            return response()->streamDownload(function () use($file) {
-                    echo Storage::get($file);
-            },  basename($file), ['Content-Type' => 'application/pdf']);
+            return response()->streamDownload(function () use ($file) {
+                echo Storage::get($file);
+            }, basename($file), ['Content-Type' => 'application/pdf']);
         }
 
         return $this->buildZip($invoices);
-
     }
 
-
     private function buildZip($invoices)
     {
         // create new archive
         $zipFile = new \PhpZip\ZipFile();
-        try{
-            
+        try {
             foreach ($invoices as $invoice) {
 
-                #add it to the zip
+                //add it to the zip
                 $zipFile->addFromString(basename($invoice->pdf_file_path()), file_get_contents($invoice->pdf_file_path(null, 'url', true)));
-
             }
 
             $filename = date('Y-m-d').'_'.str_replace(' ', '_', trans('texts.invoices')).'.zip';
-            $filepath = sys_get_temp_dir() . '/' . $filename;
+            $filepath = sys_get_temp_dir().'/'.$filename;
 
-           $zipFile->saveAsFile($filepath) // save the archive to a file
+            $zipFile->saveAsFile($filepath) // save the archive to a file
                    ->close(); // close archive
-                    
-           return response()->download($filepath, $filename)->deleteFileAfterSend(true);
 
-        }
-        catch(\PhpZip\Exception\ZipException $e){
+           return response()->download($filepath, $filename)->deleteFileAfterSend(true);
+        } catch (\PhpZip\Exception\ZipException $e) {
             // handle exception
-        }
-        finally{
+        } finally {
             $zipFile->close();
         }
     }
diff --git a/app/Http/Controllers/ClientPortal/NinjaPlanController.php b/app/Http/Controllers/ClientPortal/NinjaPlanController.php
index 144834898480..15e497d62024 100644
--- a/app/Http/Controllers/ClientPortal/NinjaPlanController.php
+++ b/app/Http/Controllers/ClientPortal/NinjaPlanController.php
@@ -42,35 +42,29 @@ class NinjaPlanController extends Controller
 
     public function index(string $contact_key, string $account_or_company_key)
     {
-
         MultiDB::findAndSetDbByCompanyKey($account_or_company_key);
         $company = Company::where('company_key', $account_or_company_key)->first();
 
-        if(!$company){
+        if (! $company) {
             MultiDB::findAndSetDbByAccountKey($account_or_company_key);
             $account = Account::where('key', $account_or_company_key)->first();
-        }
-        else
+        } else {
             $account = $company->account;
+        }
 
-        if (MultiDB::findAndSetDbByContactKey($contact_key) && $client_contact = ClientContact::where('contact_key', $contact_key)->first())
-        {            
-        
-            nlog("Ninja Plan Controller - Found and set Client Contact");
-            
-            Auth::guard('contact')->loginUsingId($client_contact->id,true);
+        if (MultiDB::findAndSetDbByContactKey($contact_key) && $client_contact = ClientContact::where('contact_key', $contact_key)->first()) {
+            nlog('Ninja Plan Controller - Found and set Client Contact');
+
+            Auth::guard('contact')->loginUsingId($client_contact->id, true);
 
             return $this->plan();
-            
         }
 
         return redirect()->route('client.catchall');
-
     }
 
     public function trial()
     {
-
         $gateway = CompanyGateway::on('db-ninja-01')->find(config('ninja.ninja_default_company_gateway_id'));
 
         $data['gateway'] = $gateway;
@@ -80,22 +74,19 @@ class NinjaPlanController extends Controller
         $customer = $gateway_driver->findOrCreateCustomer();
 
         $setupIntent = \Stripe\SetupIntent::create([
-          'payment_method_types' => ['card'],
-          'usage' => 'off_session',
-          'customer' => $customer->id
+            'payment_method_types' => ['card'],
+            'usage' => 'off_session',
+            'customer' => $customer->id,
         ]);
 
         $data['intent'] = $setupIntent;
-        $data['client'] =  Auth::guard('contact')->user()->client;
+        $data['client'] = Auth::guard('contact')->user()->client;
 
         return $this->render('plan.trial', $data);
-
-         
     }
 
     public function trial_confirmation(Request $request)
     {
-
         $client = auth()->guard('contact')->user()->client;
         $client->fill($request->all());
         $client->save();
@@ -126,7 +117,7 @@ class NinjaPlanController extends Controller
         $gateway_driver->storeGatewayToken($data, ['gateway_customer_reference' => $customer->id]);
 
         //set free trial
-        if(auth()->guard('contact')->user()->client->custom_value2){
+        if (auth()->guard('contact')->user()->client->custom_value2) {
             MultiDB::findAndSetDbByAccountKey(auth()->guard('contact')->user()->client->custom_value2);
             $account = Account::where('key', auth()->guard('contact')->user()->client->custom_value2)->first();
             // $account->trial_started = now();
@@ -139,7 +130,7 @@ class NinjaPlanController extends Controller
         }
 
         MultiDB::setDB('db-ninja-01');
-        
+
         //create recurring invoice
         $subscription_repo = new SubscriptionRepository();
         $subscription = Subscription::find(6);
@@ -152,7 +143,7 @@ class NinjaPlanController extends Controller
         $recurring_invoice->date = now()->addDays(14);
         $recurring_invoice->remaining_cycles = -1;
         $recurring_invoice->auto_bill = $client->getSetting('auto_bill');
-        $recurring_invoice->auto_bill_enabled =  $this->setAutoBillFlag($recurring_invoice->auto_bill);
+        $recurring_invoice->auto_bill_enabled = $this->setAutoBillFlag($recurring_invoice->auto_bill);
         $recurring_invoice->due_date_days = 'terms';
         $recurring_invoice->next_send_date = now()->addDays(14)->format('Y-m-d');
         $recurring_invoice->next_send_date_client = now()->addDays(14)->format('Y-m-d');
@@ -170,10 +161,8 @@ class NinjaPlanController extends Controller
         $ninja_company->notification(new NewAccountNotification($account, $client))->ninja();
 
         return $this->render('plan.trial_confirmed', $data);
-
     }
 
-
     private function setAutoBillFlag($auto_bill)
     {
         if ($auto_bill == 'always' || $auto_bill == 'optout') {
@@ -181,7 +170,6 @@ class NinjaPlanController extends Controller
         }
 
         return false;
-        
     }
 
     public function plan()
@@ -190,18 +178,17 @@ class NinjaPlanController extends Controller
         //harvest the current plan
         $data = [];
         $data['late_invoice'] = false;
-        
-        if(MultiDB::findAndSetDbByAccountKey(Auth::guard('contact')->user()->client->custom_value2))
-        {
+
+        if (MultiDB::findAndSetDbByAccountKey(Auth::guard('contact')->user()->client->custom_value2)) {
             $account = Account::where('key', Auth::guard('contact')->user()->client->custom_value2)->first();
 
-            if($account)
-            {
+            if ($account) {
                 //offer the option to have a free trial
-                if(!$account->trial_started && !$account->plan)
+                if (! $account->trial_started && ! $account->plan) {
                     return $this->trial();
+                }
 
-                if(Carbon::parse($account->plan_expires)->lt(now())){
+                if (Carbon::parse($account->plan_expires)->lt(now())) {
                     //expired get the most recent invoice for payment
 
                     $late_invoice = Invoice::on('db-ninja-01')
@@ -215,12 +202,11 @@ class NinjaPlanController extends Controller
                     //account status means user cannot perform upgrades until they pay their account.
                     // $data['late_invoice'] = $late_invoice;
 
-                   //14-01-2022 remove late invoices from blocking upgrades
-                       $data['late_invoice'] = false;
-
+                    //14-01-2022 remove late invoices from blocking upgrades
+                    $data['late_invoice'] = false;
                 }
 
-                $recurring_invoice =  RecurringInvoice::on('db-ninja-01')
+                $recurring_invoice = RecurringInvoice::on('db-ninja-01')
                                             ->where('client_id', auth()->guard('contact')->user()->client->id)
                                             ->where('company_id', Auth::guard('contact')->user()->company->id)
                                             ->whereNotNull('subscription_id')
@@ -245,27 +231,22 @@ class NinjaPlanController extends Controller
                 $current_subscription_id = $recurring_invoice ? $this->encodePrimaryKey($recurring_invoice->subscription_id) : false;
 
                 //remove existing subscription
-                if($current_subscription_id){
-                
-                    $monthly_plans = $monthly_plans->filter(function ($plan) use($current_subscription_id){
-                        return (string)$plan->hashed_id != (string)$current_subscription_id;
-                    });   
-                
+                if ($current_subscription_id) {
+                    $monthly_plans = $monthly_plans->filter(function ($plan) use ($current_subscription_id) {
+                        return (string) $plan->hashed_id != (string) $current_subscription_id;
+                    });
                 }
 
                 $data['account'] = $account;
-                $data['client'] =  Auth::guard('contact')->user()->client;
+                $data['client'] = Auth::guard('contact')->user()->client;
                 $data['plans'] = $monthly_plans;
                 $data['current_subscription_id'] = $current_subscription_id;
                 $data['current_recurring_id'] = $recurring_invoice ? $recurring_invoice->hashed_id : false;
 
                 return $this->render('plan.index', $data);
-
             }
-
-        }
-        else
+        } else {
             return redirect('/client/dashboard');
-            
+        }
     }
 }
diff --git a/app/Http/Controllers/ClientPortal/PaymentController.php b/app/Http/Controllers/ClientPortal/PaymentController.php
index b2401a99683c..ff5a95aa13ea 100644
--- a/app/Http/Controllers/ClientPortal/PaymentController.php
+++ b/app/Http/Controllers/ClientPortal/PaymentController.php
@@ -127,8 +127,7 @@ class PaymentController extends Controller
      * @return Response         The response view
      */
     public function credit_response(Request $request)
-    {   
-        
+    {
         $payment_hash = PaymentHash::where('hash', $request->input('payment_hash'))->first();
 
         /* Hydrate the $payment */
diff --git a/app/Http/Controllers/ClientPortal/PaymentMethodController.php b/app/Http/Controllers/ClientPortal/PaymentMethodController.php
index 778723809956..4dbf694c3b17 100644
--- a/app/Http/Controllers/ClientPortal/PaymentMethodController.php
+++ b/app/Http/Controllers/ClientPortal/PaymentMethodController.php
@@ -97,7 +97,6 @@ class PaymentMethodController extends Controller
 
     public function verify(ClientGatewayToken $payment_method)
     {
-
         return $payment_method->gateway
             ->driver(auth()->user()->client)
             ->setPaymentMethod(request()->query('method'))
@@ -122,24 +121,18 @@ class PaymentMethodController extends Controller
      */
     public function destroy(ClientGatewayToken $payment_method)
     {
-
-        if($payment_method->gateway()->exists()){
-
+        if ($payment_method->gateway()->exists()) {
             $payment_method->gateway
                 ->driver(auth()->user()->client)
                 ->setPaymentMethod(request()->query('method'))
                 ->detach($payment_method);
-
         }
 
         try {
-
             event(new MethodDeleted($payment_method, auth()->guard('contact')->user()->company, Ninja::eventVars(auth()->guard('contact')->user()->id)));
-            
+
             $payment_method->delete();
-
         } catch (Exception $e) {
-
             nlog($e->getMessage());
 
             return back();
diff --git a/app/Http/Controllers/ClientPortal/ProfileController.php b/app/Http/Controllers/ClientPortal/ProfileController.php
index 193eb9fe47f1..5fa5f14c1de2 100644
--- a/app/Http/Controllers/ClientPortal/ProfileController.php
+++ b/app/Http/Controllers/ClientPortal/ProfileController.php
@@ -63,7 +63,7 @@ class ProfileController extends Controller
 
         //update avatar if needed
         if ($request->file('logo')) {
-            $path = UploadAvatar::dispatchNow($request->file('logo'), auth()->user()->client->client_hash);
+            $path = (new UploadAvatar($request->file('logo'), auth()->user()->client->client_hash))->handle();
 
             if ($path) {
                 $client->logo = $path;
diff --git a/app/Http/Controllers/ClientPortal/QuoteController.php b/app/Http/Controllers/ClientPortal/QuoteController.php
index adb863d40ca4..8cf4d3d9a06f 100644
--- a/app/Http/Controllers/ClientPortal/QuoteController.php
+++ b/app/Http/Controllers/ClientPortal/QuoteController.php
@@ -25,11 +25,11 @@ use App\Utils\Ninja;
 use App\Utils\TempFile;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Contracts\View\Factory;
+use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\View\View;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Carbon;
 
 class QuoteController extends Controller
 {
@@ -53,10 +53,9 @@ class QuoteController extends Controller
      * @return Factory|View|BinaryFileResponse
      */
     public function show(ShowQuoteRequest $request, Quote $quote)
-    {   
+    {
         /* If the quote is expired, convert the status here */
 
-
         $invitation = $quote->invitations()->where('client_contact_id', auth()->user()->id)->first();
 
         $data = [
@@ -65,12 +64,10 @@ class QuoteController extends Controller
         ];
 
         if ($invitation && auth()->guard('contact') && ! request()->has('silent') && ! $invitation->viewed_date) {
-
             $invitation->markViewed();
 
             event(new InvitationWasViewed($quote, $invitation, $quote->company, Ninja::eventVars()));
             event(new QuoteWasViewed($invitation, $invitation->company, Ninja::eventVars()));
-        
         }
 
         if ($request->query('mode') === 'fullscreen') {
@@ -97,14 +94,14 @@ class QuoteController extends Controller
 
     public function downloadQuotes($ids)
     {
-
         $data['quotes'] = Quote::whereIn('id', $ids)
                             ->whereClientId(auth()->user()->client->id)
                             ->withTrashed()
                             ->get();
 
-        if(count($data['quotes']) == 0)
+        if (count($data['quotes']) == 0) {
             return back()->with(['message' => ctrans('texts.no_items_selected')]);
+        }
 
         return $this->render('quotes.download', $data);
     }
@@ -112,7 +109,7 @@ class QuoteController extends Controller
     public function download(Request $request)
     {
         $transformed_ids = $this->transformKeys($request->quotes);
-        
+
         return $this->downloadQuotePdf((array) $transformed_ids);
     }
 
@@ -130,44 +127,37 @@ class QuoteController extends Controller
         }
 
         if ($quotes->count() == 1) {
-
-           $file = $quotes->first()->service()->getQuotePdf();
-           // return response()->download($file, basename($file), ['Cache-Control:' => 'no-cache'])->deleteFileAfterSend(true);
-           return response()->streamDownload(function () use($file) {
-                    echo Storage::get($file);
-            },  basename($file), ['Content-Type' => 'application/pdf']);
+            $file = $quotes->first()->service()->getQuotePdf();
+            // return response()->download($file, basename($file), ['Cache-Control:' => 'no-cache'])->deleteFileAfterSend(true);
+            return response()->streamDownload(function () use ($file) {
+                echo Storage::get($file);
+            }, basename($file), ['Content-Type' => 'application/pdf']);
         }
 
         return $this->buildZip($quotes);
-
     }
 
     private function buildZip($quotes)
     {
         // create new archive
         $zipFile = new \PhpZip\ZipFile();
-        try{
-            
+        try {
             foreach ($quotes as $quote) {
 
-                #add it to the zip
+                //add it to the zip
                 $zipFile->addFromString(basename($quote->pdf_file_path()), file_get_contents($quote->pdf_file_path(null, 'url', true)));
-
             }
 
             $filename = date('Y-m-d').'_'.str_replace(' ', '_', trans('texts.quotes')).'.zip';
-            $filepath = sys_get_temp_dir() . '/' . $filename;
+            $filepath = sys_get_temp_dir().'/'.$filename;
 
-           $zipFile->saveAsFile($filepath) // save the archive to a file
+            $zipFile->saveAsFile($filepath) // save the archive to a file
                    ->close(); // close archive
-                    
-           return response()->download($filepath, $filename)->deleteFileAfterSend(true);
 
-        }
-        catch(\PhpZip\Exception\ZipException $e){
+           return response()->download($filepath, $filename)->deleteFileAfterSend(true);
+        } catch (\PhpZip\Exception\ZipException $e) {
             // handle exception
-        }
-        finally{
+        } finally {
             $zipFile->close();
         }
     }
@@ -181,7 +171,7 @@ class QuoteController extends Controller
             ->withTrashed()
             ->get();
 
-        if (!$quotes || $quotes->count() == 0) {
+        if (! $quotes || $quotes->count() == 0) {
             return redirect()
                 ->route('client.quotes.index')
                 ->with('message', ctrans('texts.quotes_with_status_sent_can_be_approved'));
@@ -192,19 +182,20 @@ class QuoteController extends Controller
                 $quote->service()->approve(auth()->user())->save();
                 // event(new QuoteWasApproved(auth()->guard('contact')->user(), $quote, $quote->company, Ninja::eventVars()));
 
-                if (request()->has('signature') && !is_null(request()->signature) && !empty(request()->signature)) {
+                if (request()->has('signature') && ! is_null(request()->signature) && ! empty(request()->signature)) {
                     InjectSignature::dispatch($quote, request()->signature);
                 }
             }
 
-        if(count($ids) == 1){
+            if (count($ids) == 1) {
 
             //forward client to the invoice if it exists
-            if($quote->invoice()->exists())
-                return redirect()->route('client.invoice.show', $quote->invoice->hashed_id);
-                    
-            return redirect()->route('client.quote.show', $quotes->first()->hashed_id);
-        }
+                if ($quote->invoice()->exists()) {
+                    return redirect()->route('client.invoice.show', $quote->invoice->hashed_id);
+                }
+
+                return redirect()->route('client.quote.show', $quotes->first()->hashed_id);
+            }
 
             return redirect()
                 ->route('client.quotes.index')
diff --git a/app/Http/Controllers/ClientPortal/RecurringInvoiceController.php b/app/Http/Controllers/ClientPortal/RecurringInvoiceController.php
index 5c4bd6747961..d610d4515f82 100644
--- a/app/Http/Controllers/ClientPortal/RecurringInvoiceController.php
+++ b/app/Http/Controllers/ClientPortal/RecurringInvoiceController.php
@@ -13,8 +13,8 @@ namespace App\Http\Controllers\ClientPortal;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ClientPortal\RecurringInvoices\RequestCancellationRequest;
-use App\Http\Requests\ClientPortal\RecurringInvoices\ShowRecurringInvoicesRequest;
 use App\Http\Requests\ClientPortal\RecurringInvoices\ShowRecurringInvoiceRequest;
+use App\Http\Requests\ClientPortal\RecurringInvoices\ShowRecurringInvoicesRequest;
 use App\Jobs\Mail\NinjaMailer;
 use App\Jobs\Mail\NinjaMailerJob;
 use App\Jobs\Mail\NinjaMailerObject;
@@ -62,11 +62,10 @@ class RecurringInvoiceController extends Controller
 
     public function requestCancellation(RequestCancellationRequest $request, RecurringInvoice $recurring_invoice)
     {
-        nlog("outside cancellation");
+        nlog('outside cancellation');
 
-        if (optional($recurring_invoice->subscription)->allow_cancellation) {
-
-            nlog("inside the cancellation");
+        if ($recurring_invoice->subscription?->allow_cancellation) {
+            nlog('inside the cancellation');
 
             $nmo = new NinjaMailerObject;
             $nmo->mailable = (new NinjaMailer((new ClientContactRequestCancellationObject($recurring_invoice, auth()->user()))->build()));
@@ -75,24 +74,16 @@ class RecurringInvoiceController extends Controller
 
             // $notifiable_users = $this->filterUsersByPermissions($recurring_invoice->company->company_users, $recurring_invoice, ['recurring_cancellation']);
 
-            $recurring_invoice->company->company_users->each(function ($company_user) use ($nmo){
-
-
+            $recurring_invoice->company->company_users->each(function ($company_user) use ($nmo) {
                 $methods = $this->findCompanyUserNotificationType($company_user, ['recurring_cancellation', 'all_notifications']);
 
-
                 //if mail is a method type -fire mail!!
                 if (($key = array_search('mail', $methods)) !== false) {
                     unset($methods[$key]);
 
-
                     $nmo->to_user = $company_user->user;
                     NinjaMailerJob::dispatch($nmo);
-
                 }
-
-
-
             });
 
             // $notifiable_users->each(function ($company_user) use($nmo){
diff --git a/app/Http/Controllers/ClientPortal/SubscriptionController.php b/app/Http/Controllers/ClientPortal/SubscriptionController.php
index 0710beccc734..21fa9116c23e 100644
--- a/app/Http/Controllers/ClientPortal/SubscriptionController.php
+++ b/app/Http/Controllers/ClientPortal/SubscriptionController.php
@@ -21,10 +21,7 @@ class SubscriptionController extends Controller
 {
     public function index()
     {
-
-        if(Ninja::isHosted()){
-
-
+        if (Ninja::isHosted()) {
             $count = RecurringInvoice::query()
                 ->where('client_id', auth()->guard('contact')->user()->client->id)
                 ->where('company_id', auth()->guard('contact')->user()->client->company_id)
@@ -34,12 +31,11 @@ class SubscriptionController extends Controller
                 ->withTrashed()
                 ->count();
 
-                if($count == 0)
-                    return redirect()->route('client.ninja_contact_login', ['contact_key' => auth()->guard('contact')->user()->contact_key, 'company_key' => auth()->guard('contact')->user()->company->company_key]);
-
+            if ($count == 0) {
+                return redirect()->route('client.ninja_contact_login', ['contact_key' => auth()->guard('contact')->user()->contact_key, 'company_key' => auth()->guard('contact')->user()->company->company_key]);
+            }
         }
 
-
         return render('subscriptions.index');
     }
 }
diff --git a/app/Http/Controllers/ClientPortal/SubscriptionPlanSwitchController.php b/app/Http/Controllers/ClientPortal/SubscriptionPlanSwitchController.php
index 0af33a6954a8..b5b4593a52fa 100644
--- a/app/Http/Controllers/ClientPortal/SubscriptionPlanSwitchController.php
+++ b/app/Http/Controllers/ClientPortal/SubscriptionPlanSwitchController.php
@@ -31,19 +31,17 @@ class SubscriptionPlanSwitchController extends Controller
      */
     public function index(ShowPlanSwitchRequest $request, RecurringInvoice $recurring_invoice, Subscription $target)
     {
-
         $amount = $recurring_invoice->subscription
                                     ->service()
                                     ->calculateUpgradePrice($recurring_invoice, $target);
         /**
-         * 
          * Null value here is a proxy for
          * denying the user a change plan option
-         * 
          */
-        if(is_null($amount))
+        if (is_null($amount)) {
             render('subscriptions.denied');
-        
+        }
+
         return render('subscriptions.switch', [
             'subscription' => $recurring_invoice->subscription,
             'recurring_invoice' => $recurring_invoice,
diff --git a/app/Http/Controllers/ClientPortal/SubscriptionPurchaseController.php b/app/Http/Controllers/ClientPortal/SubscriptionPurchaseController.php
index cb8d272aa29b..09825123d32a 100644
--- a/app/Http/Controllers/ClientPortal/SubscriptionPurchaseController.php
+++ b/app/Http/Controllers/ClientPortal/SubscriptionPurchaseController.php
@@ -25,7 +25,7 @@ class SubscriptionPurchaseController extends Controller
     public function index(Subscription $subscription, Request $request)
     {
         /* Make sure the contact is logged into the correct company for this subscription */
-        if(auth()->guard('contact')->user() && auth()->guard('contact')->user()->company_id != $subscription->company_id){
+        if (auth()->guard('contact')->user() && auth()->guard('contact')->user()->company_id != $subscription->company_id) {
             auth()->guard('contact')->logout();
             $request->session()->invalidate();
         }
diff --git a/app/Http/Controllers/ClientPortal/SwitchCompanyController.php b/app/Http/Controllers/ClientPortal/SwitchCompanyController.php
index 804720d466be..d0f92ffa459c 100644
--- a/app/Http/Controllers/ClientPortal/SwitchCompanyController.php
+++ b/app/Http/Controllers/ClientPortal/SwitchCompanyController.php
@@ -30,7 +30,7 @@ class SwitchCompanyController extends Controller
         auth()->guard('contact')->loginUsingId($client_contact->id, true);
 
         request()->session()->regenerate();
-    
+
         return redirect('/client/dashboard');
     }
 }
diff --git a/app/Http/Controllers/ClientPortal/TempRouteController.php b/app/Http/Controllers/ClientPortal/TempRouteController.php
index a35f6defdb8f..db5be7f680ce 100644
--- a/app/Http/Controllers/ClientPortal/TempRouteController.php
+++ b/app/Http/Controllers/ClientPortal/TempRouteController.php
@@ -17,7 +17,6 @@ use Illuminate\Support\Facades\Cache;
 
 class TempRouteController extends Controller
 {
-
     /**
      * Logs a user into the client portal using their contact_key
      * @param  string $contact_key  The contact key
diff --git a/app/Http/Controllers/ClientStatementController.php b/app/Http/Controllers/ClientStatementController.php
index 00d0b4c3acfd..052ddc91a9de 100644
--- a/app/Http/Controllers/ClientStatementController.php
+++ b/app/Http/Controllers/ClientStatementController.php
@@ -77,7 +77,7 @@ class ClientStatementController extends BaseController
      *                     property="show_payments_table",
      *                     description="Flag which determines if the payments table is shown",
      *                     type="boolean",
-     *                 ),     
+     *                 ),
      *                 @OA\Property(
      *                     property="show_aging_table",
      *                     description="Flag which determines if the aging table is shown",
@@ -107,17 +107,16 @@ class ClientStatementController extends BaseController
      *       ),
      *     )
      */
-
     public function statement(CreateStatementRequest $request)
-    { 
+    {
         $pdf = $request->client()->service()->statement(
             $request->only(['start_date', 'end_date', 'show_payments_table', 'show_aging_table', 'status'])
         );
-    
+
         if ($pdf) {
             return response()->streamDownload(function () use ($pdf) {
                 echo $pdf;
-            }, ctrans('texts.statement') . '.pdf', ['Content-Type' => 'application/pdf']);
+            }, ctrans('texts.statement').'.pdf', ['Content-Type' => 'application/pdf']);
         }
 
         return response()->json(['message' => 'Something went wrong. Please check logs.']);
diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php
index c780d66f3007..86fc01c732c7 100644
--- a/app/Http/Controllers/CompanyController.php
+++ b/app/Http/Controllers/CompanyController.php
@@ -71,13 +71,11 @@ class CompanyController extends BaseController
      */
     public function __construct(CompanyRepository $company_repo)
     {
-        
         parent::__construct();
 
         $this->company_repo = $company_repo;
 
         $this->middleware('password_protected')->only(['destroy']);
-
     }
 
     /**
@@ -213,10 +211,9 @@ class CompanyController extends BaseController
     {
         $this->forced_includes = ['company_user'];
 
-        $company = CreateCompany::dispatchNow($request->all(), auth()->user()->company()->account);
-
-        CreateCompanyPaymentTerms::dispatchNow($company, auth()->user());
-        CreateCompanyTaskStatuses::dispatchNow($company, auth()->user());
+        $company = (new CreateCompany($request->all(), auth()->user()->company()->account))->handle();
+        (new CreateCompanyPaymentTerms($company, auth()->user()))->handle();
+        (new CreateCompanyTaskStatuses($company, auth()->user()))->handle();
 
         $company = $this->company_repo->save($request->all(), $company);
 
@@ -232,8 +229,7 @@ class CompanyController extends BaseController
             'notifications' => CompanySettings::notificationDefaults(),
         ]);
 
-        if($company->account->companies()->where('is_large', 1)->exists())
-        {
+        if ($company->account->companies()->where('is_large', 1)->exists()) {
             $company->account->companies()->update(['is_large' => true]);
         }
 
@@ -247,8 +243,7 @@ class CompanyController extends BaseController
          */
         $user_agent = request()->has('token_name') ? request()->input('token_name') : request()->server('HTTP_USER_AGENT');
 
-        $company_token = CreateCompanyToken::dispatchNow($company, auth()->user(), $user_agent);
-
+        $company_token = (new CreateCompanyToken($company, auth()->user(), $user_agent))->handle();
         $this->entity_transformer = CompanyUserTransformer::class;
         $this->entity_type = CompanyUser::class;
 
@@ -419,16 +414,18 @@ class CompanyController extends BaseController
      */
     public function update(UpdateCompanyRequest $request, Company $company)
     {
-        if ($request->hasFile('company_logo') || (is_array($request->input('settings')) && !array_key_exists('company_logo', $request->input('settings')))) 
+        if ($request->hasFile('company_logo') || (is_array($request->input('settings')) && ! array_key_exists('company_logo', $request->input('settings')))) {
             $this->removeLogo($company);
-        
+        }
+
         $company = $this->company_repo->save($request->all(), $company);
 
         $company->saveSettings($request->input('settings'), $company);
 
-        if ($request->has('documents')) 
+        if ($request->has('documents')) {
             $this->saveDocuments($request->input('documents'), $company, false);
-        
+        }
+
         $this->uploadLogo($request->file('company_logo'), $company, $company);
 
         return $this->itemResponse($company);
@@ -486,16 +483,15 @@ class CompanyController extends BaseController
      */
     public function destroy(DestroyCompanyRequest $request, Company $company)
     {
-        
-        if(Ninja::isHosted() && config('ninja.ninja_default_company_id') == $company->id)
+        if (Ninja::isHosted() && config('ninja.ninja_default_company_id') == $company->id) {
             return response()->json(['message' => 'Cannot purge this company'], 400);
-        
+        }
+
         $company_count = $company->account->companies->count();
         $account = $company->account;
         $account_key = $account->key;
 
         if ($company_count == 1) {
-
             $company->company_users->each(function ($company_user) {
                 $company_user->user->forceDelete();
                 $company_user->forceDelete();
@@ -503,28 +499,28 @@ class CompanyController extends BaseController
 
             $account->delete();
 
-            if(Ninja::isHosted())
+            if (Ninja::isHosted()) {
                 \Modules\Admin\Jobs\Account\NinjaDeletedAccount::dispatch($account_key, $request->all());
+            }
 
             LightLogs::create(new AccountDeleted())
                      ->increment()
                      ->queue();
-
         } else {
             $company_id = $company->id;
 
-            $company->company_users->each(function ($company_user){
+            $company->company_users->each(function ($company_user) {
                 $company_user->forceDelete();
             });
-                
-                $other_company = $company->account->companies->where('id', '!=', $company->id)->first();
 
-                $nmo = new NinjaMailerObject;
-                $nmo->mailable = new CompanyDeleted($company->present()->name, auth()->user(), $company->account, $company->settings);
-                $nmo->company = $other_company;
-                $nmo->settings = $other_company->settings;
-                $nmo->to_user = auth()->user();
-                NinjaMailerJob::dispatch($nmo);
+            $other_company = $company->account->companies->where('id', '!=', $company->id)->first();
+
+            $nmo = new NinjaMailerObject;
+            $nmo->mailable = new CompanyDeleted($company->present()->name, auth()->user(), $company->account, $company->settings);
+            $nmo->company = $other_company;
+            $nmo->settings = $other_company->settings;
+            $nmo->to_user = auth()->user();
+            NinjaMailerJob::dispatch($nmo, true);
 
             $company->delete();
 
@@ -592,18 +588,18 @@ class CompanyController extends BaseController
      */
     public function upload(UploadCompanyRequest $request, Company $company)
     {
-
-        if(!$this->checkFeature(Account::FEATURE_DOCUMENTS))
+        if (! $this->checkFeature(Account::FEATURE_DOCUMENTS)) {
             return $this->featureFailure();
-        
-        if ($request->has('documents')) 
+        }
+
+        if ($request->has('documents')) {
             $this->saveDocuments($request->file('documents'), $company);
+        }
 
         return $this->itemResponse($company->fresh());
-
     }
 
-/**
+    /**
      * Update the specified resource in storage.
      *
      * @param UploadCompanyRequest $request
@@ -656,13 +652,10 @@ class CompanyController extends BaseController
      */
     public function default(DefaultCompanyRequest $request, Company $company)
     {
-
         $account = $company->account;
         $account->default_company_id = $company->id;
-        $account->save();  
+        $account->save();
 
         return $this->itemResponse($company->fresh());
-      
     }
-
 }
diff --git a/app/Http/Controllers/CompanyGatewayController.php b/app/Http/Controllers/CompanyGatewayController.php
index ec3858b48225..d957238d4179 100644
--- a/app/Http/Controllers/CompanyGatewayController.php
+++ b/app/Http/Controllers/CompanyGatewayController.php
@@ -49,7 +49,6 @@ class CompanyGatewayController extends BaseController
 
     private array $stripe_keys = ['d14dd26a47cecc30fdd65700bfb67b34', 'd14dd26a37cecc30fdd65700bfb55b23'];
 
-
     /**
      * CompanyGatewayController constructor.
      * @param CompanyRepository $company_repo
@@ -200,8 +199,7 @@ class CompanyGatewayController extends BaseController
         $company_gateway->save();
 
         /*Always ensure at least one fees and limits object is set per gateway*/
-        if(!isset($company_gateway->fees_and_limits)) {
-
+        if (! isset($company_gateway->fees_and_limits)) {
             $gateway_types = $company_gateway->driver(new Client)->gatewayTypes();
 
             $fees_and_limits = new \stdClass;
@@ -213,8 +211,7 @@ class CompanyGatewayController extends BaseController
 
         ApplePayDomain::dispatch($company_gateway, $company_gateway->company->db);
 
-        if(in_array($company_gateway->gateway_key, $this->stripe_keys))
-        {
+        if (in_array($company_gateway->gateway_key, $this->stripe_keys)) {
             StripeWebhook::dispatch($company_gateway->company->company_key, $company_gateway->id);
         }
 
@@ -448,14 +445,12 @@ class CompanyGatewayController extends BaseController
      */
     public function destroy(DestroyCompanyGatewayRequest $request, CompanyGateway $company_gateway)
     {
-
         $company_gateway->driver(new Client)
                          ->disconnect();
 
         $company_gateway->delete();
 
         return $this->itemResponse($company_gateway->fresh());
-        
     }
 
     /**
diff --git a/app/Http/Controllers/ConnectedAccountController.php b/app/Http/Controllers/ConnectedAccountController.php
index 5097ed1f090d..7895024020d7 100644
--- a/app/Http/Controllers/ConnectedAccountController.php
+++ b/app/Http/Controllers/ConnectedAccountController.php
@@ -31,7 +31,7 @@ class ConnectedAccountController extends BaseController
     protected $entity_type = User::class;
 
     protected $entity_transformer = UserTransformer::class;
-    
+
     public function __construct()
     {
         parent::__construct();
@@ -146,7 +146,6 @@ class ConnectedAccountController extends BaseController
         $user = $google->getTokenResponse(request()->input('id_token'));
 
         if ($user) {
-            
             $client = new Google_Client();
             $client->setClientId(config('ninja.auth.google.client_id'));
             $client->setClientSecret(config('ninja.auth.google.client_secret'));
@@ -156,24 +155,24 @@ class ConnectedAccountController extends BaseController
 
             $email = $google->harvestEmail($user);
 
-            if(auth()->user()->email != $email && MultiDB::checkUserEmailExists($email))
+            if (auth()->user()->email != $email && MultiDB::checkUserEmailExists($email)) {
                 return response()->json(['message' => ctrans('texts.email_already_register')], 400);
+            }
 
             $connected_account = [
                 'email' => $email,
                 'oauth_user_id' => $google->harvestSubField($user),
                 'oauth_provider_id' => 'google',
-                'email_verified_at' =>now()
+                'email_verified_at' =>now(),
             ];
 
             auth()->user()->update($connected_account);
             auth()->user()->email_verified_at = now();
             auth()->user()->save();
-            
-            $this->setLoginCache(auth()->user());
-            
-            return $this->itemResponse(auth()->user());
 
+            $this->setLoginCache(auth()->user());
+
+            return $this->itemResponse(auth()->user());
         }
 
         return response()
@@ -182,11 +181,8 @@ class ConnectedAccountController extends BaseController
         ->header('X-Api-Version', config('ninja.minimum_client_version'));
     }
 
-
-
     public function handleGmailOauth(Request $request)
     {
-
         $user = false;
 
         $google = new Google();
@@ -194,7 +190,6 @@ class ConnectedAccountController extends BaseController
         $user = $google->getTokenResponse($request->input('id_token'));
 
         if ($user) {
-            
             $client = new Google_Client();
             $client->setClientId(config('ninja.auth.google.client_id'));
             $client->setClientSecret(config('ninja.auth.google.client_secret'));
@@ -213,27 +208,26 @@ class ConnectedAccountController extends BaseController
                 'oauth_user_token' => $token,
                 'oauth_user_refresh_token' => $refresh_token,
                 'oauth_provider_id' => 'google',
-                'email_verified_at' =>now()
+                'email_verified_at' =>now(),
             ];
 
-            if(auth()->user()->email != $google->harvestEmail($user))
+            if (auth()->user()->email != $google->harvestEmail($user)) {
                 return response()->json(['message' => 'Primary Email differs to OAuth email. Emails must match.'], 400);
+            }
 
             auth()->user()->update($connected_account);
             auth()->user()->email_verified_at = now();
             auth()->user()->save();
-            
+
             $this->activateGmail(auth()->user());
 
             return $this->itemResponse(auth()->user());
-
         }
 
         return response()
         ->json(['message' => ctrans('texts.invalid_credentials')], 401)
         ->header('X-App-Version', config('ninja.app_version'))
         ->header('X-Api-Version', config('ninja.minimum_client_version'));
-
     }
 
     private function activateGmail(User $user)
@@ -241,13 +235,12 @@ class ConnectedAccountController extends BaseController
         $company = $user->company();
         $settings = $company->settings;
 
-        if($settings->email_sending_method == 'default')
-        {
+        if ($settings->email_sending_method == 'default') {
             $settings->email_sending_method = 'gmail';
-            $settings->gmail_sending_user_id = (string)$user->hashed_id;
+            $settings->gmail_sending_user_id = (string) $user->hashed_id;
 
             $company->settings = $settings;
             $company->save();
-        }    
+        }
     }
 }
diff --git a/app/Http/Controllers/Contact/LoginController.php b/app/Http/Controllers/Contact/LoginController.php
index 97d8444f190d..9ce864735e4f 100644
--- a/app/Http/Controllers/Contact/LoginController.php
+++ b/app/Http/Controllers/Contact/LoginController.php
@@ -94,9 +94,9 @@ class LoginController extends BaseController
     {
         //'https://www.googleapis.com/auth/gmail.send','email','profile','openid'
         $scopes = [];
-        
-        if($provider == 'google'){
-            $scopes = ['https://www.googleapis.com/auth/gmail.send','email','profile','openid'];
+
+        if ($provider == 'google') {
+            $scopes = ['https://www.googleapis.com/auth/gmail.send', 'email', 'profile', 'openid'];
         }
 
         if (request()->has('code')) {
@@ -117,98 +117,6 @@ class LoginController extends BaseController
         }
     }
 
-    /*
-    public function handleProviderCallbackAndCreate(string $provider)
-    {
-        $socialite_user = Socialite::driver($provider)
-                                    ->stateless()
-                                    ->user();
-
-        if($user = OAuth::handleAuth($socialite_user, $provider))
-        {
-            Auth::login($user, true);
-
-            return redirect($this->redirectTo);
-        }
-        else if(MultiDB::checkUserEmailExists($socialite_user->getEmail()))
-        {
-            Session::flash('error', 'User exists in system, but not with this authentication method'); //todo add translations
-
-            return view('auth.login');
-        }
-        else {
-            //todo
-            $name = OAuth::splitName($socialite_user->getName());
-
-            $new_account = [
-                'first_name' => $name[0],
-                'last_name' => $name[1],
-                'password' => '',
-                'email' => $socialite_user->getEmail(),
-                'oauth_user_id' => $socialite_user->getId(),
-                'oauth_provider_id' => $provider
-            ];
-
-            $account = CreateAccount::dispatchNow($new_account);
-
-            Auth::login($account->default_company->owner(), true);
-
-            $cookie = cookie('db', $account->default_company->db);
-
-            return redirect($this->redirectTo)->withCookie($cookie);
-        }
-
-    }
-    */
-
-    /**
-     * We use this function when OAUTHING via the web interface.
-     *
-     * @return redirect
-
-    public function handleProviderCallback(string $provider)
-    {
-        $socialite_user = Socialite::driver($provider)
-                                    ->stateless()
-                                    ->user();
-
-        if($user = OAuth::handleAuth($socialite_user, $provider))
-        {
-            Auth::login($user, true);
-
-            return redirect($this->redirectTo);
-        }
-        else if(MultiDB::checkUserEmailExists($socialite_user->getEmail()))
-        {
-            Session::flash('error', 'User exists in system, but not with this authentication method'); //todo add translations
-
-            return view('auth.login');
-        }
-        else {
-            //todo
-            $name = OAuth::splitName($socialite_user->getName());
-
-            $new_account = [
-                'first_name' => $name[0],
-                'last_name' => $name[1],
-                'password' => '',
-                'email' => $socialite_user->getEmail(),
-                'oauth_user_id' => $socialite_user->getId(),
-                'oauth_provider_id' => $provider
-            ];
-
-            $account = CreateAccount::dispatchNow($new_account);
-
-            Auth::login($account->default_company->owner(), true);
-
-            $cookie = cookie('db', $account->default_company->db);
-
-            return redirect($this->redirectTo)->withCookie($cookie);
-        }
-
-    }
-     */
-
     /**
      * A client side authentication has taken place.
      * We now digest the token and confirm authentication with
@@ -235,6 +143,4 @@ class LoginController extends BaseController
             return $this->errorResponse(['message' => 'Invalid credentials'], 401);
         }
     }
-
-
 }
diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php
index 80d5d9e417ac..e0c72b90d598 100644
--- a/app/Http/Controllers/CreditController.php
+++ b/app/Http/Controllers/CreditController.php
@@ -48,7 +48,7 @@ class CreditController extends BaseController
 {
     use MakesHash;
     use SavesDocuments;
-    
+
     protected $entity_type = Credit::class;
 
     protected $entity_transformer = CreditTransformer::class;
@@ -205,7 +205,7 @@ class CreditController extends BaseController
                          ->triggeredActions($request)
                          ->save();
 
-        if($credit->invoice_id){
+        if ($credit->invoice_id) {
             $credit = $credit->service()->markSent()->save();
             $credit->client->service()->updatePaidToDate(-1 * $credit->balance)->save();
         }
@@ -388,7 +388,7 @@ class CreditController extends BaseController
         $credit->service()
                ->triggeredActions($request)
                ->deletePdf();
-        
+
         event(new CreditWasUpdated($credit, $credit->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($credit);
@@ -507,6 +507,9 @@ class CreditController extends BaseController
 
         $ids = request()->input('ids');
 
+        if(Ninja::isHosted() && (stripos($action, 'email') !== false) && !auth()->user()->company()->account->account_sms_verified)
+            return response(['message' => 'Please verify your account to send emails.'], 400);
+
         $credits = Credit::withTrashed()->whereIn('id', $this->transformKeys($ids))->company()->get();
 
         if (! $credits) {
@@ -520,7 +523,8 @@ class CreditController extends BaseController
         if ($action == 'bulk_download' && $credits->count() > 1) {
             $credits->each(function ($credit) {
                 if (auth()->user()->cannot('view', $credit)) {
-                    nlog("access denied");
+                    nlog('access denied');
+
                     return response()->json(['message' => ctrans('text.access_denied')]);
                 }
             });
@@ -530,7 +534,6 @@ class CreditController extends BaseController
             return response()->json(['message' => ctrans('texts.sent_message')], 200);
         }
 
-
         $credits->each(function ($credit, $key) use ($action) {
             if (auth()->user()->can('edit', $credit)) {
                 $this->performAction($credit, $action, true);
@@ -551,6 +554,7 @@ class CreditController extends BaseController
         switch ($action) {
             case 'mark_paid':
                 $credit->service()->markPaid()->save();
+
                 return $this->itemResponse($credit);
             break;
 
@@ -569,15 +573,15 @@ class CreditController extends BaseController
                     return $this->itemResponse($credit);
                 }
                 break;
-            case 'download':    
+            case 'download':
                 // $file = $credit->pdf_file_path();
                 $file = $credit->service()->getCreditPdf($credit->invitations->first());
 
                 // return response()->download($file, basename($file), ['Cache-Control:' => 'no-cache'])->deleteFileAfterSend(true);
 
-                return response()->streamDownload(function () use($file) {
-                        echo Storage::get($file);
-                },  basename($file), ['Content-Type' => 'application/pdf']);
+                return response()->streamDownload(function () use ($file) {
+                    echo Storage::get($file);
+                }, basename($file), ['Content-Type' => 'application/pdf']);
               break;
             case 'archive':
                 $this->credit_repository->archive($credit);
@@ -618,7 +622,6 @@ class CreditController extends BaseController
                     EmailEntity::dispatch($invitation, $credit->company, 'credit');
                 });
 
-
                 if (! $bulk) {
                     return response()->json(['message'=>'email sent'], 200);
                 }
@@ -637,17 +640,16 @@ class CreditController extends BaseController
         $credit = $invitation->credit;
 
         $file = $credit->service()->getCreditPdf($invitation);
-        
+
         $headers = ['Content-Type' => 'application/pdf'];
 
-        if(request()->input('inline') == 'true')
+        if (request()->input('inline') == 'true') {
             $headers = array_merge($headers, ['Content-Disposition' => 'inline']);
+        }
 
-        return response()->streamDownload(function () use($file) {
-                echo Storage::get($file);
-        },  basename($file), $headers);
-        
-
+        return response()->streamDownload(function () use ($file) {
+            echo Storage::get($file);
+        }, basename($file), $headers);
     }
 
     /**
@@ -703,15 +705,14 @@ class CreditController extends BaseController
      */
     public function upload(UploadCreditRequest $request, Credit $credit)
     {
-
-        if(!$this->checkFeature(Account::FEATURE_DOCUMENTS))
+        if (! $this->checkFeature(Account::FEATURE_DOCUMENTS)) {
             return $this->featureFailure();
-        
-        if ($request->has('documents')) 
+        }
+
+        if ($request->has('documents')) {
             $this->saveDocuments($request->file('documents'), $credit);
+        }
 
         return $this->itemResponse($credit->fresh());
-
     }
-
 }
diff --git a/app/Http/Controllers/DesignController.php b/app/Http/Controllers/DesignController.php
index dbb22226c761..56544e276c5e 100644
--- a/app/Http/Controllers/DesignController.php
+++ b/app/Http/Controllers/DesignController.php
@@ -357,11 +357,11 @@ class DesignController extends BaseController
         $design->fill($request->all());
         $design->save();
 
-/*
- This is required as the base template does not know to inject the table elements 
-*/
+        /*
+         This is required as the base template does not know to inject the table elements
+        */
 
-        $properties = ['includes','header','body','footer'];
+        $properties = ['includes', 'header', 'body', 'footer'];
 
         $d = $design->design;
 
@@ -395,18 +395,17 @@ class DesignController extends BaseController
 
 <div class="repeating-footer" id="footer">';
 
-        foreach($properties as $property){
+        foreach ($properties as $property) {
             $d->{$property} = str_replace($old_header, $new_header, $d->{$property});
             $d->{$property} = str_replace($old_footer, $new_footer, $d->{$property});
         }
 
         $design->design = $d;
-       // $design->save();
-
-/*
- This is required as the base template does not know to inject the table elements 
-*/
+        // $design->save();
 
+        /*
+         This is required as the base template does not know to inject the table elements
+        */
 
         return $this->itemResponse($design->fresh());
     }
@@ -465,7 +464,7 @@ class DesignController extends BaseController
     {
         //may not need these destroy routes as we are using actions to 'archive/delete'
         $design->is_deleted = true;
-        $design->name = $design->name . "_deleted_" . Str::random(5);
+        $design->name = $design->name.'_deleted_'.Str::random(5);
         $design->delete();
         $design->save();
 
@@ -551,8 +550,9 @@ class DesignController extends BaseController
                         ->where('id', $design_id)
                         ->exists();
 
-        if(!$design)
+        if (! $design) {
             return response()->json(['message' => 'Design does not exist.'], 400);
+        }
 
         switch ($entity) {
             case 'invoice':
@@ -560,11 +560,16 @@ class DesignController extends BaseController
                 break;
             case 'quote':
                 $company->quotes()->update(['design_id' => $design_id]);
-                break;  
+                break;
             case 'credit':
                 $company->credits()->update(['design_id' => $design_id]);
                 break;
-
+            case 'purchase_order':
+                $company->purchase_orders()->update(['design_id' => $design_id]);
+                break;
+            case 'recurring_invoice':
+                $company->recurring_invoices()->update(['design_id' => $design_id]);
+                break;
             default:
                 // code...
                 break;
diff --git a/app/Http/Controllers/DocumentController.php b/app/Http/Controllers/DocumentController.php
index dd785fca7f9b..21a2dfe0b775 100644
--- a/app/Http/Controllers/DocumentController.php
+++ b/app/Http/Controllers/DocumentController.php
@@ -116,16 +116,15 @@ class DocumentController extends BaseController
 
     public function download(ShowDocumentRequest $request, Document $document)
     {
-
         $headers = [];
 
-        if(request()->input('inline') == 'true')
+        if (request()->input('inline') == 'true') {
             $headers = array_merge($headers, ['Content-Disposition' => 'inline']);
+        }
 
         return response()->streamDownload(function () use ($document) {
             echo file_get_contents($document->generateUrl());
         }, basename($document->generateUrl()), $headers);
-
     }
 
     /**
@@ -178,10 +177,9 @@ class DocumentController extends BaseController
             return response()->json(['message' => ctrans('texts.no_documents_found')]);
         }
 
-        if($action == 'download'){
-
+        if ($action == 'download') {
             ZipDocuments::dispatch($documents->pluck('id'), auth()->user()->company(), auth()->user());
-            
+
             return response()->json(['message' => ctrans('texts.sent_message')], 200);
         }
         /*
diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php
index 9325a1d9cc7e..73b25465ce13 100644
--- a/app/Http/Controllers/EmailController.php
+++ b/app/Http/Controllers/EmailController.php
@@ -121,27 +121,26 @@ class EmailController extends BaseController
         $subject = $request->has('subject') ? $request->input('subject') : '';
         $body = $request->has('body') ? $request->input('body') : '';
         $entity_string = strtolower(class_basename($entity_obj));
-        $template = str_replace("email_template_", "", $request->input('template'));
+        $template = str_replace('email_template_', '', $request->input('template'));
 
         $data = [
             'subject' => $subject,
-            'body' => $body
+            'body' => $body,
         ];
 
+        if(Ninja::isHosted() && !$entity_obj->company->account->account_sms_verified)
+              return response(['message' => 'Please verify your account to send emails.'], 400);
+        
         if($entity == 'purchaseOrder' || $template == 'purchase_order'){
             return $this->sendPurchaseOrder($entity_obj, $data);
         }
 
         $entity_obj->invitations->each(function ($invitation) use ($data, $entity_string, $entity_obj, $template) {
-
-            if (!$invitation->contact->trashed() && $invitation->contact->email) {
-                
+            if (! $invitation->contact->trashed() && $invitation->contact->email) {
                 $entity_obj->service()->markSent()->save();
 
                 EmailEntity::dispatch($invitation->fresh(), $invitation->company, $template, $data);
-                
             }
-
         });
 
         $entity_obj->last_sent_date = now();
@@ -153,27 +152,27 @@ class EmailController extends BaseController
             $this->entity_type = Invoice::class;
             $this->entity_transformer = InvoiceTransformer::class;
 
-            if ($entity_obj->invitations->count() >= 1) 
+            if ($entity_obj->invitations->count() >= 1) {
                 $entity_obj->entityEmailEvent($entity_obj->invitations->first(), 'invoice', $template);
-            
+            }
         }
 
         if ($entity_obj instanceof Quote) {
             $this->entity_type = Quote::class;
             $this->entity_transformer = QuoteTransformer::class;
 
-            if ($entity_obj->invitations->count() >= 1) 
+            if ($entity_obj->invitations->count() >= 1) {
                 event(new QuoteWasEmailed($entity_obj->invitations->first(), $entity_obj->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null), 'quote'));
-            
+            }
         }
 
         if ($entity_obj instanceof Credit) {
             $this->entity_type = Credit::class;
             $this->entity_transformer = CreditTransformer::class;
 
-            if ($entity_obj->invitations->count() >= 1) 
+            if ($entity_obj->invitations->count() >= 1) {
                 event(new CreditWasEmailed($entity_obj->invitations->first(), $entity_obj->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null), 'credit'));
-            
+            }
         }
 
         if ($entity_obj instanceof RecurringInvoice) {
diff --git a/app/Http/Controllers/ExpenseController.php b/app/Http/Controllers/ExpenseController.php
index aeed759828b8..076e8702ccdc 100644
--- a/app/Http/Controllers/ExpenseController.php
+++ b/app/Http/Controllers/ExpenseController.php
@@ -44,7 +44,7 @@ class ExpenseController extends BaseController
     use Uploadable;
     use BulkOptions;
     use SavesDocuments;
-    
+
     protected $entity_type = Expense::class;
 
     protected $entity_transformer = ExpenseTransformer::class;
@@ -565,14 +565,14 @@ class ExpenseController extends BaseController
      */
     public function upload(UploadExpenseRequest $request, Expense $expense)
     {
-
-        if(!$this->checkFeature(Account::FEATURE_DOCUMENTS))
+        if (! $this->checkFeature(Account::FEATURE_DOCUMENTS)) {
             return $this->featureFailure();
-        
-        if ($request->has('documents')) 
+        }
+
+        if ($request->has('documents')) {
             $this->saveDocuments($request->file('documents'), $expense);
+        }
 
         return $this->itemResponse($expense->fresh());
-
-    }    
+    }
 }
diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php
index 3e40253195c9..1e6d57df6729 100644
--- a/app/Http/Controllers/ExportController.php
+++ b/app/Http/Controllers/ExportController.php
@@ -55,10 +55,8 @@ class ExportController extends BaseController
      */
     public function index(StoreExportRequest $request)
     {
-
         CompanyExport::dispatch(auth()->user()->getCompany(), auth()->user());
 
         return response()->json(['message' => 'Processing'], 200);
-
     }
 }
diff --git a/app/Http/Controllers/FilterController.php b/app/Http/Controllers/FilterController.php
index 5a7bc32c23f7..d9d484a1a4a4 100644
--- a/app/Http/Controllers/FilterController.php
+++ b/app/Http/Controllers/FilterController.php
@@ -11,18 +11,16 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
 use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
 class FilterController extends BaseController
 {
-
     private array $base_filters = ['archive', 'restore', 'delete'];
 
     public function __construct()
     {
-
     }
 
     /**
@@ -32,7 +30,6 @@ class FilterController extends BaseController
      */
     public function index(Request $request, string $entity)
     {
-
         $entity_filters = [];
 
         switch ($entity) {
@@ -40,7 +37,7 @@ class FilterController extends BaseController
             case 'invoice':
                 $entity_filters = ['bulk_download', 'mark_paid', 'mark_sent', 'download', 'cancel', 'email'];
                 break;
-            
+
             case 'quote':
                 $entity_filters = ['bulk_download', 'convert', 'convert_to_invoice', 'download', 'approve', 'email', 'mark_sent'];
                 break;
@@ -57,11 +54,8 @@ class FilterController extends BaseController
                 $entity_filters = ['bulk_download', 'start', 'stop', 'email'];
                 break;
 
-
         }
 
-        return response()->json( array_merge($this->base_filters, $entity_filters), 200);
+        return response()->json(array_merge($this->base_filters, $entity_filters), 200);
     }
-
-
 }
diff --git a/app/Http/Controllers/Gateways/Checkout3dsController.php b/app/Http/Controllers/Gateways/Checkout3dsController.php
index 3f05fa3d1a98..6b9465d342be 100644
--- a/app/Http/Controllers/Gateways/Checkout3dsController.php
+++ b/app/Http/Controllers/Gateways/Checkout3dsController.php
@@ -19,19 +19,19 @@ class Checkout3dsController extends Controller
 {
     public function index(Checkout3dsRequest $request, string $company_key, string $company_gateway_id, string $hash)
     {
-        if (!$request->getCompany()) {
+        if (! $request->getCompany()) {
             return response()->json(['message' => 'Company record not found.', 'company_key' => $company_key]);
         }
 
-        if (!$request->getCompanyGateway()) {
+        if (! $request->getCompanyGateway()) {
             return response()->json(['message' => 'Company gateway record not found.', 'company_gateway_id' => $company_gateway_id]);
         }
 
-        if (!$request->getPaymentHash()) {
+        if (! $request->getPaymentHash()) {
             return response()->json(['message' => 'Hash record not found.', 'hash' => $hash]);
         }
 
-        if (!$request->getClient()) {
+        if (! $request->getClient()) {
             return response()->json(['message' => 'Client record not found.']);
         }
 
diff --git a/app/Http/Controllers/GroupSettingController.php b/app/Http/Controllers/GroupSettingController.php
index 0aa2144c0e8c..2f66bd2c81be 100644
--- a/app/Http/Controllers/GroupSettingController.php
+++ b/app/Http/Controllers/GroupSettingController.php
@@ -361,8 +361,9 @@ class GroupSettingController extends BaseController
 
         $this->uploadLogo($request->file('company_logo'), $group_setting->company, $group_setting);
 
-        if ($request->has('documents')) 
+        if ($request->has('documents')) {
             $this->saveDocuments($request->input('documents'), $group_setting, false);
+        }
 
         return $this->itemResponse($group_setting);
     }
@@ -553,14 +554,14 @@ class GroupSettingController extends BaseController
      */
     public function upload(UploadGroupSettingRequest $request, GroupSetting $group_setting)
     {
-        if(!$this->checkFeature(Account::FEATURE_DOCUMENTS))
+        if (! $this->checkFeature(Account::FEATURE_DOCUMENTS)) {
             return $this->featureFailure();
-        
-        if ($request->has('documents')) 
+        }
+
+        if ($request->has('documents')) {
             $this->saveDocuments($request->file('documents'), $group_setting);
+        }
 
         return $this->itemResponse($group_setting->fresh());
-
-    }  
-
+    }
 }
diff --git a/app/Http/Controllers/HostedMigrationController.php b/app/Http/Controllers/HostedMigrationController.php
index 54b339d1eedf..e8a60452080e 100644
--- a/app/Http/Controllers/HostedMigrationController.php
+++ b/app/Http/Controllers/HostedMigrationController.php
@@ -22,44 +22,39 @@ use Illuminate\Support\Facades\Artisan;
 
 class HostedMigrationController extends Controller
 {
-
     public function getAccount(Request $request)
     {
-
-        if($request->header('X-API-HOSTED-SECRET') != config('ninja.ninja_hosted_secret'))
+        if ($request->header('X-API-HOSTED-SECRET') != config('ninja.ninja_hosted_secret')) {
             return;
+        }
 
-        if($user = MultiDB::hasUser(['email' => $request->input('email')]))
-        {
-
-            if($user->account->owner() && $user->account->companies()->count() >= 1)
-            {
-                return response()->json(['token' => $user->account->companies->first()->tokens->first()->token] ,200);
+        if ($user = MultiDB::hasUser(['email' => $request->input('email')])) {
+            if ($user->account->owner() && $user->account->companies()->count() >= 1) {
+                return response()->json(['token' => $user->account->companies->first()->tokens->first()->token], 200);
             }
 
             return response()->json(['error' => 'This user is not able to perform a migration. Please contact us at contact@invoiceninja.com to discuss.'], 401);
-            
         }
 
-        $account = CreateAccount::dispatchNow($request->all(), $request->getClientIp());
+        $account = (new CreateAccount($request->all(), $request->getClientIp()))->handle();
         $account->hosted_client_count = 100;
         $account->hosted_company_count = 10;
         $account->save();
-        
+
         $company = $account->companies->first();
 
         $company_token = CompanyToken::where('user_id', auth()->user()->id)
-                                     ->where('company_id', $company->id)
-                                     ->first();         
+            ->where('company_id', $company->id)
+            ->first();
 
         return response()->json(['token' => $company_token->token], 200);
-
     }
 
     public function confirmForwarding(Request $request)
     {
-        if($request->header('X-API-HOSTED-SECRET') != config('ninja.ninja_hosted_secret'))
+        if ($request->header('X-API-HOSTED-SECRET') != config('ninja.ninja_hosted_secret')) {
             return;
+        }
 
         $input = $request->all();
 
@@ -68,10 +63,9 @@ class HostedMigrationController extends Controller
         $company = Company::with('account')->where('company_key', $input['account_key'])->first();
 
         $forward_url = $company->domain();
-        
-        $billing_transferred = \Modules\Admin\Jobs\Account\TransferAccountPlan::dispatchNow($input);
+
+        $billing_transferred = (new \Modules\Admin\Jobs\Account\TransferAccountPlan($input))->handle();
 
         return response()->json(['forward_url' => $forward_url, 'billing_transferred' => $billing_transferred], 200);
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php
index 4d8d4e3d7659..f7ec7670d2a9 100644
--- a/app/Http/Controllers/ImportController.php
+++ b/app/Http/Controllers/ImportController.php
@@ -21,116 +21,118 @@ use Illuminate\Support\Str;
 use League\Csv\Reader;
 use League\Csv\Statement;
 
-class ImportController extends Controller {
+class ImportController extends Controller
+{
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param PreImportRequest $request
+     *
+     * @return \Illuminate\Http\JsonResponse
+     *
+     * @OA\Post(
+     *      path="/api/v1/preimport",
+     *      operationId="preimport",
+     *      tags={"imports"},
+     *      summary="Pre Import checks - returns a reference to the job and the headers of the CSV",
+     *      description="Pre Import checks - returns a reference to the job and the headers of the CSV",
+     *      @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
+     *      @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
+     *      @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
+     *      @OA\Parameter(ref="#/components/parameters/include"),
+     *      @OA\RequestBody(
+     *         description="The CSV file",
+     *         required=true,
+     *         @OA\MediaType(
+     *             mediaType="multipart/form-data",
+     *             @OA\Schema(
+     *                 type="string",
+     *                 format="binary"
+     *             )
+     *         )
+     *      ),
+     *      @OA\Response(
+     *          response=200,
+     *          description="Returns a reference to the file",
+     *          @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
+     *          @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
+     *          @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
+     *       ),
+     *       @OA\Response(
+     *          response=422,
+     *          description="Validation error",
+     *          @OA\JsonContent(ref="#/components/schemas/ValidationError"),
+     *
+     *       ),
+     *       @OA\Response(
+     *           response="default",
+     *           description="Unexpected Error",
+     *           @OA\JsonContent(ref="#/components/schemas/Error"),
+     *       ),
+     *     )
+     */
+    public function preimport(PreImportRequest $request)
+    {
+        // Create a reference
+        $hash = Str::random(32);
 
-	/**
-	 * Store a newly created resource in storage.
-	 *
-	 * @param PreImportRequest $request
-	 *
-	 * @return \Illuminate\Http\JsonResponse
-	 *
-	 * @OA\Post(
-	 *      path="/api/v1/preimport",
-	 *      operationId="preimport",
-	 *      tags={"imports"},
-	 *      summary="Pre Import checks - returns a reference to the job and the headers of the CSV",
-	 *      description="Pre Import checks - returns a reference to the job and the headers of the CSV",
-	 *      @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
-	 *      @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
-	 *      @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
-	 *      @OA\Parameter(ref="#/components/parameters/include"),
-	 *      @OA\RequestBody(
-	 *         description="The CSV file",
-	 *         required=true,
-	 *         @OA\MediaType(
-	 *             mediaType="multipart/form-data",
-	 *             @OA\Schema(
-	 *                 type="string",
-	 *                 format="binary"
-	 *             )
-	 *         )
-	 *      ),
-	 *      @OA\Response(
-	 *          response=200,
-	 *          description="Returns a reference to the file",
-	 *          @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
-	 *          @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
-	 *          @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
-	 *       ),
-	 *       @OA\Response(
-	 *          response=422,
-	 *          description="Validation error",
-	 *          @OA\JsonContent(ref="#/components/schemas/ValidationError"),
-	 *
-	 *       ),
-	 *       @OA\Response(
-	 *           response="default",
-	 *           description="Unexpected Error",
-	 *           @OA\JsonContent(ref="#/components/schemas/Error"),
-	 *       ),
-	 *     )
-	 */
-	public function preimport( PreImportRequest $request ) {
-		// Create a reference
-		$hash = Str::random( 32 );
+        $data = [
+            'hash'     => $hash,
+            'mappings' => [],
+        ];
+        /** @var UploadedFile $file */
+        foreach ($request->files->get('files') as $entityType => $file) {
+            $contents = file_get_contents($file->getPathname());
+            // $contents = mb_convert_encoding($contents, 'UTF-16LE', 'UTF-8');
 
-		$data = [
-			'hash'     => $hash,
-			'mappings' => [],
-		];
-		/** @var UploadedFile $file */
-		foreach ( $request->files->get( 'files' ) as $entityType => $file ) {
-			$contents = file_get_contents( $file->getPathname() );
-			// $contents = mb_convert_encoding($contents, 'UTF-16LE', 'UTF-8');
+            // Store the csv in cache with an expiry of 10 minutes
+            Cache::put($hash.'-'.$entityType, base64_encode($contents), 600);
 
-			// Store the csv in cache with an expiry of 10 minutes
-			Cache::put( $hash . '-' . $entityType, base64_encode( $contents ), 600 );
+            // Parse CSV
+            $csv_array = $this->getCsvData($contents);
 
-			// Parse CSV
-			$csv_array = $this->getCsvData( $contents );
+            $class_map = $this->getEntityMap($entityType);
 
-			$class_map = $this->getEntityMap( $entityType );
+            $data['mappings'][$entityType] = [
+                'available' => $class_map::importable(),
+                'headers'   => array_slice($csv_array, 0, 2),
+            ];
+        }
 
-			$data['mappings'][ $entityType ] = [
-				'available' => $class_map::importable(),
-				'headers'   => array_slice( $csv_array, 0, 2 ),
-			];
-		}
+        return response()->json($data);
+    }
 
-		return response()->json( $data );
-	}
+    public function import(ImportRequest $request)
+    {
+        $data = $request->all();
 
-	public function import( ImportRequest $request ) {
-		$data = $request->all();
+        if (empty($data['hash'])) {
+            // Create a reference
+            $data['hash'] = $hash = Str::random(32);
 
-		if ( empty( $data['hash'] ) ) {
-			// Create a reference
-			$data['hash'] = $hash = Str::random( 32 );
+            /** @var UploadedFile $file */
+            foreach ($request->files->get('files') as $entityType => $file) {
+                $contents = file_get_contents($file->getPathname());
+                // Store the csv in cache with an expiry of 10 minutes
+                Cache::put($hash.'-'.$entityType, base64_encode($contents), 600);
+            }
+        }
 
-			/** @var UploadedFile $file */
-			foreach ( $request->files->get( 'files' ) as $entityType => $file ) {
-				$contents = file_get_contents( $file->getPathname() );
+        unset($data['files']);
+        CSVIngest::dispatch($data, auth()->user()->company());
 
-				// Store the csv in cache with an expiry of 10 minutes
-				Cache::put( $hash . '-' . $entityType, base64_encode( $contents ), 600 );
-			}
-		}
+        return response()->json(['message' => ctrans('texts.import_started')], 200);
+    }
 
-		unset($data['files']);
-		// CSVImport::dispatch( $data, auth()->user()->company() );
-		CSVIngest::dispatch( $data, auth()->user()->company() );
+    private function getEntityMap($entity_type)
+    {
+        return sprintf('App\\Import\\Definitions\%sMap', ucfirst($entity_type));
+    }
 
-		return response()->json( [ 'message' => ctrans( 'texts.import_started' ) ], 200 );
-	}
-
-	private function getEntityMap( $entity_type ) {
-		return sprintf( 'App\\Import\\Definitions\%sMap', ucfirst( $entity_type ) );
-	}
-
-	private function getCsvData( $csvfile ) {
-		if ( ! ini_get( 'auto_detect_line_endings' ) ) {
-			ini_set( 'auto_detect_line_endings', '1' );
+    private function getCsvData($csvfile)
+    {
+        if (! ini_get('auto_detect_line_endings')) {
+            ini_set('auto_detect_line_endings', '1');
         }
 
         $csv = Reader::createFromString($csvfile);
@@ -144,11 +146,11 @@ class ImportController extends Controller {
             if (count($headers) && count($data) > 4) {
                 $firstCell = $headers[0];
 
-                if (strstr($firstCell, (string)config('ninja.app_name'))) {
-					array_shift( $data ); // Invoice Ninja...
-					array_shift( $data ); // <blank line>
-					array_shift( $data ); // Entity Type Header
-				}
+                if (strstr($firstCell, (string) config('ninja.app_name'))) {
+                    array_shift($data); // Invoice Ninja...
+                    array_shift($data); // <blank line>
+                    array_shift($data); // Entity Type Header
+                }
             }
         }
 
diff --git a/app/Http/Controllers/ImportJsonController.php b/app/Http/Controllers/ImportJsonController.php
index 794d5de3a5cf..786da6dedff7 100644
--- a/app/Http/Controllers/ImportJsonController.php
+++ b/app/Http/Controllers/ImportJsonController.php
@@ -19,9 +19,9 @@ use App\Utils\Ninja;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use ZipArchive;
-use Illuminate\Support\Facades\Storage;
 
 class ImportJsonController extends BaseController
 {
@@ -62,7 +62,6 @@ class ImportJsonController extends BaseController
      */
     public function import(ImportJsonRequest $request)
     {
-
         $file_location = $request->file('files')
             ->storeAs(
                 'migrations',
@@ -70,13 +69,12 @@ class ImportJsonController extends BaseController
                 config('filesystems.default'),
             );
 
-        if(Ninja::isHosted())
+        if (Ninja::isHosted()) {
             CompanyImport::dispatch(auth()->user()->getCompany(), auth()->user(), $file_location, $request->except('files'))->onQueue('migration');
-        else
+        } else {
             CompanyImport::dispatch(auth()->user()->getCompany(), auth()->user(), $file_location, $request->except('files'));
+        }
 
         return response()->json(['message' => 'Processing'], 200);
-
     }
-
 }
diff --git a/app/Http/Controllers/InAppPurchase/AppleController.php b/app/Http/Controllers/InAppPurchase/AppleController.php
index b223122fd41d..80105d7c6b1e 100644
--- a/app/Http/Controllers/InAppPurchase/AppleController.php
+++ b/app/Http/Controllers/InAppPurchase/AppleController.php
@@ -19,7 +19,6 @@ use Illuminate\Http\Request;
  */
 class AppleController extends BaseController
 {
-
     public function __construct()
     {
     }
@@ -62,7 +61,6 @@ class AppleController extends BaseController
     {
 
         //store transaction_id in accounts table for future reference.
-        
     }
 
     /**
@@ -101,7 +99,5 @@ class AppleController extends BaseController
      */
     public function process_webhook(Request $request)
     {
-
     }
-
 }
diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index 0b9d730e899d..dd91e5e6b5d4 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -58,7 +58,7 @@ class InvoiceController extends BaseController
 {
     use MakesHash;
     use SavesDocuments;
-    
+
     protected $entity_type = Invoice::class;
 
     protected $entity_transformer = InvoiceTransformer::class;
@@ -219,7 +219,6 @@ class InvoiceController extends BaseController
      */
     public function store(StoreInvoiceRequest $request)
     {
-
         $invoice = $this->invoice_repo->save($request->all(), InvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id));
 
         $invoice = $invoice->service()
@@ -229,7 +228,7 @@ class InvoiceController extends BaseController
                            ->save();
 
         event(new InvoiceWasCreated($invoice, $invoice->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
-        
+
         $transaction = [
             'invoice' => $invoice->transaction_event(),
             'payment' => [],
@@ -239,7 +238,7 @@ class InvoiceController extends BaseController
         ];
 
         TransactionLog::dispatch(TransactionEvent::INVOICE_UPDATED, $transaction, $invoice->company->db);
-        
+
         return $this->itemResponse($invoice);
     }
 
@@ -548,11 +547,13 @@ class InvoiceController extends BaseController
      */
     public function bulk()
     {
-        
         $action = request()->input('action');
 
         $ids = request()->input('ids');
 
+        if(Ninja::isHosted() && (stripos($action, 'email') !== false) && !auth()->user()->company()->account->account_sms_verified)
+            return response(['message' => 'Please verify your account to send emails.'], 400);
+            
         $invoices = Invoice::withTrashed()->whereIn('id', $this->transformKeys($ids))->company()->get();
 
         if (! $invoices) {
@@ -566,7 +567,8 @@ class InvoiceController extends BaseController
         if ($action == 'bulk_download' && $invoices->count() > 1) {
             $invoices->each(function ($invoice) {
                 if (auth()->user()->cannot('view', $invoice)) {
-                    nlog("access denied");
+                    nlog('access denied');
+
                     return response()->json(['message' => ctrans('text.access_denied')]);
                 }
             });
@@ -665,7 +667,7 @@ class InvoiceController extends BaseController
     }
 
     private function performAction(Invoice $invoice, $action, $bulk = false)
-    {   
+    {
         /*If we are using bulk actions, we don't want to return anything */
         switch ($action) {
             case 'clone_to_invoice':
@@ -690,7 +692,7 @@ class InvoiceController extends BaseController
                 break;
             case 'mark_paid':
                 if ($invoice->status_id == Invoice::STATUS_PAID || $invoice->is_deleted === true) {
-                // if ($invoice->balance < 0 || $invoice->status_id == Invoice::STATUS_PAID || $invoice->is_deleted === true) {
+                    // if ($invoice->balance < 0 || $invoice->status_id == Invoice::STATUS_PAID || $invoice->is_deleted === true) {
                     return $this->errorResponse(['message' => ctrans('texts.invoice_cannot_be_marked_paid')], 400);
                 }
 
@@ -711,9 +713,9 @@ class InvoiceController extends BaseController
 
                 $file = $invoice->service()->getInvoicePdf();
 
-                return response()->streamDownload(function () use($file) {
-                        echo Storage::get($file);
-                },  basename($file), ['Content-Type' => 'application/pdf']);
+                return response()->streamDownload(function () use ($file) {
+                    echo Storage::get($file);
+                }, basename($file), ['Content-Type' => 'application/pdf']);
 
                 break;
             case 'restore':
@@ -749,7 +751,6 @@ class InvoiceController extends BaseController
             case 'email':
                 //check query parameter for email_type and set the template else use calculateTemplate
 
-
                 if (request()->has('email_type') && property_exists($invoice->company->settings, request()->input('email_type'))) {
                     $this->reminder_template = $invoice->client->getSetting(request()->input('email_type'));
                 } else {
@@ -835,8 +836,9 @@ class InvoiceController extends BaseController
     {
         $invitation = $this->invoice_repo->getInvitationByKey($invitation_key);
 
-        if(!$invitation)
-            return response()->json(["message" => "no record found"], 400);
+        if (! $invitation) {
+            return response()->json(['message' => 'no record found'], 400);
+        }
 
         $contact = $invitation->contact;
         $invoice = $invitation->invoice;
@@ -845,13 +847,13 @@ class InvoiceController extends BaseController
 
         $headers = ['Content-Type' => 'application/pdf'];
 
-        if(request()->input('inline') == 'true')
+        if (request()->input('inline') == 'true') {
             $headers = array_merge($headers, ['Content-Disposition' => 'inline']);
+        }
 
-        return response()->streamDownload(function () use($file) {
-                echo Storage::get($file);
-        },  basename($file), $headers);
-        
+        return response()->streamDownload(function () use ($file) {
+            echo Storage::get($file);
+        }, basename($file), $headers);
     }
 
     /**
@@ -900,13 +902,11 @@ class InvoiceController extends BaseController
      */
     public function deliveryNote(ShowInvoiceRequest $request, Invoice $invoice)
     {
-        
         $file = $invoice->service()->getInvoiceDeliveryNote($invoice, $invoice->invitations->first()->contact);
-        
-        return response()->streamDownload(function () use($file) {
-                echo Storage::get($file);
-        },  basename($file), ['Content-Type' => 'application/pdf']);
 
+        return response()->streamDownload(function () use ($file) {
+            echo Storage::get($file);
+        }, basename($file), ['Content-Type' => 'application/pdf']);
     }
 
     /**
@@ -962,24 +962,25 @@ class InvoiceController extends BaseController
      */
     public function upload(UploadInvoiceRequest $request, Invoice $invoice)
     {
-        if(!$this->checkFeature(Account::FEATURE_DOCUMENTS))
+        if (! $this->checkFeature(Account::FEATURE_DOCUMENTS)) {
             return $this->featureFailure();
-        
-        if ($request->has('documents')) 
-            $this->saveDocuments($request->file('documents'), $invoice);
+        }
 
-        if ($request->has('file')) 
+        if ($request->has('documents')) {
             $this->saveDocuments($request->file('documents'), $invoice);
+        }
+
+        if ($request->has('file')) {
+            $this->saveDocuments($request->file('documents'), $invoice);
+        }
 
         return $this->itemResponse($invoice->fresh());
-
-    }    
+    }
 
     public function update_reminders(UpdateReminderRequest $request)
     {
-
         UpdateReminders::dispatch(auth()->user()->company());
 
-        return response()->json(["message" => "Updating reminders"], 200);
+        return response()->json(['message' => 'Updating reminders'], 200);
     }
 }
diff --git a/app/Http/Controllers/LicenseController.php b/app/Http/Controllers/LicenseController.php
index 5771dbb6f0ed..a603beb26e26 100644
--- a/app/Http/Controllers/LicenseController.php
+++ b/app/Http/Controllers/LicenseController.php
@@ -13,10 +13,10 @@ namespace App\Http\Controllers;
 
 use App\Models\Account;
 use App\Utils\CurlUtils;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use stdClass;
-use Carbon\Carbon;
 
 class LicenseController extends BaseController
 {
@@ -133,9 +133,9 @@ class LicenseController extends BaseController
                 }
             } else {
                 $error = [
-                        'message' => trans('texts.white_label_license_error'),
-                        'errors' => new stdClass,
-                    ];
+                    'message' => trans('texts.white_label_license_error'),
+                    'errors' => new stdClass,
+                ];
 
                 return response()->json($error, 400);
             }
@@ -153,7 +153,7 @@ class LicenseController extends BaseController
     {
         $account = auth()->user()->account;
 
-        if($account->plan == 'white_label' && Carbon::parse($account->plan_expires)->lt(now())){
+        if ($account->plan == 'white_label' && Carbon::parse($account->plan_expires)->lt(now())) {
             $account->plan = null;
             $account->plan_expires = null;
             $account->save();
diff --git a/app/Http/Controllers/LogoutController.php b/app/Http/Controllers/LogoutController.php
index 5a5a301505b2..c04c3f4f044a 100644
--- a/app/Http/Controllers/LogoutController.php
+++ b/app/Http/Controllers/LogoutController.php
@@ -14,8 +14,8 @@ namespace App\Http\Controllers;
 use App\Models\CompanyToken;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Symfony\Component\HttpFoundation\StreamedResponse;
 use stdClass;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class LogoutController extends BaseController
 {
@@ -63,12 +63,11 @@ class LogoutController extends BaseController
                     ->where('token', $request->header('X-API-TOKEN'))
                     ->first();
 
-                    $ct->company
+        $ct->company
                     ->tokens()
                     ->where('is_system', true)
                     ->forceDelete();
 
         return response()->json(['message' => 'All tokens deleted'], 200);
     }
-
 }
diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php
index e64d11025d5f..121502d300b0 100644
--- a/app/Http/Controllers/MigrationController.php
+++ b/app/Http/Controllers/MigrationController.php
@@ -25,8 +25,8 @@ use App\Utils\Ninja;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Http\Request;
 use Illuminate\Http\UploadedFile;
-use Illuminate\Support\Str;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Str;
 
 class MigrationController extends BaseController
 {
@@ -84,8 +84,9 @@ class MigrationController extends BaseController
      */
     public function purgeCompany(Company $company)
     {
-        if(Ninja::isHosted() && config('ninja.ninja_default_company_id') == $company->id)
+        if (Ninja::isHosted() && config('ninja.ninja_default_company_id') == $company->id) {
             return response()->json(['message' => 'Cannot purge this company'], 400);
+        }
 
         $account = $company->account;
         $company_id = $company->id;
@@ -107,8 +108,9 @@ class MigrationController extends BaseController
 
     private function purgeCompanyWithForceFlag(Company $company)
     {
-        if(Ninja::isHosted() && config('ninja.ninja_default_company_id') == $company->id)
+        if (Ninja::isHosted() && config('ninja.ninja_default_company_id') == $company->id) {
             return response()->json(['message' => 'Cannot purge this company'], 400);
+        }
 
         $account = $company->account;
         $company_id = $company->id;
@@ -254,195 +256,185 @@ class MigrationController extends BaseController
      * @return \Illuminate\Http\JsonResponse|void
      */
     public function startMigration(Request $request)
-    {   
+    {
+        nlog('Starting Migration');
 
-        nlog("Starting Migration");
-        
-        if($request->companies){
+        if ($request->companies) {
             //handle Laravel 5.5 UniHTTP
-            $companies = json_decode($request->companies,1);
-        }
-        else {
+            $companies = json_decode($request->companies, 1);
+        } else {
             //handle Laravel 6 Guzzle
             $companies = [];
 
-            foreach($request->all() as $input){
-
-                if($input instanceof UploadedFile){
-
+            foreach ($request->all() as $input) {
+                if ($input instanceof UploadedFile) {
+                } else {
+                    $companies[] = json_decode($input, 1);
                 }
-                else
-                    $companies[] = json_decode($input,1);
             }
         }
 
         if (app()->environment() === 'local') {
-
         }
 
-    try {
-        return response()->json([
-        '_id' => Str::uuid(),
-        'method' => config('queue.default'),
-        'started_at' => now(),
-    ], 200);
+        try {
+            return response()->json([
+                '_id' => Str::uuid(),
+                'method' => config('queue.default'),
+                'started_at' => now(),
+            ], 200);
+        } finally {
+            // Controller logic here
 
-    } finally {
-    // Controller logic here
+            foreach ($companies as $company) {
+                if (! is_array($company)) {
+                    continue;
+                }
 
-        foreach($companies as $company)
-        {
+                $company = (array) $company;
 
-            if(!is_array($company))
-                continue;
+                $user = auth()->user();
 
-            $company = (array)$company;
+                $company_count = $user->account->companies()->count();
 
-            $user = auth()->user();
+                // Look for possible existing company (based on company keys).
+                $existing_company = Company::whereRaw('BINARY `company_key` = ?', [$company['company_key']])->first();
 
-            $company_count = $user->account->companies()->count();
+                App::forgetInstance('translator');
+                $t = app('translator');
+                $t->replace(Ninja::transformTranslations($user->account->companies()->first()->settings));
+                App::setLocale($user->account->companies()->first()->getLocale());
 
-            // Look for possible existing company (based on company keys).
-            $existing_company = Company::whereRaw('BINARY `company_key` = ?', [$company['company_key']])->first();
+                if (! $existing_company && $company_count >= 10) {
+                    $nmo = new NinjaMailerObject;
+                    $nmo->mailable = new MaxCompanies($user->account->companies()->first());
+                    $nmo->company = $user->account->companies()->first();
+                    $nmo->settings = $user->account->companies()->first()->settings;
+                    $nmo->to_user = $user;
+                    NinjaMailerJob::dispatch($nmo, true);
 
-            App::forgetInstance('translator');
-            $t = app('translator');
-            $t->replace(Ninja::transformTranslations($user->account->companies()->first()->settings));
-            App::setLocale($user->account->companies()->first()->getLocale());
+                    return;
+                } elseif ($existing_company && $company_count > 10) {
+                    $nmo = new NinjaMailerObject;
+                    $nmo->mailable = new MaxCompanies($user->account->companies()->first());
+                    $nmo->company = $user->account->companies()->first();
+                    $nmo->settings = $user->account->companies()->first()->settings;
+                    $nmo->to_user = $user;
+                    NinjaMailerJob::dispatch($nmo, true);
 
-            if(!$existing_company && $company_count >=10) {
+                    return;
+                }
 
-                $nmo = new NinjaMailerObject;
-                $nmo->mailable = new MaxCompanies($user->account->companies()->first());
-                $nmo->company = $user->account->companies()->first();
-                $nmo->settings = $user->account->companies()->first()->settings;
-                $nmo->to_user = $user;
-                NinjaMailerJob::dispatch($nmo);
-                return;
-            }
-            elseif($existing_company && $company_count > 10 ){
+                $checks = [
+                    'existing_company' => $existing_company ? (bool) 1 : false,
+                    'force' => array_key_exists('force', $company) ? (bool) $company['force'] : false,
+                ];
 
-                $nmo = new NinjaMailerObject;
-                $nmo->mailable = new MaxCompanies($user->account->companies()->first());
-                $nmo->company = $user->account->companies()->first();
-                $nmo->settings = $user->account->companies()->first()->settings;
-                $nmo->to_user = $user;
-                NinjaMailerJob::dispatch($nmo);
-                return;
-            }
+                // If there's existing company and ** no ** force is provided - skip migration.
+                if ($checks['existing_company'] == true && $checks['force'] == false) {
+                    nlog('Migrating: Existing company without force. (CASE_01)');
 
-            $checks = [
-                'existing_company' => $existing_company ? (bool)1 : false,
-                'force' => array_key_exists('force', $company) ? (bool) $company['force'] : false,
-            ];
+                    $nmo = new NinjaMailerObject;
+                    $nmo->mailable = new ExistingMigration($existing_company);
+                    $nmo->company = $user->account->companies()->first();
+                    $nmo->settings = $user->account->companies()->first();
+                    $nmo->to_user = $user;
 
-            // If there's existing company and ** no ** force is provided - skip migration.
-            if ($checks['existing_company'] == true && $checks['force'] == false) {
-                nlog('Migrating: Existing company without force. (CASE_01)');
+                    NinjaMailerJob::dispatch($nmo, true);
 
-                $nmo = new NinjaMailerObject;
-                $nmo->mailable = new ExistingMigration($existing_company);
-                $nmo->company = $user->account->companies()->first();
-                $nmo->settings = $user->account->companies()->first();
-                $nmo->to_user = $user;
-                
-                NinjaMailerJob::dispatch($nmo);
+                    return response()->json([
+                        '_id' => Str::uuid(),
+                        'method' => config('queue.default'),
+                        'started_at' => now(),
+                    ], 200);
+                }
 
-                return response()->json([
-                    '_id' => Str::uuid(),
-                    'method' => config('queue.default'),
-                    'started_at' => now(),
-                ], 200);
-            }
+                // If there's existing company and force ** is provided ** - purge the company and migrate again.
+                if ($checks['existing_company'] == true && $checks['force'] == true) {
+                    nlog('purging the existing company here');
+                    $this->purgeCompanyWithForceFlag($existing_company);
 
-            // If there's existing company and force ** is provided ** - purge the company and migrate again.
-            if ($checks['existing_company'] == true && $checks['force'] == true) {
-                nlog("purging the existing company here");
-                $this->purgeCompanyWithForceFlag($existing_company);
+                    $account = auth()->user()->account;
+                    $fresh_company = (new ImportMigrations())->getCompany($account);
+                    $fresh_company->is_disabled = true;
+                    $fresh_company->save();
 
-                $account = auth()->user()->account;
-                $fresh_company = (new ImportMigrations())->getCompany($account);
-                $fresh_company->is_disabled = true;
-                $fresh_company->save();
+                    $account->default_company_id = $fresh_company->id;
+                    $account->save();
 
-                $account->default_company_id = $fresh_company->id;
-                $account->save();
+                    $fresh_company_token = new CompanyToken();
+                    $fresh_company_token->user_id = $user->id;
+                    $fresh_company_token->company_id = $fresh_company->id;
+                    $fresh_company_token->account_id = $account->id;
+                    $fresh_company_token->name = $request->token_name ?? Str::random(12);
+                    $fresh_company_token->token = $request->token ?? Str::random(64);
+                    $fresh_company_token->is_system = true;
+                    $fresh_company_token->save();
 
-                $fresh_company_token = new CompanyToken();
-                $fresh_company_token->user_id = $user->id;
-                $fresh_company_token->company_id = $fresh_company->id;
-                $fresh_company_token->account_id = $account->id;
-                $fresh_company_token->name = $request->token_name ?? Str::random(12);
-                $fresh_company_token->token = $request->token ?? Str::random(64);
-                $fresh_company_token->is_system = true;
-                $fresh_company_token->save();
+                    $user->companies()->attach($fresh_company->id, [
+                        'account_id' => $account->id,
+                        'is_owner' => 1,
+                        'is_admin' => 1,
+                        'is_locked' => 0,
+                        'notifications' => CompanySettings::notificationDefaults(),
+                        'permissions' => '',
+                        'settings' => null,
+                    ]);
+                }
 
-                $user->companies()->attach($fresh_company->id, [
-                    'account_id' => $account->id,
-                    'is_owner' => 1,
-                    'is_admin' => 1,
-                    'is_locked' => 0,
-                    'notifications' => CompanySettings::notificationDefaults(),
-                    'permissions' => '',
-                    'settings' => null,
-                ]);
-            }
+                // If there's no existing company migrate just normally.
+                if ($checks['existing_company'] == false) {
+                    nlog('creating fresh company');
 
-            // If there's no existing company migrate just normally.
-            if ($checks['existing_company'] == false) {
+                    $account = auth()->user()->account;
+                    $fresh_company = (new ImportMigrations())->getCompany($account);
 
-                nlog("creating fresh company");
-                
-                $account = auth()->user()->account;
-                $fresh_company = (new ImportMigrations())->getCompany($account);
+                    $fresh_company->is_disabled = true;
+                    $fresh_company->save();
 
-                $fresh_company->is_disabled = true;
-                $fresh_company->save();
+                    $fresh_company_token = new CompanyToken();
+                    $fresh_company_token->user_id = $user->id;
+                    $fresh_company_token->company_id = $fresh_company->id;
+                    $fresh_company_token->account_id = $account->id;
+                    $fresh_company_token->name = $request->token_name ?? Str::random(12);
+                    $fresh_company_token->token = $request->token ?? Str::random(64);
+                    $fresh_company_token->is_system = true;
 
-                $fresh_company_token = new CompanyToken();
-                $fresh_company_token->user_id = $user->id;
-                $fresh_company_token->company_id = $fresh_company->id;
-                $fresh_company_token->account_id = $account->id;
-                $fresh_company_token->name = $request->token_name ?? Str::random(12);
-                $fresh_company_token->token = $request->token ?? Str::random(64);
-                $fresh_company_token->is_system = true;
+                    $fresh_company_token->save();
 
-                $fresh_company_token->save();
+                    $user->companies()->attach($fresh_company->id, [
+                        'account_id' => $account->id,
+                        'is_owner' => 1,
+                        'is_admin' => 1,
+                        'is_locked' => 0,
+                        'notifications' => CompanySettings::notificationDefaults(),
+                        'permissions' => '',
+                        'settings' => null,
+                    ]);
+                }
 
-                $user->companies()->attach($fresh_company->id, [
-                    'account_id' => $account->id,
-                    'is_owner' => 1,
-                    'is_admin' => 1,
-                    'is_locked' => 0,
-                    'notifications' => CompanySettings::notificationDefaults(),
-                    'permissions' => '',
-                    'settings' => null,
-                ]);
-            }
-
-            $migration_file = $request->file($company['company_index'])
+                $migration_file = $request->file($company['company_index'])
                 ->storeAs(
                     'migrations',
                     $request->file($company['company_index'])->getClientOriginalName(),
                     'public'
                 );
 
-            if (app()->environment() == 'testing') {
-                nlog("environment is testing = bailing out now");
-                return;
-            }
+                if (app()->environment() == 'testing') {
+                    nlog('environment is testing = bailing out now');
 
-                nlog("starting migration job");
+                    return;
+                }
+
+                nlog('starting migration job');
                 nlog($migration_file);
 
-                if(Ninja::isHosted())
+                if (Ninja::isHosted()) {
                     StartMigration::dispatch($migration_file, $user, $fresh_company)->onQueue('migration');
-                else
+                } else {
                     StartMigration::dispatch($migration_file, $user, $fresh_company);
-
+                }
+            }
         }
-
-    }
-
     }
 }
diff --git a/app/Http/Controllers/OneTimeTokenController.php b/app/Http/Controllers/OneTimeTokenController.php
index 396263329204..c4544d939716 100644
--- a/app/Http/Controllers/OneTimeTokenController.php
+++ b/app/Http/Controllers/OneTimeTokenController.php
@@ -23,7 +23,6 @@ use Illuminate\Support\Str;
 
 class OneTimeTokenController extends BaseController
 {
-
     private $contexts = [
     ];
 
@@ -75,10 +74,9 @@ class OneTimeTokenController extends BaseController
             'context' => $request->input('context'),
         ];
 
-        Cache::put( $hash, $data, 3600);
+        Cache::put($hash, $data, 3600);
 
         return response()->json(['hash' => $hash], 200);
-
     }
 
     public function router(OneTimeRouterRequest $request)
@@ -92,13 +90,11 @@ class OneTimeTokenController extends BaseController
         // Cache::forget($request->input('hash'));
 
         $this->sendTo($data['context']);
-
     }
 
     /* We need to merge all contexts here and redirect to the correct location */
     private function sendTo($context)
     {
-
         return redirect();
     }
 }
diff --git a/app/Http/Controllers/OpenAPI/BillingSubscription.php b/app/Http/Controllers/OpenAPI/BillingSubscription.php
index d8957a2d5026..9e33dd18b2ee 100644
--- a/app/Http/Controllers/OpenAPI/BillingSubscription.php
+++ b/app/Http/Controllers/OpenAPI/BillingSubscription.php
@@ -30,4 +30,3 @@
  *       @OA\Property(property="updated_at", type="number", format="integer", example="134341234234", description="Timestamp"),
  * )
  */
-            
\ No newline at end of file
diff --git a/app/Http/Controllers/OpenAPI/GenericReportSchema.php b/app/Http/Controllers/OpenAPI/GenericReportSchema.php
index dba4b18fab5c..07da7a6d1b44 100644
--- a/app/Http/Controllers/OpenAPI/GenericReportSchema.php
+++ b/app/Http/Controllers/OpenAPI/GenericReportSchema.php
@@ -18,4 +18,4 @@
  *       ),
  *
  * )
- */
\ No newline at end of file
+ */
diff --git a/app/Http/Controllers/OpenAPI/Parameters.php b/app/Http/Controllers/OpenAPI/Parameters.php
index 6cce8170694a..3631cfdbe11e 100644
--- a/app/Http/Controllers/OpenAPI/Parameters.php
+++ b/app/Http/Controllers/OpenAPI/Parameters.php
@@ -93,5 +93,4 @@
  *           example="user"
  *         )
  *     ),
- *
  */
diff --git a/app/Http/Controllers/OpenAPI/RecurringExpense.php b/app/Http/Controllers/OpenAPI/RecurringExpense.php
index 0f2c606b7cc0..f4059674e053 100644
--- a/app/Http/Controllers/OpenAPI/RecurringExpense.php
+++ b/app/Http/Controllers/OpenAPI/RecurringExpense.php
@@ -44,4 +44,4 @@
  *       @OA\Property(property="updated_at", type="number", format="integer", example="1434342123", description="Timestamp"),
  *       @OA\Property(property="archived_at", type="number", format="integer", example="1434342123", description="Timestamp"),
  * )
- */
\ No newline at end of file
+ */
diff --git a/app/Http/Controllers/OpenAPI/TaskSchedulerSchema.php b/app/Http/Controllers/OpenAPI/TaskSchedulerSchema.php
index 98459ba68542..8fa2faa07ac2 100644
--- a/app/Http/Controllers/OpenAPI/TaskSchedulerSchema.php
+++ b/app/Http/Controllers/OpenAPI/TaskSchedulerSchema.php
@@ -1,6 +1,5 @@
 <?php
 
-
 /**
  * @OA\Schema(
  *   schema="TaskSchedulerSchema",
@@ -28,7 +27,6 @@
  * )
  */
 
-
 /**
  * @OA\Schema(
  *   schema="UpdateTaskSchedulerSchema",
@@ -53,4 +51,3 @@
  *
  * )
  */
-
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index e0cf3bedfeaa..01f5354817ab 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -383,6 +383,7 @@ class PaymentController extends BaseController
         $payment = $this->payment_repo->save($request->all(), $payment);
 
         event(new PaymentWasUpdated($payment, $payment->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
+
         return $this->itemResponse($payment);
     }
 
@@ -439,7 +440,6 @@ class PaymentController extends BaseController
      */
     public function destroy(DestroyPaymentRequest $request, Payment $payment)
     {
-
         $this->payment_repo->delete($payment);
 
         return $this->itemResponse($payment);
@@ -590,7 +590,7 @@ class PaymentController extends BaseController
         switch ($action) {
             case 'restore':
              $this->payment_repo->restore($payment);
-                
+
                 if (! $bulk) {
                     return $this->itemResponse($payment);
                 }
@@ -598,7 +598,7 @@ class PaymentController extends BaseController
                 break;
             case 'archive':
              $this->payment_repo->archive($payment);
-                
+
                 if (! $bulk) {
                     return $this->itemResponse($payment);
                 }
@@ -606,14 +606,13 @@ class PaymentController extends BaseController
                 break;
             case 'delete':
              $this->payment_repo->delete($payment);
-                
+
                 if (! $bulk) {
                     return $this->itemResponse($payment);
                 }
                 // code...
                 break;
             case 'email':
-                //dispatch email to queue
                 $payment->service()->sendEmail();
 
                 if (! $bulk) {
@@ -627,7 +626,7 @@ class PaymentController extends BaseController
                     return $this->itemResponse($payment);
                 }
                 break;
-            
+
             default:
                 // code...
                 break;
@@ -688,7 +687,7 @@ class PaymentController extends BaseController
         return $this->itemResponse($payment);
     }
 
-/**
+    /**
      * Update the specified resource in storage.
      *
      * @param UploadPaymentRequest $request
@@ -741,14 +740,14 @@ class PaymentController extends BaseController
      */
     public function upload(UploadPaymentRequest $request, Payment $payment)
     {
-
-        if(!$this->checkFeature(Account::FEATURE_DOCUMENTS))
+        if (! $this->checkFeature(Account::FEATURE_DOCUMENTS)) {
             return $this->featureFailure();
+        }
 
-        if ($request->has('documents')) 
+        if ($request->has('documents')) {
             $this->saveDocuments($request->file('documents'), $payment);
+        }
 
         return $this->itemResponse($payment->fresh());
-
-    }  
+    }
 }
diff --git a/app/Http/Controllers/PaymentNotificationWebhookController.php b/app/Http/Controllers/PaymentNotificationWebhookController.php
index ac38afdafcf9..5d229d2cbe90 100644
--- a/app/Http/Controllers/PaymentNotificationWebhookController.php
+++ b/app/Http/Controllers/PaymentNotificationWebhookController.php
@@ -22,10 +22,9 @@ use Auth;
 class PaymentNotificationWebhookController extends Controller
 {
     use MakesHash;
-    
+
     public function __invoke(PaymentNotificationWebhookRequest $request, string $company_key, string $company_gateway_id, string $client_hash)
     {
-
         $company_gateway = CompanyGateway::find($this->decodePrimaryKey($company_gateway_id));
         $client = Client::find($this->decodePrimaryKey($client_hash));
 
diff --git a/app/Http/Controllers/PaymentTermController.php b/app/Http/Controllers/PaymentTermController.php
index ccc43424c47a..a9d658e66b9b 100644
--- a/app/Http/Controllers/PaymentTermController.php
+++ b/app/Http/Controllers/PaymentTermController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Factory\PaymentTermFactory;
+use App\Filters\PaymentTermFilters;
 use App\Http\Requests\PaymentTerm\CreatePaymentTermRequest;
 use App\Http\Requests\PaymentTerm\DestroyPaymentTermRequest;
 use App\Http\Requests\PaymentTerm\ShowPaymentTermRequest;
@@ -14,7 +15,6 @@ use App\Transformers\PaymentTermTransformer;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use App\Filters\PaymentTermFilters;
 
 class PaymentTermController extends BaseController
 {
diff --git a/app/Http/Controllers/PingController.php b/app/Http/Controllers/PingController.php
index 1ef3bbd7004b..ff325c31ede4 100644
--- a/app/Http/Controllers/PingController.php
+++ b/app/Http/Controllers/PingController.php
@@ -43,7 +43,7 @@ class PingController extends BaseController
     {
         return response()->json(
             ['company_name' => auth()->user()->getCompany()->present()->name(),
-             'user_name' => auth()->user()->present()->name(),
+                'user_name' => auth()->user()->present()->name(),
             ],
             200
         );
diff --git a/app/Http/Controllers/PostMarkController.php b/app/Http/Controllers/PostMarkController.php
index 03c1120f70d4..0a8fcc6e5a8a 100644
--- a/app/Http/Controllers/PostMarkController.php
+++ b/app/Http/Controllers/PostMarkController.php
@@ -74,18 +74,12 @@ class PostMarkController extends BaseController
      */
     public function webhook(Request $request)
     {
-
-        if($request->header('X-API-SECURITY') && $request->header('X-API-SECURITY') == config('postmark.secret'))
-        {
-
+        if ($request->header('X-API-SECURITY') && $request->header('X-API-SECURITY') == config('postmark.secret')) {
             ProcessPostmarkWebhook::dispatch($request->all());
 
             return response()->json(['message' => 'Success'], 200);
-
         }
 
         return response()->json(['message' => 'Unauthorized'], 403);
-
     }
-
 }
diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php
index 1edd5cc6ae76..1722d0409e8f 100644
--- a/app/Http/Controllers/PreviewController.php
+++ b/app/Http/Controllers/PreviewController.php
@@ -31,9 +31,9 @@ use App\Repositories\CreditRepository;
 use App\Repositories\InvoiceRepository;
 use App\Repositories\QuoteRepository;
 use App\Repositories\RecurringInvoiceRepository;
+use App\Services\PdfMaker\Design;
 use App\Services\PdfMaker\Design as PdfDesignModel;
 use App\Services\PdfMaker\Design as PdfMakerDesign;
-use App\Services\PdfMaker\Design;
 use App\Services\PdfMaker\PdfMaker;
 use App\Utils\HostedPDF\NinjaPdf;
 use App\Utils\HtmlEngine;
@@ -54,7 +54,6 @@ class PreviewController extends BaseController
     use MakesInvoiceHtml;
     use PageNumbering;
 
-
     public function __construct()
     {
         parent::__construct();
@@ -100,7 +99,6 @@ 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)) {
@@ -158,22 +156,22 @@ class PreviewController extends BaseController
             if (config('ninja.phantomjs_pdf_generation') || config('ninja.pdf_generator') == 'phantom') {
                 return (new Phantom)->convertHtmlToPdf($maker->getCompiledHTML(true));
             }
-            
-            if(config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja'){
+
+            if (config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja') {
                 $pdf = (new NinjaPdf())->build($maker->getCompiledHTML(true));
 
                 $numbered_pdf = $this->pageNumbering($pdf, auth()->user()->company());
 
-                if($numbered_pdf)
+                if ($numbered_pdf) {
                     $pdf = $numbered_pdf;
+                }
 
                 return $pdf;
-
             }
 
             //else
-            $file_path = PreviewPdf::dispatchNow($maker->getCompiledHTML(true), auth()->user()->company());
 
+            $file_path = (new PreviewPdf($maker->getCompiledHTML(true), auth()->user()->company()))->handle();
             return response()->download($file_path, basename($file_path), ['Cache-Control:' => 'no-cache'])->deleteFileAfterSend(true);
         }
 
@@ -186,48 +184,42 @@ class PreviewController extends BaseController
 
         MultiDB::setDb($company->db);
 
-        if($request->input('entity') == 'quote'){
+        if ($request->input('entity') == 'quote') {
             $repo = new QuoteRepository();
             $entity_obj = QuoteFactory::create($company->id, auth()->user()->id);
             $class = Quote::class;
-
-        }
-        elseif($request->input('entity') == 'credit'){
+        } elseif ($request->input('entity') == 'credit') {
             $repo = new CreditRepository();
             $entity_obj = CreditFactory::create($company->id, auth()->user()->id);
             $class = Credit::class;
-        }
-        elseif($request->input('entity') == 'recurring_invoice'){
+        } elseif ($request->input('entity') == 'recurring_invoice') {
             $repo = new RecurringInvoiceRepository();
             $entity_obj = RecurringInvoiceFactory::create($company->id, auth()->user()->id);
             $class = RecurringInvoice::class;
-        }
-        else { //assume it is either an invoice or a null object
+        } else { //assume it is either an invoice or a null object
             $repo = new InvoiceRepository();
             $entity_obj = InvoiceFactory::create($company->id, auth()->user()->id);
             $class = Invoice::class;
-        }            
+        }
 
         try {
-
             DB::connection(config('database.default'))->beginTransaction();
 
-            if($request->has('entity_id')){
-
+            if ($request->has('entity_id')) {
                 $entity_obj = $class::on(config('database.default'))
                                     ->with('client.company')
                                     ->where('id', $this->decodePrimaryKey($request->input('entity_id')))
                                     ->where('company_id', $company->id)
                                     ->withTrashed()
                                     ->first();
-
             }
 
             $entity_obj = $repo->save($request->all(), $entity_obj);
 
-            if(!$request->has('entity_id'))
+            if (! $request->has('entity_id')) {
                 $entity_obj->service()->fillDefaults()->save();
-                
+            }
+
             App::forgetInstance('translator');
             $t = app('translator');
             App::setLocale($entity_obj->client->locale());
@@ -238,13 +230,14 @@ class PreviewController extends BaseController
             $design = \App\Models\Design::find($entity_obj->design_id);
 
             /* Catch all in case migration doesn't pass back a valid design */
-            if(!$design)
+            if (! $design) {
                 $design = \App\Models\Design::find(2);
+            }
 
             if ($design->is_custom) {
                 $options = [
-                'custom_partials' => json_decode(json_encode($design->design), true)
-              ];
+                    'custom_partials' => json_decode(json_encode($design->design), true),
+                ];
                 $template = new PdfMakerDesign(PdfDesignModel::CUSTOM, $options);
             } else {
                 $template = new PdfMakerDesign(strtolower($design->name));
@@ -268,7 +261,6 @@ class PreviewController extends BaseController
                 'process_markdown' => $entity_obj->client->company->markdown_enabled,
             ];
 
-
             $maker = new PdfMaker($state);
 
             $maker
@@ -281,11 +273,11 @@ class PreviewController extends BaseController
                 return $maker->getCompiledHTML();
             }
 
-
         }
         catch(\Exception $e){
             nlog($e->getMessage());
             DB::connection(config('database.default'))->rollBack();
+
             return;
         }
 
@@ -299,28 +291,28 @@ class PreviewController extends BaseController
 
                 $numbered_pdf = $this->pageNumbering($pdf, auth()->user()->company());
 
-                if($numbered_pdf)
-                    $pdf = $numbered_pdf;
 
-                return $pdf;
+            $numbered_pdf = $this->pageNumbering($pdf, auth()->user()->company());
+
+            if ($numbered_pdf) {
+                $pdf = $numbered_pdf;
             }
 
-            $file_path = PreviewPdf::dispatchNow($maker->getCompiledHTML(true), $company);
+            return $pdf;
+        }
 
+        $file_path = (new PreviewPdf($maker->getCompiledHTML(true), $company))->handle();
 
-            if(Ninja::isHosted())
-            {
-                LightLogs::create(new LivePreview())
+        if (Ninja::isHosted()) {
+            LightLogs::create(new LivePreview())
                          ->increment()
                          ->queue();
-            }
-
+        }
 
         $response = Response::make($file_path, 200);
         $response->header('Content-Type', 'application/pdf');
 
         return $response;
-
     }
 
     private function blankEntity()
@@ -332,8 +324,9 @@ class PreviewController extends BaseController
         $invitation = InvoiceInvitation::where('company_id', auth()->user()->company()->id)->orderBy('id', 'desc')->first();
 
         /* If we don't have a valid invitation in the system - create a mock using transactions */
-        if(!$invitation)
+        if (! $invitation) {
             return $this->mockEntity();
+        }
 
         $design_object = json_decode(json_encode(request()->input('design')));
 
@@ -370,58 +363,57 @@ class PreviewController extends BaseController
             return (new Phantom)->convertHtmlToPdf($maker->getCompiledHTML(true));
         }
 
-        if(config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja'){
-            $pdf =  (new NinjaPdf())->build($maker->getCompiledHTML(true));
+        if (config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja') {
+            $pdf = (new NinjaPdf())->build($maker->getCompiledHTML(true));
 
             $numbered_pdf = $this->pageNumbering($pdf, auth()->user()->company());
 
-                if($numbered_pdf)
-                    $pdf = $numbered_pdf;
+            if ($numbered_pdf) {
+                $pdf = $numbered_pdf;
+            }
 
-                return $pdf;
+            return $pdf;
         }
-            
-        $file_path = PreviewPdf::dispatchNow($maker->getCompiledHTML(true), auth()->user()->company());
+
+        $file_path = (new PreviewPdf($maker->getCompiledHTML(true), auth()->user()->company()))->handle();
 
         $response = Response::make($file_path, 200);
         $response->header('Content-Type', 'application/pdf');
 
         return $response;
-
     }
 
     private function mockEntity()
     {
-
         DB::connection(auth()->user()->company()->db)->beginTransaction();
 
         $client = Client::factory()->create([
-                'user_id' => auth()->user()->id,
-                'company_id' => auth()->user()->company()->id,
-            ]);
+            'user_id' => auth()->user()->id,
+            'company_id' => auth()->user()->company()->id,
+        ]);
 
         $contact = ClientContact::factory()->create([
-                'user_id' => auth()->user()->id,
-                'company_id' => auth()->user()->company()->id,
-                'client_id' => $client->id,
-                'is_primary' => 1,
-                'send_email' => true,
-            ]);
+            'user_id' => auth()->user()->id,
+            'company_id' => auth()->user()->company()->id,
+            'client_id' => $client->id,
+            'is_primary' => 1,
+            'send_email' => true,
+        ]);
 
         $invoice = Invoice::factory()->create([
-                    'user_id' => auth()->user()->id,
-                    'company_id' => auth()->user()->company()->id,
-                    'client_id' => $client->id,
-                    'terms' => 'Sample Terms',
-                    'footer' => 'Sample Footer',
-                    'public_notes' => 'Sample Public Notes',
-                ]);
+            'user_id' => auth()->user()->id,
+            'company_id' => auth()->user()->company()->id,
+            'client_id' => $client->id,
+            'terms' => 'Sample Terms',
+            'footer' => 'Sample Footer',
+            'public_notes' => 'Sample Public Notes',
+        ]);
 
         $invitation = InvoiceInvitation::factory()->create([
-                    'user_id' => auth()->user()->id,
-                    'company_id' => auth()->user()->company()->id,
-                    'invoice_id' => $invoice->id,
-                    'client_contact_id' => $contact->id,
+            'user_id' => auth()->user()->id,
+            'company_id' => auth()->user()->company()->id,
+            'invoice_id' => $invoice->id,
+            'client_contact_id' => $contact->id,
         ]);
 
         $invoice->setRelation('invitations', $invitation);
@@ -466,18 +458,20 @@ class PreviewController extends BaseController
             return (new Phantom)->convertHtmlToPdf($maker->getCompiledHTML(true));
         }
 
-        if(config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja'){
+        if (config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja') {
             $pdf = (new NinjaPdf())->build($maker->getCompiledHTML(true));
 
             $numbered_pdf = $this->pageNumbering($pdf, auth()->user()->company());
 
-                if($numbered_pdf)
-                    $pdf = $numbered_pdf;
+            if ($numbered_pdf) {
+                $pdf = $numbered_pdf;
+            }
 
-                return $pdf;
+            return $pdf;
         }
-            
-        $file_path = PreviewPdf::dispatchNow($maker->getCompiledHTML(true), auth()->user()->company());
+
+
+        $file_path = (new PreviewPdf($maker->getCompiledHTML(true), auth()->user()->company()))->handle();
 
         $response = Response::make($file_path, 200);
         $response->header('Content-Type', 'application/pdf');
diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php
index 6f6b89dd0ad7..4d6fcbe33a5f 100644
--- a/app/Http/Controllers/ProductController.php
+++ b/app/Http/Controllers/ProductController.php
@@ -481,7 +481,7 @@ class ProductController extends BaseController
         return $this->listResponse(Product::withTrashed()->whereIn('id', $this->transformKeys($ids)));
     }
 
-/**
+    /**
      * Update the specified resource in storage.
      *
      * @param UploadProductRequest $request
@@ -534,14 +534,14 @@ class ProductController extends BaseController
      */
     public function upload(UploadProductRequest $request, Product $product)
     {
-
-        if(!$this->checkFeature(Account::FEATURE_DOCUMENTS))
+        if (! $this->checkFeature(Account::FEATURE_DOCUMENTS)) {
             return $this->featureFailure();
-        
-        if ($request->has('documents')) 
+        }
+
+        if ($request->has('documents')) {
             $this->saveDocuments($request->file('documents'), $product);
+        }
 
         return $this->itemResponse($product->fresh());
-
-    }  
+    }
 }
diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index 252545215357..0aaf58673eb0 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -271,7 +271,7 @@ class ProjectController extends BaseController
         if ($request->has('documents')) {
             $this->saveDocuments($request->input('documents'), $project);
         }
-        
+
         return $this->itemResponse($project->fresh());
     }
 
@@ -370,7 +370,7 @@ class ProjectController extends BaseController
             $project->number = $this->getNextProjectNumber($project);
             $project->save();
         }
-        
+
         if ($request->has('documents')) {
             $this->saveDocuments($request->input('documents'), $project);
         }
@@ -559,14 +559,14 @@ class ProjectController extends BaseController
      */
     public function upload(UploadProjectRequest $request, Project $project)
     {
-
-        if(!$this->checkFeature(Account::FEATURE_DOCUMENTS))
+        if (! $this->checkFeature(Account::FEATURE_DOCUMENTS)) {
             return $this->featureFailure();
-        
-        if ($request->has('documents')) 
+        }
+
+        if ($request->has('documents')) {
             $this->saveDocuments($request->file('documents'), $project);
+        }
 
         return $this->itemResponse($project->fresh());
-
-    }  
+    }
 }
diff --git a/app/Http/Controllers/PurchaseOrderController.php b/app/Http/Controllers/PurchaseOrderController.php
index 959ed9f1ce18..8fc56b8fc7cb 100644
--- a/app/Http/Controllers/PurchaseOrderController.php
+++ b/app/Http/Controllers/PurchaseOrderController.php
@@ -489,6 +489,9 @@ class PurchaseOrderController extends BaseController
 
         $ids = request()->input('ids');
 
+        if(Ninja::isHosted() && (stripos($action, 'email') !== false) && !auth()->user()->company()->account->account_sms_verified)
+            return response(['message' => 'Please verify your account to send emails.'], 400);
+
         $purchase_orders = PurchaseOrder::withTrashed()->whereIn('id', $this->transformKeys($ids))->company()->get();
 
         if (! $purchase_orders) {
diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php
index f2afb1dfd11c..b89d9a77ade4 100644
--- a/app/Http/Controllers/QuoteController.php
+++ b/app/Http/Controllers/QuoteController.php
@@ -396,7 +396,7 @@ class QuoteController extends BaseController
         $quote->service()
               ->triggeredActions($request)
               ->deletePdf();
-        
+
         event(new QuoteWasUpdated($quote, $quote->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         return $this->itemResponse($quote);
@@ -518,6 +518,9 @@ class QuoteController extends BaseController
 
         $ids = request()->input('ids');
 
+        if(Ninja::isHosted() && (stripos($action, 'email') !== false) && !auth()->user()->company()->account->account_sms_verified)
+            return response(['message' => 'Please verify your account to send emails.'], 400);
+
         $quotes = Quote::withTrashed()->whereIn('id', $this->transformKeys($ids))->company()->get();
 
         if (! $quotes) {
@@ -654,6 +657,7 @@ class QuoteController extends BaseController
 
                 $this->entity_type = Invoice::class;
                 $this->entity_transformer = InvoiceTransformer::class;
+
                 return $this->itemResponse($quote->service()->convertToInvoice());
 
             break;
@@ -672,7 +676,7 @@ class QuoteController extends BaseController
                 return $this->itemResponse($quote);
                 break;
             case 'approve':
-                if (!in_array($quote->status_id, [Quote::STATUS_SENT, Quote::STATUS_DRAFT]) ) {
+                if (! in_array($quote->status_id, [Quote::STATUS_SENT, Quote::STATUS_DRAFT])) {
                     return response()->json(['message' => ctrans('texts.quote_unapprovable')], 400);
                 }
 
@@ -686,17 +690,16 @@ class QuoteController extends BaseController
                 //$file = $quote->pdf_file_path();
                 $file = $quote->service()->getQuotePdf();
 
-                return response()->streamDownload(function () use($file) {
-                        echo Storage::get($file);
-                },  basename($file), ['Content-Type' => 'application/pdf']);
+                return response()->streamDownload(function () use ($file) {
+                    echo Storage::get($file);
+                }, basename($file), ['Content-Type' => 'application/pdf']);
 
-               //return response()->download($file, basename($file), ['Cache-Control:' => 'no-cache'])->deleteFileAfterSend(true);
 
                 break;
             case 'restore':
                 $this->quote_repo->restore($quote);
 
-                if (!$bulk) {
+                if (! $bulk) {
                     return $this->listResponse($quote);
                 }
 
@@ -704,7 +707,7 @@ class QuoteController extends BaseController
             case 'archive':
                 $this->quote_repo->archive($quote);
 
-                if (!$bulk) {
+                if (! $bulk) {
                     return $this->listResponse($quote);
                 }
 
@@ -712,7 +715,7 @@ class QuoteController extends BaseController
             case 'delete':
                 $this->quote_repo->delete($quote);
 
-                if (!$bulk) {
+                if (! $bulk) {
                     return $this->listResponse($quote);
                 }
 
@@ -737,7 +740,7 @@ class QuoteController extends BaseController
                 }
                 break;
             default:
-                return response()->json(['message' => ctrans('texts.action_unavailable',['action' => $action])], 400);
+                return response()->json(['message' => ctrans('texts.action_unavailable', ['action' => $action])], 400);
                 break;
         }
     }
@@ -752,14 +755,13 @@ class QuoteController extends BaseController
 
         $headers = ['Content-Type' => 'application/pdf'];
 
-        if(request()->input('inline') == 'true')
+        if (request()->input('inline') == 'true') {
             $headers = array_merge($headers, ['Content-Disposition' => 'inline']);
+        }
 
-        return response()->streamDownload(function () use($file) {
-                echo Storage::get($file);
-        },  basename($file), $headers);
-        
-
+        return response()->streamDownload(function () use ($file) {
+            echo Storage::get($file);
+        }, basename($file), $headers);
     }
 
     /**
@@ -815,14 +817,14 @@ class QuoteController extends BaseController
      */
     public function upload(UploadQuoteRequest $request, Quote $quote)
     {
-
-        if(!$this->checkFeature(Account::FEATURE_DOCUMENTS))
+        if (! $this->checkFeature(Account::FEATURE_DOCUMENTS)) {
             return $this->featureFailure();
+        }
 
-        if ($request->has('documents')) 
+        if ($request->has('documents')) {
             $this->saveDocuments($request->file('documents'), $quote);
+        }
 
         return $this->itemResponse($quote->fresh());
-
-    }  
+    }
 }
diff --git a/app/Http/Controllers/RecurringExpenseController.php b/app/Http/Controllers/RecurringExpenseController.php
index 0fea7b918aea..46d3ba315b62 100644
--- a/app/Http/Controllers/RecurringExpenseController.php
+++ b/app/Http/Controllers/RecurringExpenseController.php
@@ -44,7 +44,7 @@ class RecurringExpenseController extends BaseController
     use Uploadable;
     use BulkOptions;
     use SavesDocuments;
-    
+
     protected $entity_type = RecurringExpense::class;
 
     protected $entity_transformer = RecurringExpenseTransformer::class;
@@ -277,7 +277,7 @@ class RecurringExpenseController extends BaseController
 
         $recurring_expense = $this->recurring_expense_repo->save($request->all(), $recurring_expense);
         $recurring_expense->service()->triggeredActions($request)->save();
-        
+
         $this->uploadLogo($request->file('company_logo'), $recurring_expense->company, $recurring_expense);
 
         event(new RecurringExpenseWasUpdated($recurring_expense, $recurring_expense->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
@@ -605,14 +605,14 @@ class RecurringExpenseController extends BaseController
      */
     public function upload(UploadRecurringExpenseRequest $request, RecurringExpense $recurring_expense)
     {
-
-        if(!$this->checkFeature(Account::FEATURE_DOCUMENTS))
+        if (! $this->checkFeature(Account::FEATURE_DOCUMENTS)) {
             return $this->featureFailure();
-        
-        if ($request->has('documents')) 
+        }
+
+        if ($request->has('documents')) {
             $this->saveDocuments($request->file('documents'), $recurring_expense);
+        }
 
         return $this->itemResponse($recurring_expense->fresh());
-
-    }    
+    }
 }
diff --git a/app/Http/Controllers/RecurringInvoiceController.php b/app/Http/Controllers/RecurringInvoiceController.php
index 44b1ec4333b1..ec3ebe1c6556 100644
--- a/app/Http/Controllers/RecurringInvoiceController.php
+++ b/app/Http/Controllers/RecurringInvoiceController.php
@@ -452,7 +452,6 @@ class RecurringInvoiceController extends BaseController
         return $this->itemResponse($recurring_invoice->fresh());
     }
 
-
     /**
      * @OA\Get(
      *      path="/api/v1/recurring_invoice/{invitation_key}/download",
@@ -505,10 +504,9 @@ class RecurringInvoiceController extends BaseController
 
         $file = $recurring_invoice->service()->getInvoicePdf($contact);
 
-        return response()->streamDownload(function () use($file) {
-                echo Storage::get($file);
-        },  basename($file), ['Content-Type' => 'application/pdf']);
-
+        return response()->streamDownload(function () use ($file) {
+            echo Storage::get($file);
+        }, basename($file), ['Content-Type' => 'application/pdf']);
     }
 
     /**
@@ -714,7 +712,7 @@ class RecurringInvoiceController extends BaseController
         }
     }
 
-/**
+    /**
      * Update the specified resource in storage.
      *
      * @param UploadRecurringInvoiceRequest $request
@@ -767,14 +765,14 @@ class RecurringInvoiceController extends BaseController
      */
     public function upload(UploadRecurringInvoiceRequest $request, RecurringInvoice $recurring_invoice)
     {
-
-        if(!$this->checkFeature(Account::FEATURE_DOCUMENTS))
+        if (! $this->checkFeature(Account::FEATURE_DOCUMENTS)) {
             return $this->featureFailure();
-        
-        if ($request->has('documents')) 
+        }
+
+        if ($request->has('documents')) {
             $this->saveDocuments($request->file('documents'), $recurring_invoice);
+        }
 
         return $this->itemResponse($recurring_invoice->fresh());
-
-    }  
+    }
 }
diff --git a/app/Http/Controllers/Reports/ClientContactReportController.php b/app/Http/Controllers/Reports/ClientContactReportController.php
index acabe86ff8f3..c86a657f491b 100644
--- a/app/Http/Controllers/Reports/ClientContactReportController.php
+++ b/app/Http/Controllers/Reports/ClientContactReportController.php
@@ -65,6 +65,7 @@ class ClientContactReportController extends BaseController
     {
         if ($request->has('send_email') && $request->get('send_email')) {
             SendToAdmin::dispatch(auth()->user()->company(), $request->all(), ContactExport::class, $this->filename);
+
             return response()->json(['message' => 'working...'], 200);
         }
         // expect a list of visible fields, or use the default
@@ -72,16 +73,13 @@ class ClientContactReportController extends BaseController
 
         $csv = $export->run();
 
-        $headers = array(
+        $headers = [
             'Content-Disposition' => 'attachment',
             'Content-Type' => 'text/csv',
-        );
+        ];
 
         return response()->streamDownload(function () use ($csv) {
             echo $csv;
         }, $this->filename, $headers);
-
     }
-
-
 }
diff --git a/app/Http/Controllers/Reports/ClientReportController.php b/app/Http/Controllers/Reports/ClientReportController.php
index e2b780477264..6ecfcb05065e 100644
--- a/app/Http/Controllers/Reports/ClientReportController.php
+++ b/app/Http/Controllers/Reports/ClientReportController.php
@@ -65,7 +65,8 @@ class ClientReportController extends BaseController
     public function __invoke(GenericReportRequest $request)
     {
         if ($request->has('send_email') && $request->get('send_email')) {
-            SendToAdmin::dispatch(auth()->user()->company(),$request->all(),ClientExport::class,$this->filename);
+            SendToAdmin::dispatch(auth()->user()->company(), $request->all(), ClientExport::class, $this->filename);
+
             return response()->json(['message' => 'working...'], 200);
         }
         // expect a list of visible fields, or use the default
@@ -74,17 +75,13 @@ class ClientReportController extends BaseController
 
         $csv = $export->run();
 
-        $headers = array(
+        $headers = [
             'Content-Disposition' => 'attachment',
             'Content-Type' => 'text/csv',
-        );
+        ];
 
         return response()->streamDownload(function () use ($csv) {
             echo $csv;
         }, $this->filename, $headers);
-
     }
-
-
-
 }
diff --git a/app/Http/Controllers/Reports/CreditReportController.php b/app/Http/Controllers/Reports/CreditReportController.php
index 150a3c1313b4..85407b7eef6f 100644
--- a/app/Http/Controllers/Reports/CreditReportController.php
+++ b/app/Http/Controllers/Reports/CreditReportController.php
@@ -64,7 +64,8 @@ class CreditReportController extends BaseController
     public function __invoke(GenericReportRequest $request)
     {
         if ($request->has('send_email') && $request->get('send_email')) {
-            SendToAdmin::dispatch(auth()->user()->company(),$request->all(),CreditExport::class,$this->filename);
+            SendToAdmin::dispatch(auth()->user()->company(), $request->all(), CreditExport::class, $this->filename);
+
             return response()->json(['message' => 'working...'], 200);
         }
         // expect a list of visible fields, or use the default
@@ -73,17 +74,13 @@ class CreditReportController extends BaseController
 
         $csv = $export->run();
 
-        $headers = array(
+        $headers = [
             'Content-Disposition' => 'attachment',
             'Content-Type' => 'text/csv',
-        );
+        ];
 
         return response()->streamDownload(function () use ($csv) {
             echo $csv;
         }, $this->filename, $headers);
-
     }
-
-
-
 }
diff --git a/app/Http/Controllers/Reports/DocumentReportController.php b/app/Http/Controllers/Reports/DocumentReportController.php
index 4bbe243277a5..18ea598e4b2e 100644
--- a/app/Http/Controllers/Reports/DocumentReportController.php
+++ b/app/Http/Controllers/Reports/DocumentReportController.php
@@ -64,7 +64,8 @@ class DocumentReportController extends BaseController
     public function __invoke(GenericReportRequest $request)
     {
         if ($request->has('send_email') && $request->get('send_email')) {
-            SendToAdmin::dispatch(auth()->user()->company(),$request->all(),DocumentExport::class,$this->filename);
+            SendToAdmin::dispatch(auth()->user()->company(), $request->all(), DocumentExport::class, $this->filename);
+
             return response()->json(['message' => 'working...'], 200);
         }
         // expect a list of visible fields, or use the default
@@ -73,17 +74,13 @@ class DocumentReportController extends BaseController
 
         $csv = $export->run();
 
-        $headers = array(
+        $headers = [
             'Content-Disposition' => 'attachment',
             'Content-Type' => 'text/csv',
-        );
+        ];
 
         return response()->streamDownload(function () use ($csv) {
             echo $csv;
         }, $this->filename, $headers);
-
     }
-
-
-
 }
diff --git a/app/Http/Controllers/Reports/ExpenseReportController.php b/app/Http/Controllers/Reports/ExpenseReportController.php
index 7617c9cee85f..92ebb7c5ed42 100644
--- a/app/Http/Controllers/Reports/ExpenseReportController.php
+++ b/app/Http/Controllers/Reports/ExpenseReportController.php
@@ -65,7 +65,8 @@ class ExpenseReportController extends BaseController
     public function __invoke(GenericReportRequest $request)
     {
         if ($request->has('send_email') && $request->get('send_email')) {
-            SendToAdmin::dispatch(auth()->user()->company(),$request->all(),ExpenseExport::class,$this->filename);
+            SendToAdmin::dispatch(auth()->user()->company(), $request->all(), ExpenseExport::class, $this->filename);
+
             return response()->json(['message' => 'working...'], 200);
         }
         // expect a list of visible fields, or use the default
@@ -74,17 +75,13 @@ class ExpenseReportController extends BaseController
 
         $csv = $export->run();
 
-        $headers = array(
+        $headers = [
             'Content-Disposition' => 'attachment',
             'Content-Type' => 'text/csv',
-        );
+        ];
 
         return response()->streamDownload(function () use ($csv) {
             echo $csv;
         }, $this->filename, $headers);
-
     }
-
-
-
 }
diff --git a/app/Http/Controllers/Reports/InvoiceItemReportController.php b/app/Http/Controllers/Reports/InvoiceItemReportController.php
index 727077ccace1..23117545ad21 100644
--- a/app/Http/Controllers/Reports/InvoiceItemReportController.php
+++ b/app/Http/Controllers/Reports/InvoiceItemReportController.php
@@ -64,7 +64,8 @@ class InvoiceItemReportController extends BaseController
     public function __invoke(GenericReportRequest $request)
     {
         if ($request->has('send_email') && $request->get('send_email')) {
-            SendToAdmin::dispatch(auth()->user()->company(),$request->all(),InvoiceItemExport::class,$this->filename);
+            SendToAdmin::dispatch(auth()->user()->company(), $request->all(), InvoiceItemExport::class, $this->filename);
+
             return response()->json(['message' => 'working...'], 200);
         }
         // expect a list of visible fields, or use the default
@@ -73,17 +74,13 @@ class InvoiceItemReportController extends BaseController
 
         $csv = $export->run();
 
-        $headers = array(
+        $headers = [
             'Content-Disposition' => 'attachment',
             'Content-Type' => 'text/csv',
-        );
+        ];
 
         return response()->streamDownload(function () use ($csv) {
             echo $csv;
         }, $this->filename, $headers);
-
     }
-
-
-
 }
diff --git a/app/Http/Controllers/Reports/InvoiceReportController.php b/app/Http/Controllers/Reports/InvoiceReportController.php
index 499c7ee85226..91871c37b03e 100644
--- a/app/Http/Controllers/Reports/InvoiceReportController.php
+++ b/app/Http/Controllers/Reports/InvoiceReportController.php
@@ -64,7 +64,8 @@ class InvoiceReportController extends BaseController
     public function __invoke(GenericReportRequest $request)
     {
         if ($request->has('send_email') && $request->get('send_email')) {
-            SendToAdmin::dispatch(auth()->user()->company(),$request->all(),InvoiceExport::class,$this->filename);
+            SendToAdmin::dispatch(auth()->user()->company(), $request->all(), InvoiceExport::class, $this->filename);
+
             return response()->json(['message' => 'working...'], 200);
         }
         // expect a list of visible fields, or use the default
@@ -73,16 +74,13 @@ class InvoiceReportController extends BaseController
 
         $csv = $export->run();
 
-        $headers = array(
+        $headers = [
             'Content-Disposition' => 'attachment',
             'Content-Type' => 'text/csv',
-        );
+        ];
 
         return response()->streamDownload(function () use ($csv) {
             echo $csv;
         }, $this->filename, $headers);
-
     }
-
-
 }
diff --git a/app/Http/Controllers/Reports/PaymentReportController.php b/app/Http/Controllers/Reports/PaymentReportController.php
index ec7dac8a4b73..7891fea1046e 100644
--- a/app/Http/Controllers/Reports/PaymentReportController.php
+++ b/app/Http/Controllers/Reports/PaymentReportController.php
@@ -66,6 +66,7 @@ class PaymentReportController extends BaseController
     {
         if ($request->has('send_email') && $request->get('send_email')) {
             SendToAdmin::dispatch(auth()->user()->company(), $request->all(), PaymentExport::class, $this->filename);
+
             return response()->json(['message' => 'working...'], 200);
         }
         // expect a list of visible fields, or use the default
@@ -74,16 +75,13 @@ class PaymentReportController extends BaseController
 
         $csv = $export->run();
 
-        $headers = array(
+        $headers = [
             'Content-Disposition' => 'attachment',
             'Content-Type' => 'text/csv',
-        );
+        ];
 
         return response()->streamDownload(function () use ($csv) {
             echo $csv;
         }, $this->filename, $headers);
-
     }
-
-
 }
diff --git a/app/Http/Controllers/Reports/ProductReportController.php b/app/Http/Controllers/Reports/ProductReportController.php
index c9fa7c9f2b27..e9d35a0ec25d 100644
--- a/app/Http/Controllers/Reports/ProductReportController.php
+++ b/app/Http/Controllers/Reports/ProductReportController.php
@@ -65,7 +65,8 @@ class ProductReportController extends BaseController
     public function __invoke(GenericReportRequest $request)
     {
         if ($request->has('send_email') && $request->get('send_email')) {
-            SendToAdmin::dispatch(auth()->user()->company(),$request->all(),ProductExport::class,$this->filename);
+            SendToAdmin::dispatch(auth()->user()->company(), $request->all(), ProductExport::class, $this->filename);
+
             return response()->json(['message' => 'working...'], 200);
         }
         // expect a list of visible fields, or use the default
@@ -74,17 +75,13 @@ class ProductReportController extends BaseController
 
         $csv = $export->run();
 
-        $headers = array(
+        $headers = [
             'Content-Disposition' => 'attachment',
             'Content-Type' => 'text/csv',
-        );
+        ];
 
         return response()->streamDownload(function () use ($csv) {
             echo $csv;
         }, $this->filename, $headers);
-
     }
-
-
-
 }
diff --git a/app/Http/Controllers/Reports/ProfitAndLossController.php b/app/Http/Controllers/Reports/ProfitAndLossController.php
index 6aa31c72f2d1..df8e3359e929 100644
--- a/app/Http/Controllers/Reports/ProfitAndLossController.php
+++ b/app/Http/Controllers/Reports/ProfitAndLossController.php
@@ -66,7 +66,8 @@ class ProfitAndLossController extends BaseController
     public function __invoke(ProfitLossRequest $request)
     {
         if ($request->has('send_email') && $request->get('send_email')) {
-            SendToAdmin::dispatch(auth()->user()->company(),$request->all(),ProfitLoss::class,$this->filename);
+            SendToAdmin::dispatch(auth()->user()->company(), $request->all(), ProfitLoss::class, $this->filename);
+
             return response()->json(['message' => 'working...'], 200);
         }
         // expect a list of visible fields, or use the default
@@ -76,17 +77,13 @@ class ProfitAndLossController extends BaseController
 
         $csv = $pnl->getCsv();
 
-        $headers = array(
+        $headers = [
             'Content-Disposition' => 'attachment',
             'Content-Type' => 'text/csv',
-        );
+        ];
 
         return response()->streamDownload(function () use ($csv) {
             echo $csv;
         }, $this->filename, $headers);
-
     }
-
-
-
 }
diff --git a/app/Http/Controllers/Reports/QuoteItemReportController.php b/app/Http/Controllers/Reports/QuoteItemReportController.php
index 9368e3d2c243..ba1107355932 100644
--- a/app/Http/Controllers/Reports/QuoteItemReportController.php
+++ b/app/Http/Controllers/Reports/QuoteItemReportController.php
@@ -64,7 +64,8 @@ class QuoteItemReportController extends BaseController
     public function __invoke(GenericReportRequest $request)
     {
         if ($request->has('send_email') && $request->get('send_email')) {
-            SendToAdmin::dispatch(auth()->user()->company(),$request->all(),QuoteItemExport::class,$this->filename);
+            SendToAdmin::dispatch(auth()->user()->company(), $request->all(), QuoteItemExport::class, $this->filename);
+
             return response()->json(['message' => 'working...'], 200);
         }
         // expect a list of visible fields, or use the default
@@ -73,17 +74,13 @@ class QuoteItemReportController extends BaseController
 
         $csv = $export->run();
 
-        $headers = array(
+        $headers = [
             'Content-Disposition' => 'attachment',
             'Content-Type' => 'text/csv',
-        );
+        ];
 
         return response()->streamDownload(function () use ($csv) {
             echo $csv;
         }, $this->filename, $headers);
-
     }
-
-
-
 }
diff --git a/app/Http/Controllers/Reports/QuoteReportController.php b/app/Http/Controllers/Reports/QuoteReportController.php
index 49d36cf90410..af0c83e1c604 100644
--- a/app/Http/Controllers/Reports/QuoteReportController.php
+++ b/app/Http/Controllers/Reports/QuoteReportController.php
@@ -64,7 +64,8 @@ class QuoteReportController extends BaseController
     public function __invoke(GenericReportRequest $request)
     {
         if ($request->has('send_email') && $request->get('send_email')) {
-            SendToAdmin::dispatch(auth()->user()->company(),$request->all(),QuoteExport::class,$this->filename);
+            SendToAdmin::dispatch(auth()->user()->company(), $request->all(), QuoteExport::class, $this->filename);
+
             return response()->json(['message' => 'working...'], 200);
         }
         // expect a list of visible fields, or use the default
@@ -73,17 +74,13 @@ class QuoteReportController extends BaseController
 
         $csv = $export->run();
 
-        $headers = array(
+        $headers = [
             'Content-Disposition' => 'attachment',
             'Content-Type' => 'text/csv',
-        );
+        ];
 
         return response()->streamDownload(function () use ($csv) {
             echo $csv;
         }, $this->filename, $headers);
-
     }
-
-
-
 }
diff --git a/app/Http/Controllers/Reports/RecurringInvoiceReportController.php b/app/Http/Controllers/Reports/RecurringInvoiceReportController.php
index aa170d73c2ad..cfc1b976e543 100644
--- a/app/Http/Controllers/Reports/RecurringInvoiceReportController.php
+++ b/app/Http/Controllers/Reports/RecurringInvoiceReportController.php
@@ -64,7 +64,8 @@ class RecurringInvoiceReportController extends BaseController
     public function __invoke(GenericReportRequest $request)
     {
         if ($request->has('send_email') && $request->get('send_email')) {
-            SendToAdmin::dispatch(auth()->user()->company(),$request->all(),RecurringInvoiceExport::class,$this->filename);
+            SendToAdmin::dispatch(auth()->user()->company(), $request->all(), RecurringInvoiceExport::class, $this->filename);
+
             return response()->json(['message' => 'working...'], 200);
         }
         // expect a list of visible fields, or use the default
@@ -73,17 +74,13 @@ class RecurringInvoiceReportController extends BaseController
 
         $csv = $export->run();
 
-        $headers = array(
+        $headers = [
             'Content-Disposition' => 'attachment',
             'Content-Type' => 'text/csv',
-        );
+        ];
 
         return response()->streamDownload(function () use ($csv) {
             echo $csv;
         }, $this->filename, $headers);
-
     }
-
-
-
 }
diff --git a/app/Http/Controllers/Reports/TaskReportController.php b/app/Http/Controllers/Reports/TaskReportController.php
index b15a87610739..ab8944f3b3dc 100644
--- a/app/Http/Controllers/Reports/TaskReportController.php
+++ b/app/Http/Controllers/Reports/TaskReportController.php
@@ -64,7 +64,8 @@ class TaskReportController extends BaseController
     public function __invoke(GenericReportRequest $request)
     {
         if ($request->has('send_email') && $request->get('send_email')) {
-            SendToAdmin::dispatch(auth()->user()->company(),$request->all(),TaskExport::class,$this->filename);
+            SendToAdmin::dispatch(auth()->user()->company(), $request->all(), TaskExport::class, $this->filename);
+
             return response()->json(['message' => 'working...'], 200);
         }
         // expect a list of visible fields, or use the default
@@ -73,17 +74,13 @@ class TaskReportController extends BaseController
 
         $csv = $export->run();
 
-        $headers = array(
+        $headers = [
             'Content-Disposition' => 'attachment',
             'Content-Type' => 'text/csv',
-        );
+        ];
 
         return response()->streamDownload(function () use ($csv) {
             echo $csv;
         }, $this->filename, $headers);
-
     }
-
-
-
 }
diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php
index 98c6ec0d8ece..32324873a9f6 100644
--- a/app/Http/Controllers/SelfUpdateController.php
+++ b/app/Http/Controllers/SelfUpdateController.php
@@ -88,7 +88,6 @@ class SelfUpdateController extends BaseController
 
     //     $updater->source()->update($release);
 
-            
     //     $cacheCompiled = base_path('bootstrap/cache/compiled.php');
     //     if (file_exists($cacheCompiled)) { unlink ($cacheCompiled); }
     //     $cacheServices = base_path('bootstrap/cache/services.php');
@@ -105,7 +104,6 @@ class SelfUpdateController extends BaseController
 
     public function update()
     {
-
         set_time_limit(0);
         define('STDIN', fopen('php://stdin', 'r'));
 
@@ -113,39 +111,30 @@ class SelfUpdateController extends BaseController
             return response()->json(['message' => ctrans('texts.self_update_not_available')], 403);
         }
 
-        nlog("Test filesystem is writable");
+        nlog('Test filesystem is writable');
 
         $this->testWritable();
-        
-        nlog("Clear cache directory");
+
+        nlog('Clear cache directory');
 
         $this->clearCacheDir();
 
-        nlog("copying release file");
+        nlog('copying release file');
 
-        if(copy($this->getDownloadUrl(), storage_path('app/invoiceninja.zip'))){
-            nlog("Copied file from URL");
-        }
-        else
+        if (copy($this->getDownloadUrl(), storage_path('app/invoiceninja.zip'))) {
+            nlog('Copied file from URL');
+        } else {
             return response()->json(['message' => 'Download not yet available. Please try again shortly.'], 410);
+        }
 
-        nlog("Finished copying");
+        nlog('Finished copying');
 
         $file = Storage::disk('local')->path('invoiceninja.zip');
 
-        nlog("Extracting zip");
+        nlog('Extracting zip');
 
         //clean up old snappdf installations
         $this->cleanOldSnapChromeBinaries();
-        
-        // try{
-        //     $s = new Snappdf;
-        //     $s->getChromiumPath();
-        //     chmod($this->generatePlatformExecutable($s->getChromiumPath()), 0755);
-        // }
-        // catch(\Exception $e){
-        //     nlog("I could not set the file permissions for chrome");
-        // }
 
         $zipFile = new \PhpZip\ZipFile();
 
@@ -155,28 +144,20 @@ class SelfUpdateController extends BaseController
 
         $zipFile->close();
 
-        // $zip = new \ZipArchive;
-        
-        // $res = $zip->open($file);
-        // if ($res === TRUE) {
-        //     $zip->extractTo(base_path());
-        //     $zip->close();
-        // } 
-
-        nlog("Finished extracting files");
+        nlog('Finished extracting files');
 
         unlink($file);
 
-        nlog("Deleted release zip file");
+        nlog('Deleted release zip file');
 
-        foreach($this->purge_file_list as $purge_file_path)
-        {
+        foreach ($this->purge_file_list as $purge_file_path) {
             $purge_file = base_path($purge_file_path);
-            if (file_exists($purge_file)) { unlink ($purge_file); }
-
+            if (file_exists($purge_file)) {
+                unlink($purge_file);
+            }
         }
 
-        nlog("Removing cache files");
+        nlog('Removing cache files');
 
         Artisan::call('clear-compiled');
         Artisan::call('route:clear');
@@ -185,79 +166,74 @@ class SelfUpdateController extends BaseController
         Artisan::call('optimize');
 
         $this->buildCache(true);
-        
-        nlog("Called Artisan commands");
+
+        nlog('Called Artisan commands');
 
         return response()->json(['message' => 'Update completed'], 200);
-
-
     }
 
     private function cleanOldSnapChromeBinaries()
     {
-        $current_revision =  base_path('vendor/beganovich/snappdf/versions/revision.txt');
+        $current_revision = base_path('vendor/beganovich/snappdf/versions/revision.txt');
         $current_revision_text = file_get_contents($current_revision);
 
         $iterator = new \DirectoryIterator(base_path('vendor/beganovich/snappdf/versions'));
 
-        foreach ($iterator as $file) 
-        {
-
-            if($file->isDir() && !$file->isDot() && ($current_revision_text != $file->getFileName()))
-            {
-
+        foreach ($iterator as $file) {
+            if ($file->isDir() && ! $file->isDot() && ($current_revision_text != $file->getFileName())) {
                 $directoryIterator = new \RecursiveDirectoryIterator(base_path('vendor/beganovich/snappdf/versions/'.$file->getFileName()), \RecursiveDirectoryIterator::SKIP_DOTS);
 
-                foreach (new \RecursiveIteratorIterator($directoryIterator) as $filex) 
-                {
-                  unlink($filex->getPathName());
+                foreach (new \RecursiveIteratorIterator($directoryIterator) as $filex) {
+                    unlink($filex->getPathName());
                 }
 
                 $this->deleteDirectory(base_path('vendor/beganovich/snappdf/versions/'.$file->getFileName()));
             }
-
         }
-
     }
 
-    private function deleteDirectory($dir) {
-        if (!file_exists($dir)) return true;
-    
-        if (!is_dir($dir) || is_link($dir)) return unlink($dir);
-            foreach (scandir($dir) as $item) {
-                if ($item == '.' || $item == '..') continue;
-                if (!$this->deleteDirectory($dir . "/" . $item)) {
-                    if (!$this->deleteDirectory($dir . "/" . $item)) return false;
-                };
+    private function deleteDirectory($dir)
+    {
+        if (! file_exists($dir)) {
+            return true;
+        }
+
+        if (! is_dir($dir) || is_link($dir)) {
+            return unlink($dir);
+        }
+        foreach (scandir($dir) as $item) {
+            if ($item == '.' || $item == '..') {
+                continue;
             }
-            return rmdir($dir);
+            if (! $this->deleteDirectory($dir.'/'.$item)) {
+                if (! $this->deleteDirectory($dir.'/'.$item)) {
+                    return false;
+                }
+            }
+        }
+
+        return rmdir($dir);
     }
 
     private function postHookUpdate()
     {
-        if(config('ninja.app_version') == '5.3.82')
-        {
-            Client::withTrashed()->cursor()->each( function ($client) {
+        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 clearCacheDir()
     {
-        
         $directoryIterator = new \RecursiveDirectoryIterator(base_path('bootstrap/cache'), \RecursiveDirectoryIterator::SKIP_DOTS);
 
         foreach (new \RecursiveIteratorIterator($directoryIterator) as $file) {
-
             unlink(base_path('bootstrap/cache/').$file->getFileName());
-
         }
-
     }
 
     private function testWritable()
@@ -265,13 +241,14 @@ class SelfUpdateController extends BaseController
         $directoryIterator = new \RecursiveDirectoryIterator(base_path(), \RecursiveDirectoryIterator::SKIP_DOTS);
 
         foreach (new \RecursiveIteratorIterator($directoryIterator) as $file) {
-
-            if(strpos($file->getPathname(), '.git') !== false)
+            if (strpos($file->getPathname(), '.git') !== false) {
                 continue;
+            }
 
             if ($file->isFile() && ! $file->isWritable()) {
                 nlog("Cannot update system because {$file->getFileName()} is not writable");
                 throw new FilePermissionsFailure("Cannot update system because {$file->getFileName()} is not writable");
+
                 return false;
             }
         }
diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 2093ea55af7e..c9ef036af7b7 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -32,11 +32,11 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\Storage;
-use \Illuminate\Support\Facades\DB;
 
 /**
  * Class SetupController.
@@ -48,14 +48,15 @@ class SetupController extends Controller
     public function index()
     {
         $check = SystemHealth::check(false);
-        
+
         if ($check['system_health'] == true && $check['simple_db_check'] && Schema::hasTable('accounts') && $account = Account::first()) {
             return redirect('/');
         }
 
-        if(Ninja::isHosted())
+        if (Ninja::isHosted()) {
             return redirect('/');
-      
+        }
+
         return view('setup.index', ['check' => $check]);
     }
 
@@ -139,15 +140,15 @@ class SetupController extends Controller
             Artisan::call('optimize');
             Artisan::call('migrate', ['--force' => true]);
             Artisan::call('db:seed', ['--force' => true]);
-            
+
             Storage::disk('local')->delete('test.pdf');
 
             /* Create the first account. */
             if (Account::count() == 0) {
-                CreateAccount::dispatchNow($request->all(), $request->getClientIp());
+                (new CreateAccount($request->all(), $request->getClientIp()))->handle();
             }
 
-            VersionCheck::dispatchNow();
+            (new VersionCheck())->handle();
 
             $this->buildCache(true);
 
@@ -263,47 +264,46 @@ class SetupController extends Controller
 
     public function clearCompiledCache()
     {
- 
-       $cacheCompiled = base_path('bootstrap/cache/compiled.php');
+        $cacheCompiled = base_path('bootstrap/cache/compiled.php');
         if (file_exists($cacheCompiled)) {
-            unlink ($cacheCompiled);
+            unlink($cacheCompiled);
         }
 
         $cacheServices = base_path('bootstrap/cache/packages.php');
         if (file_exists($cacheServices)) {
-            unlink ($cacheServices);
+            unlink($cacheServices);
         }
 
         $cacheServices = base_path('bootstrap/cache/services.php');
         if (file_exists($cacheServices)) {
-            unlink ($cacheServices);
+            unlink($cacheServices);
         }
 
         $cacheRoute = base_path('bootstrap/cache/routes-v7.php');
         if (file_exists($cacheRoute)) {
-            unlink ($cacheRoute);
-        }  
+            unlink($cacheRoute);
+        }
     }
 
     public function update()
     {
-
-        if(!request()->has('secret') || (request()->input('secret') != config('ninja.update_secret')) )
+        if (! request()->has('secret') || (request()->input('secret') != config('ninja.update_secret'))) {
             return redirect('/');
+        }
 
         $cacheCompiled = base_path('bootstrap/cache/compiled.php');
         if (file_exists($cacheCompiled)) {
-            unlink ($cacheCompiled);
+            unlink($cacheCompiled);
         }
 
         $cacheServices = base_path('bootstrap/cache/services.php');
         if (file_exists($cacheServices)) {
-            unlink ($cacheServices);
+            unlink($cacheServices);
         }
 
         $cacheRoute = base_path('bootstrap/cache/routes-v7.php');
         if (file_exists($cacheRoute)) {
-            unlink ($cacheRoute);
+            unlink($cacheRoute);
         }
 
         Artisan::call('clear-compiled');
@@ -316,9 +316,8 @@ class SetupController extends Controller
 
         $this->buildCache(true);
 
-        SchedulerCheck::dispatchNow();
-        
-        return redirect('/');
+        (new SchedulerCheck())->handle();
 
+        return redirect('/');
     }
 }
diff --git a/app/Http/Controllers/StaticController.php b/app/Http/Controllers/StaticController.php
index 4b0394d6d3f8..d78d7bf80ca9 100644
--- a/app/Http/Controllers/StaticController.php
+++ b/app/Http/Controllers/StaticController.php
@@ -22,7 +22,6 @@ use Illuminate\Http\Response;
 
 class StaticController extends BaseController
 {
-
     /**
      * Show the list of Invoices.
      *
@@ -36,7 +35,7 @@ class StaticController extends BaseController
      *      tags={"statics"},
      *      summary="Gets a list of statics",
      *      description="Lists all statics",
-     * 
+     *
      *      @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
      *      @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
      *      @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
@@ -62,12 +61,8 @@ class StaticController extends BaseController
      */
     public function __invoke()
     {
-    
         $response = Statics::company(auth()->user()->getCompany()->getLocale());
-        
+
         return response()->json($response, 200, ['Content-type'=> 'application/json; charset=utf-8'], JSON_PRETTY_PRINT);
-
     }
-
 }
-
diff --git a/app/Http/Controllers/StripeConnectController.php b/app/Http/Controllers/StripeConnectController.php
index e9547414404c..b0d0d1e04a3a 100644
--- a/app/Http/Controllers/StripeConnectController.php
+++ b/app/Http/Controllers/StripeConnectController.php
@@ -38,8 +38,9 @@ class StripeConnectController extends BaseController
     {
         // Should we check if company has set country in the ap? Otherwise this will fail.
 
-        if(!is_array($request->getTokenContent()))
+        if (! is_array($request->getTokenContent())) {
             abort(400, 'Invalid token');
+        }
 
         MultiDB::findAndSetDbByCompanyKey($request->getTokenContent()['company_key']);
 
@@ -51,12 +52,11 @@ class StripeConnectController extends BaseController
             ->first();
 
         if ($company_gateway) {
-
             $config = $company_gateway->getConfig();
 
-            if(property_exists($config, 'account_id') && strlen($config->account_id) > 1)
+            if (property_exists($config, 'account_id') && strlen($config->account_id) > 1) {
                 return view('auth.connect.existing');
-
+            }
         }
 
         $stripe_client_id = config('ninja.ninja_stripe_client_id');
@@ -68,22 +68,18 @@ class StripeConnectController extends BaseController
 
     public function completed(InitializeStripeConnectRequest $request)
     {
-
         \Stripe\Stripe::setApiKey(config('ninja.ninja_stripe_key'));
 
         try {
             $response = \Stripe\OAuth::token([
-              'grant_type' => 'authorization_code',
-              'code' => $request->input('code'),
+                'grant_type' => 'authorization_code',
+                'code' => $request->input('code'),
             ]);
-
-        }catch(\Exception $e)
-        {
-            
+        } catch (\Exception $e) {
             nlog($e->getMessage());
             throw new SystemError($e->getMessage(), 500);
         }
-        
+
         MultiDB::findAndSetDbByCompanyKey($request->getTokenContent()['company_key']);
 
         $company = Company::where('company_key', $request->getTokenContent()['company_key'])->first();
@@ -93,8 +89,7 @@ class StripeConnectController extends BaseController
             ->where('company_id', $company->id)
             ->first();
 
-        if(!$company_gateway)
-        {
+        if (! $company_gateway) {
             $company_gateway = CompanyGatewayFactory::create($company->id, $company->owner()->id);
             $fees_and_limits = new \stdClass;
             $fees_and_limits->{GatewayType::CREDIT_CARD} = new FeesAndLimits;
@@ -107,14 +102,14 @@ class StripeConnectController extends BaseController
 
         $payload = [
             'account_id' => $response->stripe_user_id,
-            "token_type" => 'bearer',
-            "stripe_publishable_key" => $response->stripe_publishable_key,
-            "scope" => $response->scope,
-            "livemode" => $response->livemode,
-            "stripe_user_id" => $response->stripe_user_id,
-            "refresh_token" => $response->refresh_token,
-            "access_token" => $response->access_token,
-            "appleDomainVerification" => '',
+            'token_type' => 'bearer',
+            'stripe_publishable_key' => $response->stripe_publishable_key,
+            'scope' => $response->scope,
+            'livemode' => $response->livemode,
+            'stripe_user_id' => $response->stripe_user_id,
+            'refresh_token' => $response->refresh_token,
+            'access_token' => $response->access_token,
+            'appleDomainVerification' => '',
         ];
 
         $company_gateway->setConfig($payload);
@@ -126,7 +121,6 @@ class StripeConnectController extends BaseController
         return view('auth.connect.completed');
     }
 
-
     private function checkAccountAlreadyLinkToEmail($company_gateway, $email)
     {
         $client = Client::first() ? Client::first() : new Client;
@@ -134,23 +128,19 @@ class StripeConnectController extends BaseController
         //Pull the list of Stripe Accounts and see if we match
         $accounts = $company_gateway->driver($client)->getAllConnectedAccounts()->data;
 
-        foreach($accounts as $account)
-        {
-            if($account['email'] == $email)
+        foreach ($accounts as $account) {
+            if ($account['email'] == $email) {
                 return $account['id'];
+            }
         }
 
         return false;
-
     }
-    
-
-
 
     /*********************************
     * Stripe OAuth
     */
-   
+
    //  public function initialize(InitializeStripeConnectRequest $request, string $token)
    // {
 
diff --git a/app/Http/Controllers/StripeController.php b/app/Http/Controllers/StripeController.php
index afaf67fc7ee0..e31e38b6c265 100644
--- a/app/Http/Controllers/StripeController.php
+++ b/app/Http/Controllers/StripeController.php
@@ -21,72 +21,58 @@ use App\Utils\Traits\MakesHash;
 
 class StripeController extends BaseController
 {
-	use MakesHash;
+    use MakesHash;
 
     private $stripe_keys = ['d14dd26a47cecc30fdd65700bfb67b34', 'd14dd26a37cecc30fdd65700bfb55b23'];
 
-	public function update()
-	{
-		if(auth()->user()->isAdmin())
-		{
-			
-			StripeUpdatePaymentMethods::dispatch(auth()->user()->company());
+    public function update()
+    {
+        if (auth()->user()->isAdmin()) {
+            StripeUpdatePaymentMethods::dispatch(auth()->user()->company());
 
-			return response()->json(['message' => 'Processing'], 200);
+            return response()->json(['message' => 'Processing'], 200);
+        }
 
-		}
+        return response()->json(['message' => 'Unauthorized'], 403);
+    }
 
-		return response()->json(['message' => 'Unauthorized'], 403);
-	}
+    public function import()
+    {
 
-	public function import()
-	{
+        // return response()->json(['message' => 'Processing'], 200);
 
-		// return response()->json(['message' => 'Processing'], 200);
+        if (auth()->user()->isAdmin()) {
+            ImportStripeCustomers::dispatch(auth()->user()->company());
 
+            return response()->json(['message' => 'Processing'], 200);
+        }
 
-		if(auth()->user()->isAdmin())
-		{
-			
-			ImportStripeCustomers::dispatch(auth()->user()->company());
+        return response()->json(['message' => 'Unauthorized'], 403);
+    }
 
-			return response()->json(['message' => 'Processing'], 200);
+    public function verify()
+    {
+        if (auth()->user()->isAdmin()) {
+            MultiDB::findAndSetDbByCompanyKey(auth()->user()->company()->company_key);
 
-		}
-		
-		return response()->json(['message' => 'Unauthorized'], 403);
-	}
+            $company_gateway = CompanyGateway::where('company_id', auth()->user()->company()->id)
+                                ->where('is_deleted', 0)
+                                ->whereIn('gateway_key', $this->stripe_keys)
+                                ->first();
 
-	public function verify()
-	{
-		
-		if(auth()->user()->isAdmin())
-		{
+            return $company_gateway->driver(new Client)->verifyConnect();
+        }
 
-			MultiDB::findAndSetDbByCompanyKey(auth()->user()->company()->company_key);
-			
-	    	$company_gateway = CompanyGateway::where('company_id', auth()->user()->company()->id)
-	                            ->where('is_deleted',0)
-	    						->whereIn('gateway_key', $this->stripe_keys)
-	    						->first();
+        return response()->json(['message' => 'Unauthorized'], 403);
+    }
 
-			return $company_gateway->driver(new Client)->verifyConnect();
+    public function disconnect(string $company_gateway_id)
+    {
+        $company_gateway = CompanyGateway::where('company_id', auth()->user()->company()->id)
+                                         ->where('id', $this->decodePrimaryKey($company_gateway_id))
+                                         ->whereIn('gateway_key', $this->stripe_keys)
+                                         ->firstOrFail();
 
-		}
-
-		return response()->json(['message' => 'Unauthorized'], 403);
-
-	}
-
-	public function disconnect(string $company_gateway_id)
-	{
-
-		$company_gateway = CompanyGateway::where('company_id', auth()->user()->company()->id)
-										 ->where('id', $this->decodePrimaryKey($company_gateway_id))
-										 ->whereIn('gateway_key', $this->stripe_keys)
-										 ->firstOrFail();
-
-		return $company_gateway->driver()->disconnect();
-		
-	}
-}
\ No newline at end of file
+        return $company_gateway->driver()->disconnect();
+    }
+}
diff --git a/app/Http/Controllers/SubdomainController.php b/app/Http/Controllers/SubdomainController.php
index 63b4812e3ba9..46dc95744cc8 100644
--- a/app/Http/Controllers/SubdomainController.php
+++ b/app/Http/Controllers/SubdomainController.php
@@ -40,7 +40,6 @@ class SubdomainController extends BaseController
 
     public function __construct()
     {
-
     }
 
     /**
@@ -50,11 +49,10 @@ class SubdomainController extends BaseController
      */
     public function index()
     {
-
-        if(in_array(request()->input('subdomain'), $this->protected) || MultiDB::findAndSetDbByDomain(['subdomain' => request()->input('subdomain')]))
-            return response()->json(['message' => 'Domain not available'] , 401);
+        if (in_array(request()->input('subdomain'), $this->protected) || MultiDB::findAndSetDbByDomain(['subdomain' => request()->input('subdomain')])) {
+            return response()->json(['message' => 'Domain not available'], 401);
+        }
 
         return response()->json(['message' => 'Domain available'], 200);
     }
-
 }
diff --git a/app/Http/Controllers/SubscriptionController.php b/app/Http/Controllers/SubscriptionController.php
index 462a85e94c6b..9a80137b50ff 100644
--- a/app/Http/Controllers/SubscriptionController.php
+++ b/app/Http/Controllers/SubscriptionController.php
@@ -30,7 +30,7 @@ use App\Utils\Traits\MakesHash;
 class SubscriptionController extends BaseController
 {
     use MakesHash;
-    
+
     protected $entity_type = Subscription::class;
 
     protected $entity_transformer = SubscriptionTransformer::class;
@@ -46,7 +46,7 @@ class SubscriptionController extends BaseController
 
     /**
      * Show the list of Subscriptions.
-     *     
+     *
      * @return Response
      *
      * @OA\Get(
@@ -55,7 +55,7 @@ class SubscriptionController extends BaseController
      *      tags={"subscriptions"},
      *      summary="Gets a list of subscriptions",
      *      description="Lists subscriptions.",
-     *      
+     *
      *      @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
      *      @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
      *      @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
@@ -80,7 +80,6 @@ class SubscriptionController extends BaseController
      *       ),
      *     )
      */
-    
     public function index(): \Illuminate\Http\Response
     {
         $subscriptions = Subscription::query()->company();
@@ -480,5 +479,4 @@ class SubscriptionController extends BaseController
 
         return $this->listResponse(Subscription::withTrashed()->whereIn('id', $this->transformKeys($ids)));
     }
-
 }
diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php
index dd9b6fafcf7b..383e338ae21e 100644
--- a/app/Http/Controllers/TaskController.php
+++ b/app/Http/Controllers/TaskController.php
@@ -39,7 +39,6 @@ use Illuminate\Http\Response;
 /**
  * Class TaskController.
  */
-
 class TaskController extends BaseController
 {
     use MakesHash;
@@ -278,12 +277,13 @@ class TaskController extends BaseController
         }
 
         $old_task = json_decode(json_encode($task));
-        
+
         $task = $this->task_repo->save($request->all(), $task);
         $task = $this->task_repo->triggeredActions($request, $task);
 
-        if($task->status_order != $old_task->status_order)
+        if ($task->status_order != $old_task->status_order) {
             $this->task_repo->sortStatuses($old_task, $task);
+        }
 
         event(new TaskWasUpdated($task, $task->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
@@ -520,7 +520,7 @@ class TaskController extends BaseController
         //todo
     }
 
-/**
+    /**
      * Update the specified resource in storage.
      *
      * @param UploadTaskRequest $request
@@ -573,17 +573,16 @@ class TaskController extends BaseController
      */
     public function upload(UploadTaskRequest $request, Task $task)
     {
-
-        if(!$this->checkFeature(Account::FEATURE_DOCUMENTS))
+        if (! $this->checkFeature(Account::FEATURE_DOCUMENTS)) {
             return $this->featureFailure();
-        
-        if ($request->has('documents')) 
+        }
+
+        if ($request->has('documents')) {
             $this->saveDocuments($request->file('documents'), $task);
+        }
 
         return $this->itemResponse($task->fresh());
-
-    }  
-
+    }
 
     /**
      * Store a newly created resource in storage.
@@ -625,12 +624,10 @@ class TaskController extends BaseController
      */
     public function sort(SortTaskRequest $request)
     {
-    
         $task_statuses = $request->input('status_ids');
         $tasks = $request->input('task_ids');
 
-        collect($task_statuses)->each(function ($task_status_hashed_id, $key){
-
+        collect($task_statuses)->each(function ($task_status_hashed_id, $key) {
             $task_status = TaskStatus::where('id', $this->decodePrimaryKey($task_status_hashed_id))
                                      ->where('company_id', auth()->user()->company()->id)
                                      ->withTrashed()
@@ -638,27 +635,21 @@ class TaskController extends BaseController
 
             $task_status->status_order = $key;
             $task_status->save();
-
         });
 
-        foreach($tasks as $key => $task_list)
-        {
-
+        foreach ($tasks as $key => $task_list) {
             $sort_status_id = $this->decodePrimaryKey($key);
-            
-            foreach ($task_list as $key => $task)
-            {
-                
+
+            foreach ($task_list as $key => $task) {
                 $task_record = Task::where('id', $this->decodePrimaryKey($task))
                              ->where('company_id', auth()->user()->company()->id)
                              ->withTrashed()
                              ->first();
-                
+
                 $task_record->status_order = $key;
                 $task_record->status_id = $sort_status_id;
                 $task_record->save();
             }
-
         }
 
         return response()->json(['message' => 'Ok'], 200);
diff --git a/app/Http/Controllers/TaskSchedulerController.php b/app/Http/Controllers/TaskSchedulerController.php
index 00f573a55751..d28d740a0681 100644
--- a/app/Http/Controllers/TaskSchedulerController.php
+++ b/app/Http/Controllers/TaskSchedulerController.php
@@ -25,7 +25,9 @@ use Symfony\Component\HttpFoundation\Request;
 class TaskSchedulerController extends BaseController
 {
     protected $entity_type = Scheduler::class;
+
     protected $entity_transformer = TaskSchedulerTransformer::class;
+
     protected TaskSchedulerRepository $scheduler_repository;
 
     public function __construct(TaskSchedulerRepository $scheduler_repository)
@@ -58,14 +60,11 @@ class TaskSchedulerController extends BaseController
      *       ),
      *     )
      */
-
     public function index()
     {
-
         $schedulers = Scheduler::where('company_id', auth()->user()->company()->id);
 
         return $this->listResponse($schedulers);
-
     }
 
     /**
@@ -101,11 +100,11 @@ class TaskSchedulerController extends BaseController
      *       ),
      *     )
      */
-
     public function store(CreateScheduledTaskRequest $request)
     {
         $scheduler = new Scheduler();
         $scheduler->service()->store($scheduler, $request);
+
         return $this->itemResponse($scheduler);
     }
 
@@ -143,7 +142,6 @@ class TaskSchedulerController extends BaseController
      *       ),
      *     )
      */
-
     public function show(Scheduler $scheduler)
     {
         return $this->itemResponse($scheduler);
@@ -194,11 +192,10 @@ class TaskSchedulerController extends BaseController
     public function update(Scheduler $scheduler, UpdateScheduleRequest $request)
     {
         $scheduler->service()->update($scheduler, $request);
+
         return $this->itemResponse($scheduler);
     }
 
-
-
     /**
      * @OA\DELETE(
      *      path="/api/v1/task_scheduler/{id}",
@@ -236,8 +233,7 @@ class TaskSchedulerController extends BaseController
     public function destroy(Scheduler $scheduler)
     {
         $this->scheduler_repository->delete($scheduler);
+
         return $this->itemResponse($scheduler->fresh());
     }
-
-
 }
diff --git a/app/Http/Controllers/TaskStatusController.php b/app/Http/Controllers/TaskStatusController.php
index ffc6f70b01e9..94f1bdb6249a 100644
--- a/app/Http/Controllers/TaskStatusController.php
+++ b/app/Http/Controllers/TaskStatusController.php
@@ -177,7 +177,7 @@ class TaskStatusController extends BaseController
     public function store(StoreTaskStatusRequest $request)
     {
         // nlog($request->all());
-        
+
         $task_status = TaskStatusFactory::create(auth()->user()->company()->id, auth()->user()->id);
         $task_status->fill($request->all());
 
@@ -400,9 +400,8 @@ class TaskStatusController extends BaseController
      */
     public function destroy(DestroyTaskStatusRequest $request, TaskStatus $task_status)
     {
-        
         $task_status = $this->task_status_repo->delete($task_status);
-     
+
         return $this->itemResponse($task_status);
     }
 
diff --git a/app/Http/Controllers/TemplateController.php b/app/Http/Controllers/TemplateController.php
index 1086c09878ab..3f02a6412af5 100644
--- a/app/Http/Controllers/TemplateController.php
+++ b/app/Http/Controllers/TemplateController.php
@@ -92,7 +92,7 @@ class TemplateController extends BaseController
         $subject = request()->has('subject') ? request()->input('subject') : '';
         $body = request()->has('body') ? request()->input('body') : '';
         $template = request()->has('template') ? request()->input('template') : '';
-        
+
         $data = (new TemplateEngine($body, $subject, $entity, $entity_id, $template))->build();
 
         return response()->json($data, 200);
diff --git a/app/Http/Controllers/TokenController.php b/app/Http/Controllers/TokenController.php
index 9f0ff1f835c4..cb13b50ca7ac 100644
--- a/app/Http/Controllers/TokenController.php
+++ b/app/Http/Controllers/TokenController.php
@@ -52,8 +52,7 @@ class TokenController extends BaseController
 
         $this->token_repo = $token_repo;
 
-        $this->middleware('password_protected')->only(['store','update']);
-
+        $this->middleware('password_protected')->only(['store', 'update']);
     }
 
     /**
@@ -484,7 +483,6 @@ class TokenController extends BaseController
      */
     public function bulk()
     {
-
         $this->entity_transformer = CompanyTokenHashedTransformer::class;
 
         $action = request()->input('action');
diff --git a/app/Http/Controllers/Traits/VerifiesUserEmail.php b/app/Http/Controllers/Traits/VerifiesUserEmail.php
index 6218bb7806fa..715bbad4477d 100644
--- a/app/Http/Controllers/Traits/VerifiesUserEmail.php
+++ b/app/Http/Controllers/Traits/VerifiesUserEmail.php
@@ -43,13 +43,11 @@ trait VerifiesUserEmail
         $user->confirmation_code = null;
         $user->save();
 
-        if(isset($user->oauth_user_id)){
-
+        if (isset($user->oauth_user_id)) {
             return $this->render('auth.confirmed', [
                 'root' => 'themes',
                 'message' => ctrans('texts.security_confirmation'),
             ]);
-            
         }
 
         if (is_null($user->password) || empty($user->password) || Hash::check('', $user->password)) {
@@ -70,7 +68,6 @@ trait VerifiesUserEmail
             'password' => ['required', 'min:6'],
         ]);
 
-
         $user->password = Hash::make(request()->password);
 
         $user->email_verified_at = now();
diff --git a/app/Http/Controllers/TwilioController.php b/app/Http/Controllers/TwilioController.php
new file mode 100644
index 000000000000..fd9a417627e1
--- /dev/null
+++ b/app/Http/Controllers/TwilioController.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Http\Controllers;
+
+use App\Http\Requests\Twilio\ConfirmSmsRequest;
+use App\Http\Requests\Twilio\GenerateSmsRequest;
+use App\Libraries\MultiDB;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Http\Response;
+use Twilio\Rest\Client;
+
+class TwilioController extends BaseController
+{
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return void
+     */
+    public function generate(GenerateSmsRequest $request)
+    {
+        $account = auth()->user()->company()->account;
+
+        if(MultiDB::hasPhoneNumber($request->phone))
+            return response()->json(['message' => 'This phone number has already been verified with another account'], 400);
+
+        $sid = config('ninja.twilio_account_sid');
+        $token = config('ninja.twilio_auth_token');
+
+        $twilio = new Client($sid, $token);
+
+
+        try {
+            $verification = $twilio->verify
+                                   ->v2
+                                   ->services(config('ninja.twilio_verify_sid'))
+                                   ->verifications
+                                   ->create($request->phone, "sms");
+        }
+        catch(\Exception $e) {
+
+            return response()->json(['message' => 'Invalid phone number please use + country code + number ie. +15552343334'], 400);
+
+        }
+
+        $account->account_sms_verification_code = $verification->sid;
+        $account->account_sms_verification_number = $request->phone;
+        $account->save();
+
+        return response()->json(['message' => 'Code sent.'], 200);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return void
+     */
+    public function confirm(ConfirmSmsRequest $request)
+    {
+
+        $account = auth()->user()->company()->account;
+
+        $sid = config('ninja.twilio_account_sid');
+        $token = config('ninja.twilio_auth_token');
+
+        $twilio = new Client($sid, $token);
+
+        $verification_check = $twilio->verify
+                                     ->v2
+                                     ->services(config('ninja.twilio_verify_sid'))
+                                     ->verificationChecks
+                                     ->create([
+                                             "to" => $account->account_sms_verification_number,
+                                             "code" => $request->code
+                                       ]);
+        
+
+        if($verification_check->status == 'approved'){
+
+            $account->account_sms_verified = true;
+            $account->save();
+
+            return response()->json(['message' => 'SMS verified'], 200);
+        }
+
+
+        return response()->json(['message' => 'SMS not verified'], 400);
+
+
+    }
+
+}
diff --git a/app/Http/Controllers/TwoFactorController.php b/app/Http/Controllers/TwoFactorController.php
index 1ff9129c7a1c..01b2f8d9e456 100644
--- a/app/Http/Controllers/TwoFactorController.php
+++ b/app/Http/Controllers/TwoFactorController.php
@@ -21,21 +21,22 @@ class TwoFactorController extends BaseController
     protected $entity_type = User::class;
 
     protected $entity_transformer = UserTransformer::class;
-    
+
     public function setupTwoFactor()
     {
         $user = auth()->user();
 
-        if ($user->google_2fa_secret) 
+        if ($user->google_2fa_secret) {
             return response()->json(['message' => '2FA already enabled'], 400);
-        elseif(! $user->phone)
+        } elseif (! $user->phone) {
             return response()->json(['message' => ctrans('texts.set_phone_for_two_factor')], 400);
-        elseif(! $user->isVerified())
+        } elseif (! $user->isVerified()) {
             return response()->json(['message' => 'Please confirm your account first'], 400);
+        }
 
         $google2fa = new Google2FA();
         $secret = $google2fa->generateSecretKey();
-         
+
         $qr_code = $google2fa->getQRCodeUrl(
             config('ninja.app_name'),
             $user->email,
@@ -48,7 +49,6 @@ class TwoFactorController extends BaseController
         ];
 
         return response()->json(['data' => $data], 200);
-        
     }
 
     public function enableTwoFactor()
@@ -59,24 +59,19 @@ class TwoFactorController extends BaseController
         $secret = request()->input('secret');
         $oneTimePassword = request()->input('one_time_password');
 
-        if($google2fa->verifyKey($secret, $oneTimePassword) && $user->phone && $user->email_verified_at){
-
+        if ($google2fa->verifyKey($secret, $oneTimePassword) && $user->phone && $user->email_verified_at) {
             $user->google_2fa_secret = encrypt($secret);
 
             $user->save();
-        
+
             return response()->json(['message' => ctrans('texts.enabled_two_factor')], 200);
-
         } elseif (! $secret || ! $google2fa->verifyKey($secret, $oneTimePassword)) {
-
             return response()->json(['message' => ctrans('texts.invalid_one_time_password')], 400);
+        }
 
-        } 
-            
         return response()->json(['message' => 'No phone record or user is not confirmed'], 400);
-        
     }
-    
+
     public function disableTwoFactor()
     {
         $user = auth()->user();
diff --git a/app/Http/Controllers/VendorController.php b/app/Http/Controllers/VendorController.php
index 7935c8b29d72..51098fda1862 100644
--- a/app/Http/Controllers/VendorController.php
+++ b/app/Http/Controllers/VendorController.php
@@ -569,14 +569,14 @@ class VendorController extends BaseController
      */
     public function upload(UploadVendorRequest $request, Vendor $vendor)
     {
-
-        if(!$this->checkFeature(Account::FEATURE_DOCUMENTS))
+        if (! $this->checkFeature(Account::FEATURE_DOCUMENTS)) {
             return $this->featureFailure();
-        
-        if ($request->has('documents')) 
+        }
+
+        if ($request->has('documents')) {
             $this->saveDocuments($request->file('documents'), $vendor);
+        }
 
         return $this->itemResponse($vendor->fresh());
-
-    }  
+    }
 }
diff --git a/app/Http/Controllers/VendorPortal/DocumentController.php b/app/Http/Controllers/VendorPortal/DocumentController.php
new file mode 100644
index 000000000000..91a87486eea7
--- /dev/null
+++ b/app/Http/Controllers/VendorPortal/DocumentController.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Http\Controllers\VendorPortal;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\VendorPortal\Documents\ShowDocumentRequest;
+use App\Http\Requests\Document\DownloadMultipleDocumentsRequest;
+use App\Libraries\MultiDB;
+use App\Models\Document;
+use App\Utils\TempFile;
+use App\Utils\Traits\MakesHash;
+use Illuminate\Contracts\View\Factory;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\View\View;
+
+class DocumentController extends Controller
+{
+    use MakesHash;
+
+    public const MODULE_PURCHASE_ORDERS = 16384;
+
+    /**
+     * @return Factory|View
+     */
+    public function index()
+    {
+        return render('documents.index');
+    }
+
+    /**
+     * @param ShowDocumentRequest $request
+     * @param Document $document
+     * @return Factory|View
+     */
+    public function show(ShowDocumentRequest $request, Document $document)
+    {
+        return render('documents.vendor_show', [
+            'document' => $document,
+            'settings' => auth()->guard('vendor')->user()->company->settings,
+            'sidebar' => $this->sidebarMenu(),
+            'company' => auth()->guard('vendor')->user()->company,
+        ]);
+    }
+
+
+    private function sidebarMenu() :array
+    {
+        $enabled_modules = auth()->guard('vendor')->user()->company->enabled_modules;
+        $data = [];
+
+        // TODO: Enable dashboard once it's completed.
+        // $this->settings->enable_client_portal_dashboard
+        // $data[] = [ 'title' => ctrans('texts.dashboard'), 'url' => 'client.dashboard', 'icon' => 'activity'];
+
+        if (self::MODULE_PURCHASE_ORDERS & $enabled_modules) {
+            $data[] = ['title' => ctrans('texts.purchase_orders'), 'url' => 'vendor.purchase_orders.index', 'icon' => 'file-text'];
+        }
+
+        // $data[] = ['title' => ctrans('texts.documents'), 'url' => 'client.documents.index', 'icon' => 'download'];
+
+        return $data;
+    }
+
+
+    public function download(ShowDocumentRequest $request, Document $document)
+    {
+        return Storage::disk($document->disk)->download($document->url, $document->name);
+    }
+
+    public function publicDownload(string $document_hash)
+    {
+        MultiDB::documentFindAndSetDb($document_hash);
+
+        $document = Document::where('hash', $document_hash)->firstOrFail();
+
+        $headers = [];
+
+        if (request()->input('inline') == 'true') {
+            $headers = array_merge($headers, ['Content-Disposition' => 'inline']);
+        }
+
+        return Storage::disk($document->disk)->download($document->url, $document->name, $headers);
+    }
+
+    public function downloadMultiple(DownloadMultipleDocumentsRequest $request)
+    {
+        $documents = Document::whereIn('id', $this->transformKeys($request->file_hash))
+            ->where('company_id', auth()->guard('vendor')->user()->company_id)
+            ->get();
+
+        $zipFile = new \PhpZip\ZipFile();
+
+        try {
+            foreach ($documents as $document) {
+                $zipFile->addFile(TempFile::path($document->filePath()), $document->name);
+            }
+
+            $filename = now().'-documents.zip';
+            $filepath = sys_get_temp_dir().'/'.$filename;
+
+            $zipFile->saveAsFile($filepath) // save the archive to a file
+                   ->close(); // close archive
+
+           return response()->download($filepath, $filename)->deleteFileAfterSend(true);
+        } catch (\PhpZip\Exception\ZipException $e) {
+            // handle exception
+        } finally {
+            $zipFile->close();
+        }
+    }
+}
diff --git a/app/Http/Controllers/VendorPortal/InvitationController.php b/app/Http/Controllers/VendorPortal/InvitationController.php
index 9c20dab32620..4a295a6e646b 100644
--- a/app/Http/Controllers/VendorPortal/InvitationController.php
+++ b/app/Http/Controllers/VendorPortal/InvitationController.php
@@ -73,7 +73,6 @@ class InvitationController extends Controller
             auth()->guard('vendor')->loginUsingId($vendor_contact->id, true);
 
         } else {
-            nlog("else - default - login contact");
             request()->session()->invalidate();
             auth()->guard('vendor')->loginUsingId($vendor_contact->id, true);
         }
diff --git a/app/Http/Controllers/VendorPortal/PurchaseOrderController.php b/app/Http/Controllers/VendorPortal/PurchaseOrderController.php
index d3c4b3c651bc..a0361a6a09a9 100644
--- a/app/Http/Controllers/VendorPortal/PurchaseOrderController.php
+++ b/app/Http/Controllers/VendorPortal/PurchaseOrderController.php
@@ -33,19 +33,33 @@ class PurchaseOrderController extends Controller
     use MakesHash, MakesDates;
 
     public const MODULE_RECURRING_INVOICES = 1;
+
     public const MODULE_CREDITS = 2;
+
     public const MODULE_QUOTES = 4;
+
     public const MODULE_TASKS = 8;
+
     public const MODULE_EXPENSES = 16;
+
     public const MODULE_PROJECTS = 32;
+
     public const MODULE_VENDORS = 64;
+
     public const MODULE_TICKETS = 128;
+
     public const MODULE_PROPOSALS = 256;
+
     public const MODULE_RECURRING_EXPENSES = 512;
+
     public const MODULE_RECURRING_TASKS = 1024;
+
     public const MODULE_RECURRING_QUOTES = 2048;
+
     public const MODULE_INVOICES = 4096;
+
     public const MODULE_PROFORMAL_INVOICES = 8192;
+
     public const MODULE_PURCHASE_ORDERS = 16384;
 
     /**
@@ -55,7 +69,6 @@ class PurchaseOrderController extends Controller
      */
     public function index(ShowPurchaseOrdersRequest $request)
     {
-
         return $this->render('purchase_orders.index', ['company' => auth()->user()->company, 'settings' => auth()->user()->company->settings, 'sidebar' => $this->sidebarMenu()]);
     }
 
@@ -73,22 +86,19 @@ class PurchaseOrderController extends Controller
 
         $invitation = $purchase_order->invitations()->where('vendor_contact_id', auth()->guard('vendor')->user()->id)->first();
 
-            if ($invitation && auth()->guard('vendor') && !session()->get('is_silent') && ! $invitation->viewed_date) {
-
-                $invitation->markViewed();
-
-                event(new InvitationWasViewed($purchase_order, $invitation, $purchase_order->company, Ninja::eventVars()));
-                event(new PurchaseOrderWasViewed($invitation, $invitation->company, Ninja::eventVars()));
-            
-            }
+        if ($invitation && auth()->guard('vendor') && ! session()->get('is_silent') && ! $invitation->viewed_date) {
+            $invitation->markViewed();
 
+            event(new InvitationWasViewed($purchase_order, $invitation, $purchase_order->company, Ninja::eventVars()));
+            event(new PurchaseOrderWasViewed($invitation, $invitation->company, Ninja::eventVars()));
+        }
 
         $data = [
             'purchase_order' => $purchase_order,
             'key' => $invitation ? $invitation->key : false,
             'settings' => $purchase_order->company->settings,
             'sidebar' => $this->sidebarMenu(),
-            'company' => $purchase_order->company
+            'company' => $purchase_order->company,
         ];
 
         if ($request->query('mode') === 'fullscreen') {
@@ -98,8 +108,6 @@ class PurchaseOrderController extends Controller
         return $this->render('purchase_orders.show', $data);
     }
 
-
-
     private function sidebarMenu() :array
     {
         $enabled_modules = auth()->guard('vendor')->user()->company->enabled_modules;
@@ -120,13 +128,11 @@ class PurchaseOrderController extends Controller
 
     public function bulk(ProcessPurchaseOrdersInBulkRequest $request)
     {
-
         $transformed_ids = $this->transformKeys($request->purchase_orders);
 
         if ($request->input('action') == 'download') {
             return $this->downloadInvoices((array) $transformed_ids);
-        }
-        elseif ($request->input('action') == 'accept'){
+        } elseif ($request->input('action') == 'accept') {
             return $this->acceptPurchaseOrder($request->all());
         }
 
@@ -143,88 +149,74 @@ class PurchaseOrderController extends Controller
                                         ->whereIn('status_id', [PurchaseOrder::STATUS_DRAFT, PurchaseOrder::STATUS_SENT])
                                         ->where('is_deleted', 0)
                                         ->withTrashed()
-                                        ->cursor()->each(function ($purchase_order){
-
-                                        $purchase_order->service()
+                                        ->cursor()->each(function ($purchase_order) {
+                                            $purchase_order->service()
                                                        ->markSent()
                                                        ->applyNumber()
                                                        ->setStatus(PurchaseOrder::STATUS_ACCEPTED)
                                                        ->save();
 
-                                        if (request()->has('signature') && !is_null(request()->signature) && !empty(request()->signature)) {
-                                            InjectSignature::dispatch($purchase_order, request()->signature);
-                                        }
-                                        
-                                        event(new PurchaseOrderWasAccepted($purchase_order, auth()->guard('vendor')->user(), $purchase_order->company, Ninja::eventVars()));
+                                            if (request()->has('signature') && ! is_null(request()->signature) && ! empty(request()->signature)) {
+                                                InjectSignature::dispatch($purchase_order, request()->signature);
+                                            }
 
-        });
-
-        if(count($data['purchase_orders']) == 1){ 
+                                            event(new PurchaseOrderWasAccepted($purchase_order, auth()->guard('vendor')->user(), $purchase_order->company, Ninja::eventVars()));
+                                        });
 
+        if (count($data['purchase_orders']) == 1) {
             $purchase_order = PurchaseOrder::withTrashed()->where('is_deleted', 0)->whereIn('id', $this->transformKeys($data['purchase_orders']))->first();
-            
+
             return redirect()->route('vendor.purchase_order.show', ['purchase_order' => $purchase_order->hashed_id]);
-        
-        }
-        else
+        } else {
             return redirect()->route('vendor.purchase_orders.index');
-
-
+        }
     }
 
     public function downloadInvoices($ids)
     {
-
         $purchase_orders = PurchaseOrder::whereIn('id', $ids)
                             ->where('vendor_id', auth()->guard('vendor')->user()->vendor_id)
                             ->withTrashed()
                             ->get();
 
-        if(count($purchase_orders) == 0)
+        if (count($purchase_orders) == 0) {
             return back()->with(['message' => ctrans('texts.no_items_selected')]);
+        }
 
+        if (count($purchase_orders) == 1) {
+            $purchase_order = $purchase_orders->first();
 
-        if(count($purchase_orders) == 1){
+            $file = $purchase_order->service()->getPurchaseOrderPdf(auth()->guard('vendor')->user());
 
-           $purchase_order = $purchase_orders->first();
-
-           $file = $purchase_order->service()->getPurchaseOrderPdf(auth()->guard('vendor')->user());
-
-            return response()->streamDownload(function () use($file) {
-                    echo Storage::get($file);
-            },  basename($file), ['Content-Type' => 'application/pdf']);
+            return response()->streamDownload(function () use ($file) {
+                echo Storage::get($file);
+            }, basename($file), ['Content-Type' => 'application/pdf']);
         }
 
         return $this->buildZip($purchase_orders);
     }
 
-
     private function buildZip($purchase_orders)
     {
         // create new archive
         $zipFile = new \PhpZip\ZipFile();
-        try{
-            
+        try {
             foreach ($purchase_orders as $purchase_order) {
 
-                #add it to the zip
+                //add it to the zip
                 $zipFile->addFromString(basename($purchase_order->pdf_file_path()), file_get_contents($purchase_order->pdf_file_path(null, 'url', true)));
-
             }
 
             $filename = date('Y-m-d').'_'.str_replace(' ', '_', trans('texts.purchase_orders')).'.zip';
-            $filepath = sys_get_temp_dir() . '/' . $filename;
+            $filepath = sys_get_temp_dir().'/'.$filename;
 
-           $zipFile->saveAsFile($filepath) // save the archive to a file
+            $zipFile->saveAsFile($filepath) // save the archive to a file
                    ->close(); // close archive
-                    
-           return response()->download($filepath, $filename)->deleteFileAfterSend(true);
 
-        }
-        catch(\PhpZip\Exception\ZipException $e){
+           return response()->download($filepath, $filename)->deleteFileAfterSend(true);
+        } catch (\PhpZip\Exception\ZipException $e) {
             // handle exception
-        }
-        finally{
+        } finally {
             $zipFile->close();
         }
     }
diff --git a/app/Http/Controllers/VendorPortal/VendorContactController.php b/app/Http/Controllers/VendorPortal/VendorContactController.php
index 7aa93db123e0..61deeb1cea8c 100644
--- a/app/Http/Controllers/VendorPortal/VendorContactController.php
+++ b/app/Http/Controllers/VendorPortal/VendorContactController.php
@@ -22,31 +22,44 @@ class VendorContactController extends Controller
     use MakesHash;
 
     public const MODULE_RECURRING_INVOICES = 1;
+
     public const MODULE_CREDITS = 2;
+
     public const MODULE_QUOTES = 4;
+
     public const MODULE_TASKS = 8;
+
     public const MODULE_EXPENSES = 16;
+
     public const MODULE_PROJECTS = 32;
+
     public const MODULE_VENDORS = 64;
+
     public const MODULE_TICKETS = 128;
+
     public const MODULE_PROPOSALS = 256;
+
     public const MODULE_RECURRING_EXPENSES = 512;
+
     public const MODULE_RECURRING_TASKS = 1024;
+
     public const MODULE_RECURRING_QUOTES = 2048;
+
     public const MODULE_INVOICES = 4096;
+
     public const MODULE_PROFORMAL_INVOICES = 8192;
+
     public const MODULE_PURCHASE_ORDERS = 16384;
 
     public function edit(VendorContact $vendor_contact)
     {
-
         return $this->render('vendor_profile.edit', [
             'contact' => $vendor_contact,
             'vendor' => $vendor_contact->vendor,
             'settings' => $vendor_contact->vendor->company->settings,
             'company' => $vendor_contact->vendor->company,
             'sidebar' => $this->sidebarMenu(),
-            'countries' => TranslationHelper::getCountries()
+            'countries' => TranslationHelper::getCountries(),
         ]);
     }
 
@@ -56,8 +69,7 @@ class VendorContactController extends Controller
         $vendor_contact->vendor->fill(request()->all());
         $vendor_contact->push();
 
-         return back()->withSuccess(ctrans('texts.profile_updated_successfully'));
-
+        return back()->withSuccess(ctrans('texts.profile_updated_successfully'));
     }
 
     private function sidebarMenu() :array
@@ -77,5 +89,4 @@ class VendorContactController extends Controller
 
         return $data;
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/VendorPortal/VendorContactHashLoginController.php b/app/Http/Controllers/VendorPortal/VendorContactHashLoginController.php
new file mode 100644
index 000000000000..21e11a9c0932
--- /dev/null
+++ b/app/Http/Controllers/VendorPortal/VendorContactHashLoginController.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Http\Controllers\VendorPortal;
+
+use App\Http\Controllers\Controller;
+use App\Http\ViewComposers\PortalComposer;
+use App\Models\RecurringInvoice;
+use Auth;
+
+class VendorContactHashLoginController extends Controller
+{
+    /**
+     * Logs a user into the client portal using their contact_key
+     * @param  string $contact_key  The contact key
+     * @return Auth|Redirect
+     */
+    public function login(string $contact_key)
+    {
+        return redirect('/vendors/purchase_orders');
+    }
+
+    public function magicLink(string $magic_link)
+    {
+        return redirect($this->setRedirectPath());
+    }
+
+    public function errorPage()
+    {
+        return render('generic.error', ['title' => session()->get('title'), 'notification' => session()->get('notification')]);
+    }
+
+
+}
diff --git a/app/Http/Controllers/WePayController.php b/app/Http/Controllers/WePayController.php
index f615e3b7f36b..e44103c12596 100644
--- a/app/Http/Controllers/WePayController.php
+++ b/app/Http/Controllers/WePayController.php
@@ -23,7 +23,7 @@ use Illuminate\Support\Facades\Cache;
 class WePayController extends BaseController
 {
     use MakesHash;
-    
+
     /**
      * Initialize WePay Signup.
      */
@@ -45,7 +45,6 @@ class WePayController extends BaseController
         $wepay_driver = new WePayPaymentDriver(new CompanyGateway, null, null);
 
         return $wepay_driver->setup($data);
-
     }
 
     public function finished()
diff --git a/app/Http/Controllers/WebCronController.php b/app/Http/Controllers/WebCronController.php
index 7d0af28e330e..6111a606d038 100644
--- a/app/Http/Controllers/WebCronController.php
+++ b/app/Http/Controllers/WebCronController.php
@@ -16,12 +16,10 @@ use Illuminate\Support\Facades\Artisan;
 
 class WebCronController extends Controller
 {
-
     public function __construct()
     {
     }
 
-
     /**
      * Store a newly created resource in storage.
      *
@@ -56,20 +54,18 @@ class WebCronController extends Controller
      */
     public function index(Request $request)
     {
-
         set_time_limit(0);
 
-        if(!config('ninja.webcron_secret'))
+        if (! config('ninja.webcron_secret')) {
             return response()->json(['message' => 'Web cron has not been configured'], 403);
+        }
 
-        if($request->has('secret') && (config('ninja.webcron_secret') == $request->query('secret')))
-        {
+        if ($request->has('secret') && (config('ninja.webcron_secret') == $request->query('secret'))) {
             Artisan::call('schedule:run');
 
             return response()->json(['message' => 'Executing web cron'], 200);
         }
 
         return response()->json(['message' => 'Invalid secret'], 403);
-        
     }
 }
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index d73386f10960..0590a73841a5 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -42,6 +42,7 @@ use App\Http\Middleware\TrimStrings;
 use App\Http\Middleware\TrustProxies;
 use App\Http\Middleware\UrlSetDb;
 use App\Http\Middleware\UserVerified;
+use App\Http\Middleware\VendorContactKeyLogin;
 use App\Http\Middleware\VendorLocale;
 use App\Http\Middleware\VerifyCsrfToken;
 use App\Http\Middleware\VerifyHash;
@@ -74,7 +75,7 @@ class Kernel extends HttpKernel
         TrimStrings::class,
         ConvertEmptyStringsToNull::class,
         TrustProxies::class,
-        // \Fruitcake\Cors\HandleCors::class,
+        // \Illuminate\Http\Middleware\HandleCors::class,
         Cors::class,
 
     ];
@@ -166,13 +167,13 @@ class Kernel extends HttpKernel
         'shop_token_auth' => ShopTokenAuth::class,
         'phantom_secret' => PhantomSecret::class,
         'contact_key_login' => ContactKeyLogin::class,
+        'vendor_contact_key_login' => VendorContactKeyLogin::class,
         'check_client_existence' => CheckClientExistence::class,
         'user_verified' => UserVerified::class,
         'document_db' => SetDocumentDb::class,
         'session_domain' => SessionDomains::class,
     ];
 
-
     protected $middlewarePriority = [
         EncryptCookies::class,
         StartSession::class,
diff --git a/app/Http/Livewire/BillingPortalPurchase.php b/app/Http/Livewire/BillingPortalPurchase.php
index 8053b6c67a50..ebe0ca6c2688 100644
--- a/app/Http/Livewire/BillingPortalPurchase.php
+++ b/app/Http/Livewire/BillingPortalPurchase.php
@@ -263,6 +263,17 @@ class BillingPortalPurchase extends Component
             }
         }
 
+        if(array_key_exists('currency_id', $this->request_data)) {
+
+            $currency = Cache::get('currencies')->filter(function ($item){
+                return $item->id == $this->request_data['currency_id'];
+            })->first();
+
+            if($currency)
+                $data['settings']->currency_id = $currency->id;
+
+        }
+
         if (array_key_exists('locale', $this->request_data)) {
             $request = $this->request_data;
 
diff --git a/app/Http/Livewire/CreditsTable.php b/app/Http/Livewire/CreditsTable.php
index f07e7995e294..12e29cbb0102 100644
--- a/app/Http/Livewire/CreditsTable.php
+++ b/app/Http/Livewire/CreditsTable.php
@@ -34,16 +34,15 @@ class CreditsTable extends Component
 
     public function render()
     {
-
         $query = Credit::query()
             ->where('client_id', auth()->guard('contact')->user()->client->id)
             ->where('company_id', $this->company->id)
             ->where('status_id', '<>', Credit::STATUS_DRAFT)
             ->where('is_deleted', 0)
-            ->where(function ($query){
+            ->where(function ($query) {
                 $query->whereDate('due_date', '>=', now())
                       ->orWhereNull('due_date');
-                      //->orWhere('due_date', '=', '');
+                //->orWhere('due_date', '=', '');
             })
             ->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc')
             ->withTrashed()
diff --git a/app/Http/Livewire/DocumentsTable.php b/app/Http/Livewire/DocumentsTable.php
index b31adf0dcfb5..e5748d80e3a8 100644
--- a/app/Http/Livewire/DocumentsTable.php
+++ b/app/Http/Livewire/DocumentsTable.php
@@ -52,6 +52,8 @@ class DocumentsTable extends Component
 
     public function render()
     {
+        $this->updateResources(request()->tab ?: $this->tab);
+
         return render('components.livewire.documents-table', [
             'documents' => $this->query
                 ->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc')
diff --git a/app/Http/Livewire/InvoicesTable.php b/app/Http/Livewire/InvoicesTable.php
index e31bfee86a2e..e8bd125e506f 100644
--- a/app/Http/Livewire/InvoicesTable.php
+++ b/app/Http/Livewire/InvoicesTable.php
@@ -28,7 +28,7 @@ class InvoicesTable extends Component
     public $status = [];
 
     public $company;
-    
+
     public function mount()
     {
         MultiDB::setDb($this->company->db);
@@ -43,7 +43,7 @@ class InvoicesTable extends Component
         $local_status = [];
 
         $query = Invoice::query()
-            ->with('client.gateway_tokens','client.contacts')
+            ->with('client.gateway_tokens', 'client.contacts')
             ->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc')
             ->where('company_id', $this->company->id)
             ->where('is_deleted', false);
@@ -83,7 +83,7 @@ class InvoicesTable extends Component
 
         return render('components.livewire.invoices-table', [
             'invoices' => $query,
-            'gateway_available' => !empty(auth()->user()->client->service()->getPaymentMethods(-1)),
+            'gateway_available' => ! empty(auth()->user()->client->service()->getPaymentMethods(-1)),
         ]);
     }
 }
diff --git a/app/Http/Livewire/PayNowDropdown.php b/app/Http/Livewire/PayNowDropdown.php
index ac645525b8c6..d0b1e1190b33 100644
--- a/app/Http/Livewire/PayNowDropdown.php
+++ b/app/Http/Livewire/PayNowDropdown.php
@@ -22,7 +22,7 @@ class PayNowDropdown extends Component
     public $methods;
 
     public $company;
-    
+
     public function mount(int $total)
     {
         MultiDB::setDb($this->company->db);
diff --git a/app/Http/Livewire/PaymentMethodsTable.php b/app/Http/Livewire/PaymentMethodsTable.php
index e5dd04905bcc..881d30afda2f 100644
--- a/app/Http/Livewire/PaymentMethodsTable.php
+++ b/app/Http/Livewire/PaymentMethodsTable.php
@@ -1,8 +1,5 @@
 <?php
 
- 
-
-
 namespace App\Http\Livewire;
 
 use App\Libraries\MultiDB;
@@ -17,14 +14,13 @@ class PaymentMethodsTable extends Component
     use WithSorting;
 
     public $per_page = 10;
-    
+
     public $client;
 
     public $company;
-    
+
     public function mount($client)
     {
-    
         MultiDB::setDb($this->company->db);
 
         $this->client = $client;
@@ -37,8 +33,8 @@ class PaymentMethodsTable extends Component
             ->where('company_id', $this->company->id)
             ->where('client_id', $this->client->id)
             ->whereHas('gateway', function ($query) {
-                 $query->where('is_deleted',0)
-                       ->where('deleted_at', NULL);
+                $query->where('is_deleted', 0)
+                       ->where('deleted_at', null);
             })
             ->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc')
             ->paginate($this->per_page);
diff --git a/app/Http/Livewire/PaymentsTable.php b/app/Http/Livewire/PaymentsTable.php
index 7c2cb8970840..c46bc7f7271f 100644
--- a/app/Http/Livewire/PaymentsTable.php
+++ b/app/Http/Livewire/PaymentsTable.php
@@ -28,13 +28,12 @@ class PaymentsTable extends Component
     public $user;
 
     public $company;
-    
+
     public function mount()
     {
         MultiDB::setDb($this->company->db);
 
         $this->user = auth()->user();
-
     }
 
     public function render()
diff --git a/app/Http/Livewire/Profile/Settings/General.php b/app/Http/Livewire/Profile/Settings/General.php
index e1ef17a044d3..8c836f79c728 100644
--- a/app/Http/Livewire/Profile/Settings/General.php
+++ b/app/Http/Livewire/Profile/Settings/General.php
@@ -20,10 +20,15 @@ class General extends Component
     public $profile;
 
     public $first_name;
+
     public $last_name;
+
     public $email;
+
     public $phone;
+
     public $password;
+
     public $password_confirmation;
 
     public $saved;
@@ -60,13 +65,13 @@ class General extends Component
             $this->rules['email'][] = 'unique:client_contacts,email';
         }
 
-        if (!empty($this->password)) {
+        if (! empty($this->password)) {
             $this->rules['password'] = ['sometimes', 'nullable', 'required', 'min:6', 'confirmed'];
         }
 
         $data = $this->validate($this->rules);
 
-        if (!empty($this->password)) {
+        if (! empty($this->password)) {
             $this->profile->password = Hash::make($this->password);
         }
 
diff --git a/app/Http/Livewire/Profile/Settings/NameWebsiteLogo.php b/app/Http/Livewire/Profile/Settings/NameWebsiteLogo.php
index 3101dd2f10d1..dbc7d8771c82 100644
--- a/app/Http/Livewire/Profile/Settings/NameWebsiteLogo.php
+++ b/app/Http/Livewire/Profile/Settings/NameWebsiteLogo.php
@@ -9,8 +9,11 @@ class NameWebsiteLogo extends Component
     public $profile;
 
     public $name;
+
     public $vat_number;
+
     public $website;
+
     public $phone;
 
     public $saved;
diff --git a/app/Http/Livewire/Profile/Settings/PersonalAddress.php b/app/Http/Livewire/Profile/Settings/PersonalAddress.php
index e423d689d119..9580370420d2 100644
--- a/app/Http/Livewire/Profile/Settings/PersonalAddress.php
+++ b/app/Http/Livewire/Profile/Settings/PersonalAddress.php
@@ -9,10 +9,15 @@ class PersonalAddress extends Component
     public $profile;
 
     public $address1;
+
     public $address2;
+
     public $city;
+
     public $state;
+
     public $postal_code;
+
     public $country_id;
 
     public $countries;
diff --git a/app/Http/Livewire/Profile/Settings/ShippingAddress.php b/app/Http/Livewire/Profile/Settings/ShippingAddress.php
index 66035904941a..557a3f4e80c4 100644
--- a/app/Http/Livewire/Profile/Settings/ShippingAddress.php
+++ b/app/Http/Livewire/Profile/Settings/ShippingAddress.php
@@ -9,10 +9,15 @@ class ShippingAddress extends Component
     public $profile;
 
     public $shipping_address1;
+
     public $shipping_address2;
+
     public $shipping_city;
+
     public $shipping_state;
+
     public $shipping_postal_code;
+
     public $shipping_country_id;
 
     public $countries;
diff --git a/app/Http/Livewire/PurchaseOrdersTable.php b/app/Http/Livewire/PurchaseOrdersTable.php
index 13b057297669..5b1c1087d729 100644
--- a/app/Http/Livewire/PurchaseOrdersTable.php
+++ b/app/Http/Livewire/PurchaseOrdersTable.php
@@ -29,7 +29,7 @@ class PurchaseOrdersTable extends Component
     public $status = [];
 
     public $company;
-    
+
     public function mount()
     {
         MultiDB::setDb($this->company->db);
@@ -70,7 +70,7 @@ class PurchaseOrdersTable extends Component
             ->paginate($this->per_page);
 
         return render('components.livewire.purchase-orders-table', [
-            'purchase_orders' => $query
+            'purchase_orders' => $query,
         ]);
     }
 }
diff --git a/app/Http/Livewire/QuotesTable.php b/app/Http/Livewire/QuotesTable.php
index 430461a866ab..046ef1e5ba65 100644
--- a/app/Http/Livewire/QuotesTable.php
+++ b/app/Http/Livewire/QuotesTable.php
@@ -28,51 +28,43 @@ class QuotesTable extends Component
     public $status = [];
 
     public $company;
-    
+
     public function mount()
     {
         MultiDB::setDb($this->company->db);
-
     }
 
     public function render()
     {
         $query = Quote::query()
-            ->with('client.gateway_tokens','company','client.contacts')
+            ->with('client.gateway_tokens', 'company', 'client.contacts')
             ->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc');
 
         if (count($this->status) > 0) {
-            
+
             /* Special filter for expired*/
-            if(in_array("-1", $this->status)){
+            if (in_array('-1', $this->status)) {
                 // $query->whereDate('due_date', '<=', now()->startOfDay());
-    
-                $query->where(function ($query){
+
+                $query->where(function ($query) {
                     $query->whereDate('due_date', '<=', now()->startOfDay())
                           ->whereNotNull('due_date')
                           ->where('status_id', '<>', Quote::STATUS_CONVERTED);
                 });
-
             }
-            
-            if(in_array("2", $this->status)){
 
-                $query->where(function ($query){
+            if (in_array('2', $this->status)) {
+                $query->where(function ($query) {
                     $query->whereDate('due_date', '>=', now()->startOfDay())
                           ->orWhereNull('due_date');
                 })->where('status_id', Quote::STATUS_SENT);
-            
             }
 
-            if(in_array("3", $this->status)){
+            if (in_array('3', $this->status)) {
                 $query->whereIn('status_id', [Quote::STATUS_APPROVED, Quote::STATUS_CONVERTED]);
             }
-
-
         }
 
-
-
         $query = $query
             ->where('company_id', $this->company->id)
             ->where('client_id', auth()->guard('contact')->user()->client->id)
diff --git a/app/Http/Livewire/RecurringInvoiceCancellation.php b/app/Http/Livewire/RecurringInvoiceCancellation.php
index 3db160d0e053..27b193fa3f44 100644
--- a/app/Http/Livewire/RecurringInvoiceCancellation.php
+++ b/app/Http/Livewire/RecurringInvoiceCancellation.php
@@ -24,7 +24,7 @@ class RecurringInvoiceCancellation extends Component
     public $invoice;
 
     public $company;
-    
+
     public function mount()
     {
         MultiDB::setDb($this->company->db);
@@ -43,6 +43,4 @@ class RecurringInvoiceCancellation extends Component
 
         return redirect()->route('client.recurring_invoices.request_cancellation', ['recurring_invoice' => $this->invoice->hashed_id]);
     }
-
-
 }
diff --git a/app/Http/Livewire/RecurringInvoices/UpdateAutoBilling.php b/app/Http/Livewire/RecurringInvoices/UpdateAutoBilling.php
index 1bff78f00906..8170fbf12d66 100644
--- a/app/Http/Livewire/RecurringInvoices/UpdateAutoBilling.php
+++ b/app/Http/Livewire/RecurringInvoices/UpdateAutoBilling.php
@@ -22,7 +22,7 @@ class UpdateAutoBilling extends Component
     public function updateAutoBilling(): void
     {
         if ($this->invoice->auto_bill == 'optin' || $this->invoice->auto_bill == 'optout') {
-            $this->invoice->auto_bill_enabled = !$this->invoice->auto_bill_enabled;
+            $this->invoice->auto_bill_enabled = ! $this->invoice->auto_bill_enabled;
             $this->invoice->saveQuietly();
         }
     }
diff --git a/app/Http/Livewire/RecurringInvoicesTable.php b/app/Http/Livewire/RecurringInvoicesTable.php
index c48fe13f41e5..28be1c3690ad 100644
--- a/app/Http/Livewire/RecurringInvoicesTable.php
+++ b/app/Http/Livewire/RecurringInvoicesTable.php
@@ -25,7 +25,7 @@ class RecurringInvoicesTable extends Component
     public $per_page = 10;
 
     public $company;
-    
+
     public function mount()
     {
         MultiDB::setDb($this->company->db);
diff --git a/app/Http/Livewire/RequiredClientInfo.php b/app/Http/Livewire/RequiredClientInfo.php
index db341ac34ee3..349c8391547c 100644
--- a/app/Http/Livewire/RequiredClientInfo.php
+++ b/app/Http/Livewire/RequiredClientInfo.php
@@ -10,7 +10,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Http\Livewire;
 
 use App\Libraries\MultiDB;
@@ -105,7 +104,7 @@ class RequiredClientInfo extends Component
     public $show_form = false;
 
     public $company;
-    
+
     public function mount()
     {
         MultiDB::setDb($this->company->db);
@@ -115,7 +114,6 @@ class RequiredClientInfo extends Component
         count($this->fields) > 0
             ? $this->checkFields()
             : $this->show_form = false;
-
     }
 
     public function handleSubmit(array $data): bool
@@ -123,7 +121,7 @@ class RequiredClientInfo extends Component
         $rules = [];
 
         collect($this->fields)->map(function ($field) use (&$rules) {
-            if (!array_key_exists('filled', $field)) {
+            if (! array_key_exists('filled', $field)) {
                 $rules[$field['name']] = array_key_exists('validation_rules', $field)
                     ? $field['validation_rules']
                     : 'required';
@@ -231,7 +229,7 @@ class RequiredClientInfo extends Component
             'client_shipping_state' => $this->contact->client->state,
             'client_shipping_postal_code' => $this->contact->client->postal_code,
             'client_shipping_country_id' => $this->contact->client->country_id,
-        ]); 
+        ]);
     }
 
     public function render()
diff --git a/app/Http/Livewire/SubscriptionPlanSwitch.php b/app/Http/Livewire/SubscriptionPlanSwitch.php
index 263766365c40..c1ea73efebfa 100644
--- a/app/Http/Livewire/SubscriptionPlanSwitch.php
+++ b/app/Http/Livewire/SubscriptionPlanSwitch.php
@@ -73,11 +73,11 @@ class SubscriptionPlanSwitch extends Component
     public $hash;
 
     public $company;
-    
+
     public function mount()
     {
         MultiDB::setDb($this->company->db);
-        
+
         $this->total = $this->amount;
 
         $this->methods = $this->contact->client->service()->getPaymentMethods($this->amount);
@@ -87,43 +87,37 @@ class SubscriptionPlanSwitch extends Component
 
     public function handleBeforePaymentEvents(): void
     {
-        
         $this->state['show_loading_bar'] = true;
 
-            $payment_required = $this->target->service()->changePlanPaymentCheck([
+        $payment_required = $this->target->service()->changePlanPaymentCheck([
+            'recurring_invoice' => $this->recurring_invoice,
+            'subscription' => $this->subscription,
+            'target' => $this->target,
+            'hash' => $this->hash,
+        ]);
+
+        if ($payment_required) {
+            $this->state['invoice'] = $this->target->service()->createChangePlanInvoice([
                 'recurring_invoice' => $this->recurring_invoice,
                 'subscription' => $this->subscription,
                 'target' => $this->target,
                 'hash' => $this->hash,
             ]);
 
-            if($payment_required)
-            {
-
-                $this->state['invoice'] = $this->target->service()->createChangePlanInvoice([
-                    'recurring_invoice' => $this->recurring_invoice,
-                    'subscription' => $this->subscription,
-                    'target' => $this->target,
-                    'hash' => $this->hash,
-                ]);
-
-                Cache::put($this->hash, [
-                    'subscription_id' => $this->target->id,
-                    'target_id' => $this->target->id,
-                    'recurring_invoice' => $this->recurring_invoice->id,
-                    'client_id' => $this->recurring_invoice->client->id,
-                    'invoice_id' => $this->state['invoice']->id,
-                    'context' => 'change_plan',
-                    now()->addMinutes(60)]
+            Cache::put($this->hash, [
+                'subscription_id' => $this->target->id,
+                'target_id' => $this->target->id,
+                'recurring_invoice' => $this->recurring_invoice->id,
+                'client_id' => $this->recurring_invoice->client->id,
+                'invoice_id' => $this->state['invoice']->id,
+                'context' => 'change_plan',
+                now()->addMinutes(60), ]
                 );
 
-                $this->state['payment_initialised'] = true;
-                
-            }
-            else
-                $this->handlePaymentNotRequired();
-
-
+            $this->state['payment_initialised'] = true;
+        } else {
+            $this->handlePaymentNotRequired();
+        }
 
         $this->emit('beforePaymentEventsCompleted');
     }
@@ -145,14 +139,12 @@ class SubscriptionPlanSwitch extends Component
 
     public function handlePaymentNotRequired()
     {
-
         return $this->target->service()->createChangePlanCredit([
-                'recurring_invoice' => $this->recurring_invoice,
-                'subscription' => $this->subscription,
-                'target' => $this->target,
-                'hash' => $this->hash,
-            ]);
-
+            'recurring_invoice' => $this->recurring_invoice,
+            'subscription' => $this->subscription,
+            'target' => $this->target,
+            'hash' => $this->hash,
+        ]);
     }
 
     public function render()
diff --git a/app/Http/Livewire/SubscriptionRecurringInvoicesTable.php b/app/Http/Livewire/SubscriptionRecurringInvoicesTable.php
index 7ed9ce5c40b4..cf7938afba17 100644
--- a/app/Http/Livewire/SubscriptionRecurringInvoicesTable.php
+++ b/app/Http/Livewire/SubscriptionRecurringInvoicesTable.php
@@ -26,12 +26,12 @@ class SubscriptionRecurringInvoicesTable extends Component
     public $per_page = 10;
 
     public $company;
-    
+
     public function mount()
     {
         MultiDB::setDb($this->company->db);
     }
-    
+
     public function render()
     {
         $query = RecurringInvoice::query()
diff --git a/app/Http/Livewire/WepaySignup.php b/app/Http/Livewire/WepaySignup.php
index 0278c12e5415..a41bdcc6d24b 100644
--- a/app/Http/Livewire/WepaySignup.php
+++ b/app/Http/Livewire/WepaySignup.php
@@ -27,21 +27,33 @@ use WePay;
 class WepaySignup extends Component
 {
     public $user;
+
     public $user_id;
+
     public $company_key;
+
     public $first_name;
+
     public $last_name;
+
     public $email;
+
     public $company_name;
+
     public $country;
+
     public $ach;
+
     public $wepay_payment_tos_agree;
+
     public $debit_cards;
 
     public $terms;
+
     public $privacy_policy;
 
     public $saved;
+
     public $company;
 
     protected $rules = [
@@ -61,7 +73,7 @@ class WepaySignup extends Component
 
         $user = User::find($this->user_id);
         $this->company = Company::where('company_key', $this->company->company_key)->first();
-            
+
         $this->fill([
             'wepay_payment_tos_agree' => '',
             'ach' => '',
@@ -79,7 +91,7 @@ class WepaySignup extends Component
 
     public function render()
     {
-      return render('gateways.wepay.signup.wepay-signup');
+        return render('gateways.wepay.signup.wepay-signup');
     }
 
     public function submit()
@@ -93,12 +105,11 @@ class WepaySignup extends Component
                             ->where('company_id', $this->company->id)
                             ->firstOrNew();
 
-        if(!$cg->id) {
-
+        if (! $cg->id) {
             $fees_and_limits = new \stdClass;
             $fees_and_limits->{GatewayType::CREDIT_CARD} = new FeesAndLimits;
             $fees_and_limits->{GatewayType::BANK_TRANSFER} = new FeesAndLimits;
-            
+
             $cg = CompanyGatewayFactory::create($this->company->id, $this->user->id);
             $cg->gateway_key = '8fdeed552015b3c7b44ed6c8ebd9e992';
             $cg->require_cvv = false;
@@ -109,7 +120,6 @@ class WepaySignup extends Component
             $cg->fees_and_limits = $fees_and_limits;
             $cg->token_billing = 'always';
             $cg->save();
-
         }
 
         $this->saved = ctrans('texts.processing');
@@ -139,65 +149,63 @@ class WepaySignup extends Component
 
         $wepay = new WePay($access_token);
 
-            $account_details = [
-                'name' => $data['company_name'],
-                'description' => ctrans('texts.wepay_account_description'),
-                'theme_object' => json_decode('{"name":"Invoice Ninja","primary_color":"0b4d78","secondary_color":"0b4d78","background_color":"f8f8f8","button_color":"33b753"}'),
-                'callback_uri' => route('payment_webhook', ['company_key' => $this->company->company_key, 'company_gateway_id' => $cg->hashed_id]),
-                'rbits' => $this->company->rBits(),
-                'country' => $data['country'],
-            ];
+        $account_details = [
+            'name' => $data['company_name'],
+            'description' => ctrans('texts.wepay_account_description'),
+            'theme_object' => json_decode('{"name":"Invoice Ninja","primary_color":"0b4d78","secondary_color":"0b4d78","background_color":"f8f8f8","button_color":"33b753"}'),
+            'callback_uri' => route('payment_webhook', ['company_key' => $this->company->company_key, 'company_gateway_id' => $cg->hashed_id]),
+            'rbits' => $this->company->rBits(),
+            'country' => $data['country'],
+        ];
 
-            if ($data['country'] == 'CA') {
-                $account_details['currencies'] = ['CAD'];
-                $account_details['country_options'] = ['debit_opt_in' => boolval($data['debit_cards'])];
-            } elseif ($data['country'] == 'GB') {
-                $account_details['currencies'] = ['GBP'];
-            }
- 
-            $wepay_account = $wepay->request('account/create/', $account_details);
+        if ($data['country'] == 'CA') {
+            $account_details['currencies'] = ['CAD'];
+            $account_details['country_options'] = ['debit_opt_in' => boolval($data['debit_cards'])];
+        } elseif ($data['country'] == 'GB') {
+            $account_details['currencies'] = ['GBP'];
+        }
 
-            try {
-                $wepay->request('user/send_confirmation/', []);
-                $confirmation_required = true;
-            } catch (\WePayException $ex) {
-                if ($ex->getMessage() == 'This access_token is already approved.') {
-                    $confirmation_required = false;
-                } else {
-                    request()->session()->flash('message', $ex->getMessage());
-                }
+        $wepay_account = $wepay->request('account/create/', $account_details);
 
-                nlog("failed in try catch ");
-                nlog($ex->getMessage());
-            }
-
-            $config = [
-                'userId' => $wepay_user->user_id,
-                'accessToken' => $access_token,
-                'tokenType' => $wepay_user->token_type,
-                'tokenExpires' => $access_token_expires,
-                'accountId' => $wepay_account->account_id,
-                'state' => $wepay_account->state,
-                'testMode' => config('ninja.wepay.environment') == 'staging',
-                'country' => $data['country'],
-            ];
-
-            $cg->setConfig($config);
-            $cg->save();
-
-            if ($confirmation_required) {
-                request()->session()->flash('message', trans('texts.created_wepay_confirmation_required'));
+        try {
+            $wepay->request('user/send_confirmation/', []);
+            $confirmation_required = true;
+        } catch (\WePayException $ex) {
+            if ($ex->getMessage() == 'This access_token is already approved.') {
+                $confirmation_required = false;
             } else {
-                $update_uri = $wepay->request('/account/get_update_uri', [
-                    'account_id' => $wepay_account->account_id,
-                    'redirect_uri' => config('ninja.app_url'),
-                ]);
-
-                return redirect($update_uri->uri);
+                request()->session()->flash('message', $ex->getMessage());
             }
 
+            nlog('failed in try catch ');
+            nlog($ex->getMessage());
+        }
+
+        $config = [
+            'userId' => $wepay_user->user_id,
+            'accessToken' => $access_token,
+            'tokenType' => $wepay_user->token_type,
+            'tokenExpires' => $access_token_expires,
+            'accountId' => $wepay_account->account_id,
+            'state' => $wepay_account->state,
+            'testMode' => config('ninja.wepay.environment') == 'staging',
+            'country' => $data['country'],
+        ];
+
+        $cg->setConfig($config);
+        $cg->save();
+
+        if ($confirmation_required) {
+            request()->session()->flash('message', trans('texts.created_wepay_confirmation_required'));
+        } else {
+            $update_uri = $wepay->request('/account/get_update_uri', [
+                'account_id' => $wepay_account->account_id,
+                'redirect_uri' => config('ninja.app_url'),
+            ]);
+
+            return redirect($update_uri->uri);
+        }
 
         return redirect()->to('/wepay/finished');
     }
-
 }
diff --git a/app/Http/Middleware/CheckClientExistence.php b/app/Http/Middleware/CheckClientExistence.php
index f218c39a32c0..35e35fad78f6 100644
--- a/app/Http/Middleware/CheckClientExistence.php
+++ b/app/Http/Middleware/CheckClientExistence.php
@@ -28,12 +28,12 @@ class CheckClientExistence
      */
     public function handle(Request $request, Closure $next)
     {
-
-        if(session()->has('multiple_contacts'))
+        if (session()->has('multiple_contacts')) {
             return $next($request);
+        }
 
         $multiple_contacts = ClientContact::query()
-            ->with('client.gateway_tokens','company')
+            ->with('client.gateway_tokens', 'company')
             ->where('email', auth()->guard('contact')->user()->email)
             ->whereNotNull('email')
             ->where('email', '<>', '')
@@ -42,7 +42,7 @@ class CheckClientExistence
             ->whereHas('client', function ($query) {
                 return $query->where('is_deleted', false);
             })
-            ->whereHas('company', function ($query){
+            ->whereHas('company', function ($query) {
                 return $query->where('companies.account_id', auth()->guard('contact')->user()->company->account_id);
             })
             ->get();
@@ -54,7 +54,7 @@ class CheckClientExistence
             return redirect()->route('client.login')->with('message', 'Login disabled');
         }
 
-        if (count($multiple_contacts) == 1 && !Auth::guard('contact')->check()) {
+        if (count($multiple_contacts) == 1 && ! Auth::guard('contact')->check()) {
             Auth::guard('contact')->loginUsingId($multiple_contacts[0]->id, true);
         }
 
diff --git a/app/Http/Middleware/ContactAccount.php b/app/Http/Middleware/ContactAccount.php
index 19b9e1ddf773..cafdb2c6fd6b 100644
--- a/app/Http/Middleware/ContactAccount.php
+++ b/app/Http/Middleware/ContactAccount.php
@@ -28,9 +28,7 @@ class ContactAccount
      */
     public function handle($request, Closure $next)
     {
-
-        if(!Ninja::isHosted()) {
-
+        if (! Ninja::isHosted()) {
             $account = Account::first();
 
             session()->put('account_key', $account->key);
diff --git a/app/Http/Middleware/ContactKeyLogin.php b/app/Http/Middleware/ContactKeyLogin.php
index e5f6621cdb73..2f216de885ba 100644
--- a/app/Http/Middleware/ContactKeyLogin.php
+++ b/app/Http/Middleware/ContactKeyLogin.php
@@ -44,50 +44,50 @@ class ContactKeyLogin
         if ($request->segment(2) && $request->segment(2) == 'magic_link' && $request->segment(3)) {
             $payload = Cache::get($request->segment(3));
 
-            if(!$payload)
+            if (! $payload) {
                 abort(403, 'Link expired.');
+            }
 
             $contact_email = $payload['email'];
-            
-            if($client_contact = ClientContact::where('email', $contact_email)->where('company_id', $payload['company_id'])->first()){
-               
-                 if(empty($client_contact->email))
-                    $client_contact->email = Str::random(15) . "@example.com"; $client_contact->save();
-    
+
+            if ($client_contact = ClientContact::where('email', $contact_email)->where('company_id', $payload['company_id'])->first()) {
+                if (empty($client_contact->email)) {
+                    $client_contact->email = Str::random(15).'@example.com';
+                }
+                $client_contact->save();
+
                 auth()->guard('contact')->loginUsingId($client_contact->id, true);
 
-                if ($request->query('redirect') && !empty($request->query('redirect'))) {
+                if ($request->query('redirect') && ! empty($request->query('redirect'))) {
                     return redirect()->to($request->query('redirect'));
                 }
 
                 return redirect($this->setRedirectPath());
             }
-        }
-        elseif ($request->segment(3) && config('ninja.db.multi_db_enabled')) {
-
+        } elseif ($request->segment(3) && config('ninja.db.multi_db_enabled')) {
             if (MultiDB::findAndSetDbByContactKey($request->segment(3))) {
-            
-            if($client_contact = ClientContact::where('contact_key', $request->segment(3))->first()){
-            
-                if(empty($client_contact->email))
-                    $client_contact->email = Str::random(6) . "@example.com"; $client_contact->save();
+                if ($client_contact = ClientContact::where('contact_key', $request->segment(3))->first()) {
+                    if (empty($client_contact->email)) {
+                        $client_contact->email = Str::random(6).'@example.com';
+                    }
+                    $client_contact->save();
 
-                auth()->guard('contact')->loginUsingId($client_contact->id, true);
+                    auth()->guard('contact')->loginUsingId($client_contact->id, true);
 
-                if ($request->query('next')) {
-                    return redirect()->to($request->query('next'));
+                    if ($request->query('next')) {
+                        return redirect()->to($request->query('next'));
+                    }
+
+                    return redirect($this->setRedirectPath());
                 }
-
-                return redirect($this->setRedirectPath());
-            }
-
             }
         } elseif ($request->segment(2) && $request->segment(2) == 'key_login' && $request->segment(3)) {
             if ($client_contact = ClientContact::where('contact_key', $request->segment(3))->first()) {
-                if(empty($client_contact->email)) {
-                    $client_contact->email = Str::random(6) . "@example.com"; $client_contact->save();
+                if (empty($client_contact->email)) {
+                    $client_contact->email = Str::random(6).'@example.com';
+                    $client_contact->save();
                 }
-    
+
                 auth()->guard('contact')->loginUsingId($client_contact->id, true);
 
                 if ($request->query('next')) {
@@ -98,36 +98,39 @@ class ContactKeyLogin
             }
         } elseif ($request->has('client_hash') && config('ninja.db.multi_db_enabled')) {
             if (MultiDB::findAndSetDbByClientHash($request->input('client_hash'))) {
+                if ($client = Client::where('client_hash', $request->input('client_hash'))->first()) {
+                    $primary_contact = $client->primary_contact()->first();
 
-                if($client = Client::where('client_hash', $request->input('client_hash'))->first()){
-        
-                $primary_contact = $client->primary_contact()->first();
-
-                if(empty($primary_contact->email))
-                    $primary_contact->email = Str::random(6) . "@example.com"; $primary_contact->save();
+                    if (empty($primary_contact->email)) {
+                        $primary_contact->email = Str::random(6).'@example.com';
+                    }
+                    $primary_contact->save();
 
                     auth()->guard('contact')->loginUsingId($primary_contact->id, true);
+
                     return redirect($this->setRedirectPath());
                 }
             }
         } elseif ($request->has('client_hash')) {
             if ($client = Client::where('client_hash', $request->input('client_hash'))->first()) {
-
                 $primary_contact = $client->primary_contact()->first();
-                
-                if(empty($primary_contact->email))
-                    $primary_contact->email = Str::random(6) . "@example.com"; $primary_contact->save();
 
-                    auth()->guard('contact')->loginUsingId($primary_contact->id, true);
-
-                    return redirect($this->setRedirectPath());
-            }
-        }elseif ($request->segment(3)) {
-            if ($client_contact = ClientContact::where('contact_key', $request->segment(3))->first()) {
-                if(empty($client_contact->email)) {
-                    $client_contact->email = Str::random(6) . "@example.com"; $client_contact->save();
+                if (empty($primary_contact->email)) {
+                    $primary_contact->email = Str::random(6).'@example.com';
                 }
-    
+                $primary_contact->save();
+
+                auth()->guard('contact')->loginUsingId($primary_contact->id, true);
+
+                return redirect($this->setRedirectPath());
+            }
+        } elseif ($request->segment(3)) {
+            if ($client_contact = ClientContact::where('contact_key', $request->segment(3))->first()) {
+                if (empty($client_contact->email)) {
+                    $client_contact->email = Str::random(6).'@example.com';
+                    $client_contact->save();
+                }
+
                 auth()->guard('contact')->loginUsingId($client_contact->id, true);
 
                 if ($request->query('next')) {
@@ -138,26 +141,25 @@ class ContactKeyLogin
             }
         }
         //28-02-2022 middleware should not allow this to progress as we should have redirected by this stage.
-        abort(404, "Unable to authenticate.");
+        abort(404, 'Unable to authenticate.');
 
         return $next($request);
     }
 
     private function setRedirectPath()
     {
-
-        if(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES)
+        if (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES) {
             return '/client/invoices';
-        elseif(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES)
+        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES) {
             return '/client/recurring_invoices';
-        elseif(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES)
+        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES) {
             return '/client/quotes';
-        elseif(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS)
+        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS) {
             return '/client/credits';
-        elseif(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_TASKS)
+        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_TASKS) {
             return '/client/tasks';
-        elseif(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_EXPENSES)
+        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_EXPENSES) {
             return '/client/expenses';
-
+        }
     }
 }
diff --git a/app/Http/Middleware/ContactRegister.php b/app/Http/Middleware/ContactRegister.php
index 22eb6e0b8ec3..b2cf964b87a2 100644
--- a/app/Http/Middleware/ContactRegister.php
+++ b/app/Http/Middleware/ContactRegister.php
@@ -21,10 +21,9 @@ class ContactRegister
     {
         $domain_name = $request->getHost();
 
-        if (strpos($domain_name, 'invoicing.co') !== false) 
-        {
+        if (strpos($domain_name, 'invoicing.co') !== false) {
             $subdomain = explode('.', $domain_name)[0];
-            
+
             $query = [
                 'subdomain' => $subdomain,
                 'portal_mode' => 'subdomain',
@@ -32,47 +31,42 @@ class ContactRegister
 
             $company = Company::where($query)->first();
 
-            if($company)
-            {
-                if(! $company->client_can_register)
+            if ($company) {
+                if (! $company->client_can_register) {
                     abort(400, 'Registration disabled');
+                }
 
-                    session()->put('company_key', $company->company_key);
+                session()->put('company_key', $company->company_key);
 
                 return $next($request);
             }
-
         }
 
-        if(Ninja::isHosted())
-        {
+        if (Ninja::isHosted()) {
             $query = [
                 'portal_domain' => $request->getSchemeAndHttpHost(),
                 'portal_mode' => 'domain',
             ];
 
-            if($company = Company::where($query)->first())
-            {
-
-                if(! $company->client_can_register)
+            if ($company = Company::where($query)->first()) {
+                if (! $company->client_can_register) {
                     abort(400, 'Registration disabled');
+                }
 
-               // $request->merge(['key' => $company->company_key]);
+                // $request->merge(['key' => $company->company_key]);
                 session()->put('company_key', $company->company_key);
 
                 return $next($request);
             }
-
         }
 
-
         // For self-hosted platforms with multiple companies, resolving is done using company key
         // if it doesn't resolve using a domain.
-        
+
         if ($request->company_key && Ninja::isSelfHost() && $company = Company::where('company_key', $request->company_key)->first()) {
-         
-            if(! (bool)$company->client_can_register)
+            if (! (bool) $company->client_can_register) {
                 abort(400, 'Registration disabled');
+            }
 
             //$request->merge(['key' => $company->company_key]);
             session()->put('company_key', $company->company_key);
@@ -82,11 +76,12 @@ class ContactRegister
 
         // As a fallback for self-hosted, it will use default company in the system
         // if key isn't provided in the url.
-        if (!$request->route()->parameter('company_key') && Ninja::isSelfHost()) {
+        if (! $request->route()->parameter('company_key') && Ninja::isSelfHost()) {
             $company = Account::first()->default_company;
 
-            if(! $company->client_can_register)
+            if (! $company->client_can_register) {
                 abort(400, 'Registration disabled');
+            }
 
             //$request->merge(['key' => $company->company_key]);
             session()->put('company_key', $company->company_key);
diff --git a/app/Http/Middleware/ContactSetDb.php b/app/Http/Middleware/ContactSetDb.php
index 69c92e1a0af1..78048c641422 100644
--- a/app/Http/Middleware/ContactSetDb.php
+++ b/app/Http/Middleware/ContactSetDb.php
@@ -28,9 +28,9 @@ class ContactSetDb
     public function handle($request, Closure $next)
     {
         $error = [
-                'message' => 'Invalid Token',
-                'errors' => new stdClass,
-            ];
+            'message' => 'Invalid Token',
+            'errors' => new stdClass,
+        ];
 
         if ($request->header('X-API-TOKEN') && config('ninja.db.multi_db_enabled')) {
             if (! MultiDB::contactFindAndSetDb($request->header('X-API-TOKEN'))) {
diff --git a/app/Http/Middleware/Cors.php b/app/Http/Middleware/Cors.php
index 759a7310e829..d0346e48277c 100644
--- a/app/Http/Middleware/Cors.php
+++ b/app/Http/Middleware/Cors.php
@@ -33,4 +33,4 @@ class Cors
 
         return $response;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Http/Middleware/Locale.php b/app/Http/Middleware/Locale.php
index 31bbf583889f..4353cb853826 100644
--- a/app/Http/Middleware/Locale.php
+++ b/app/Http/Middleware/Locale.php
@@ -35,13 +35,10 @@ class Locale
         } elseif (auth()->guard('contact')->user()) {
             App::setLocale(auth()->guard('contact')->user()->client()->setEagerLoads([])->first()->locale());
         } elseif (auth()->user()) {
-
-            try{
+            try {
                 App::setLocale(auth()->user()->company()->getLocale());
+            } catch (\Exception $e) {
             }
-            catch(\Exception $e){
-            }
-
         } else {
             App::setLocale(config('ninja.i18n.locale'));
         }
diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php
index 4385e92278dd..1ee27c815676 100644
--- a/app/Http/Middleware/QueryLogging.php
+++ b/app/Http/Middleware/QueryLogging.php
@@ -35,7 +35,7 @@ class QueryLogging
     {
 
         // Enable query logging for development
-        if (!Ninja::isHosted() || !config('beacon.enabled')) {
+        if (! Ninja::isHosted() || ! config('beacon.enabled')) {
             return $next($request);
         }
 
@@ -45,33 +45,33 @@ class QueryLogging
         $response = $next($request);
         // hide requests made by debugbar
         if (strstr($request->url(), '_debugbar') === false) {
-
             $queries = DB::getQueryLog();
             $count = count($queries);
             $timeEnd = microtime(true);
             $time = $timeEnd - $timeStart;
 
-            // info("Query count = {$count}");
-        
-             if($count > 175){
-                 nlog("Query count = {$count}");
-                 nlog($queries);
-             }
-                        
-            $ip = '';
+            // nlog("Query count = {$count}");
+            // nlog($queries);
             
-            if(request()->hasHeader('Cf-Connecting-Ip'))
+            if ($count > 175) {
+                nlog("Query count = {$count}");
+                nlog($queries);
+            }
+
+            $ip = '';
+
+            if (request()->hasHeader('Cf-Connecting-Ip')) {
                 $ip = request()->header('Cf-Connecting-Ip');
-            elseif(request()->hasHeader('X-Forwarded-For'))
+            } elseif (request()->hasHeader('X-Forwarded-For')) {
                 $ip = request()->header('Cf-Connecting-Ip');
-            else{
+            } else {
                 $ip = request()->ip();
             }
 
-           LightLogs::create(new DbQuery($request->method(), urldecode($request->url()), $count, $time, $ip))
+            LightLogs::create(new DbQuery($request->method(), urldecode($request->url()), $count, $time, $ip))
                  ->queue();
         }
-        
+
         return $response;
     }
 }
diff --git a/app/Http/Middleware/SessionDomains.php b/app/Http/Middleware/SessionDomains.php
index 5844ea7aa3a6..f27fb1b3f535 100644
--- a/app/Http/Middleware/SessionDomains.php
+++ b/app/Http/Middleware/SessionDomains.php
@@ -27,22 +27,18 @@ class SessionDomains
      */
     public function handle($request, Closure $next)
     {
-
-        if(Ninja::isSelfHost())
+        if (Ninja::isSelfHost()) {
             return $next($request);
+        }
 
         $domain_name = $request->getHost();
 
-        if (strpos($domain_name, 'invoicing.co') !== false) 
-        {
+        if (strpos($domain_name, 'invoicing.co') !== false) {
             // config(['session.domain' => '.invoicing.co']);
-        }            
-        else{
-
+        } else {
             config(['session.domain' => $domain_name]);
-            
         }
-        
-        return $next($request);        
+
+        return $next($request);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Http/Middleware/SetDb.php b/app/Http/Middleware/SetDb.php
index d143e4fd7c78..596a42ca02ed 100644
--- a/app/Http/Middleware/SetDb.php
+++ b/app/Http/Middleware/SetDb.php
@@ -27,7 +27,6 @@ class SetDb
      */
     public function handle($request, Closure $next)
     {
-        
         $error = [
             'message' => 'Invalid Token',
             'errors' => new stdClass,
diff --git a/app/Http/Middleware/SetDocumentDb.php b/app/Http/Middleware/SetDocumentDb.php
index 3f14f1ca421f..796fa2b3f320 100644
--- a/app/Http/Middleware/SetDocumentDb.php
+++ b/app/Http/Middleware/SetDocumentDb.php
@@ -33,10 +33,9 @@ class SetDocumentDb
         ];
 
         if (config('ninja.db.multi_db_enabled')) {
-            
-            if (! MultiDB::documentFindAndSetDb($request->segment(2))) 
+            if (! MultiDB::documentFindAndSetDb($request->segment(2))) {
                 return response()->json($error, 400);
-            
+            }
         }
 
         return $next($request);
diff --git a/app/Http/Middleware/SetDomainNameDb.php b/app/Http/Middleware/SetDomainNameDb.php
index a7271130a625..7596948867b8 100644
--- a/app/Http/Middleware/SetDomainNameDb.php
+++ b/app/Http/Middleware/SetDomainNameDb.php
@@ -28,64 +28,54 @@ class SetDomainNameDb
     public function handle($request, Closure $next)
     {
         $error = [
-                'message' => 'Invalid token',
-                'errors' => new stdClass,
-            ];
+            'message' => 'Invalid token',
+            'errors' => new stdClass,
+        ];
         /*
          * Use the host name to set the active DB
          **/
 
-        if(!config('ninja.db.multi_db_enabled'))
+        if (! config('ninja.db.multi_db_enabled')) {
             return $next($request);
+        }
 
         $domain_name = $request->getHost();
 
-        if (strpos($domain_name, 'invoicing.co') !== false) 
-        {
+        if (strpos($domain_name, 'invoicing.co') !== false) {
             $subdomain = explode('.', $domain_name)[0];
-            
+
             $query = [
                 'subdomain' => $subdomain,
                 'portal_mode' => 'subdomain',
             ];
 
-            if($company = MultiDB::findAndSetDbByDomain($query)){
-                //$request->merge(['company_key' => $company->company_key]);
+            if ($company = MultiDB::findAndSetDbByDomain($query)) {
                 session()->put('company_key', $company->company_key);
-            }
-            else 
-            {
+            } else {
                 if ($request->json) {
-                        return response()->json($error, 403);
+                    return response()->json($error, 403);
                 } else {
                     MultiDB::setDb('db-ninja-01');
-                    nlog("I could not set the DB - defaulting to DB1");
+                    nlog('I could not set the DB - defaulting to DB1');
                     //abort(400, 'Domain not found');
                 }
             }
-
-        }
-        else {
-
-           $query = [
+        } else {
+            $query = [
                 'portal_domain' => $request->getSchemeAndHttpHost(),
                 'portal_mode' => 'domain',
             ];
 
-            if($company = MultiDB::findAndSetDbByDomain($query)){
-                //$request->merge(['company_key' => $company->company_key]);
+            if ($company = MultiDB::findAndSetDbByDomain($query)) {
                 session()->put('company_key', $company->company_key);
-            }
-            else
-            {
+            } else {
                 if ($request->json) {
-                        return response()->json($error, 403);
+                    return response()->json($error, 403);
                 } else {
                     MultiDB::setDb('db-ninja-01');
-                    nlog("I could not set the DB - defaulting to DB1");
+                    nlog('I could not set the DB - defaulting to DB1');
                 }
             }
-
         }
 
         return $next($request);
diff --git a/app/Http/Middleware/SetEmailDb.php b/app/Http/Middleware/SetEmailDb.php
index 92ed65783517..d2c44fd8a4a1 100644
--- a/app/Http/Middleware/SetEmailDb.php
+++ b/app/Http/Middleware/SetEmailDb.php
@@ -33,10 +33,9 @@ class SetEmailDb
         ];
 
         if ($request->input('email') && config('ninja.db.multi_db_enabled')) {
-            
-            if (! MultiDB::userFindAndSetDb($request->input('email'))) 
+            if (! MultiDB::userFindAndSetDb($request->input('email'))) {
                 return response()->json($error, 400);
-            
+            }
         }
 
         return $next($request);
diff --git a/app/Http/Middleware/SetInviteDb.php b/app/Http/Middleware/SetInviteDb.php
index b13782900ca0..e141d2b21179 100644
--- a/app/Http/Middleware/SetInviteDb.php
+++ b/app/Http/Middleware/SetInviteDb.php
@@ -29,9 +29,9 @@ class SetInviteDb
     public function handle($request, Closure $next)
     {
         $error = [
-                'message' => 'I could not find the database for this object.',
-                'errors' => new stdClass,
-            ];
+            'message' => 'I could not find the database for this object.',
+            'errors' => new stdClass,
+        ];
         /*
          * Use the host name to set the active DB
          **/
@@ -43,11 +43,13 @@ class SetInviteDb
             $entity = $request->route('entity');
         }
 
-        if($entity == "pay")
-            $entity = "invoice";
+        if ($entity == 'pay') {
+            $entity = 'invoice';
+        }
 
-        if(!in_array($entity, ['invoice','quote','credit','recurring_invoice','purchase_order']))
-            abort(404,'I could not find this resource.');
+        if (! in_array($entity, ['invoice', 'quote', 'credit', 'recurring_invoice', 'purchase_order'])) {
+            abort(404, 'I could not find this resource.');
+        }
 
         /* Try and determine the DB from the invitation key STRING*/
         if (config('ninja.db.multi_db_enabled')) {
@@ -58,26 +60,23 @@ class SetInviteDb
             $segments = explode('-', $request->route('invitation_key'));
             $hashed_db = false;
 
-            if(is_array($segments)){
+            if (is_array($segments)) {
                 $hashed_db = $hashids->decode($segments[0]);
             }
-                
-            if($hashed_db && is_array($hashed_db) && ($hashed_db[0] == "01" || $hashed_db[0] == "02")){
-                
-                MultiDB::setDB(MultiDB::DB_PREFIX.str_pad($hashed_db[0], 2, '0', STR_PAD_LEFT));
-           
-                return $next($request);
-            
-            }
 
+            if ($hashed_db && is_array($hashed_db) && ($hashed_db[0] == '01' || $hashed_db[0] == '02')) {
+                MultiDB::setDB(MultiDB::DB_PREFIX.str_pad($hashed_db[0], 2, '0', STR_PAD_LEFT));
+
+                return $next($request);
+            }
         }
-            
+
         /* Attempt to set DB from invitatation key*/
         if ($request->getSchemeAndHttpHost() && config('ninja.db.multi_db_enabled') && ! MultiDB::findAndSetDbByInvitation($entity, $request->route('invitation_key'))) {
             if (request()->json) {
                 return response()->json($error, 403);
             } else {
-                abort(404,'I could not find this resource.');
+                abort(404, 'I could not find this resource.');
             }
         }
 
diff --git a/app/Http/Middleware/StartupCheck.php b/app/Http/Middleware/StartupCheck.php
index 9bf1e41025f7..5afee5d9380f 100644
--- a/app/Http/Middleware/StartupCheck.php
+++ b/app/Http/Middleware/StartupCheck.php
@@ -60,53 +60,50 @@ class StartupCheck
             }
         }
 
-
         /*Build template cache*/
         if ($request->has('clear_cache') || ! Cache::has('templates')) {
             $this->buildTemplates();
         }
 
         return $next($request);
-
     }
 
-
     private function buildTemplates($name = 'templates')
     {
         $data = [
 
-        'invoice' => [
-            'subject' => EmailTemplateDefaults::emailInvoiceSubject(),
-            'body' => EmailTemplateDefaults::emailInvoiceTemplate(),
+            'invoice' => [
+                'subject' => EmailTemplateDefaults::emailInvoiceSubject(),
+                'body' => EmailTemplateDefaults::emailInvoiceTemplate(),
             ],
-        
-        'quote' => [
-            'subject' => EmailTemplateDefaults::emailQuoteSubject(),
-            'body' => EmailTemplateDefaults::emailQuoteTemplate(),
+
+            'quote' => [
+                'subject' => EmailTemplateDefaults::emailQuoteSubject(),
+                'body' => EmailTemplateDefaults::emailQuoteTemplate(),
             ],
-        'payment' => [
-            'subject' => EmailTemplateDefaults::emailPaymentSubject(),
-            'body' => EmailTemplateDefaults::emailPaymentTemplate(),
+            'payment' => [
+                'subject' => EmailTemplateDefaults::emailPaymentSubject(),
+                'body' => EmailTemplateDefaults::emailPaymentTemplate(),
             ],
-        'reminder1' => [
-            'subject' => EmailTemplateDefaults::emailReminder1Subject(),
-            'body' => EmailTemplateDefaults::emailReminder1Template(),
+            'reminder1' => [
+                'subject' => EmailTemplateDefaults::emailReminder1Subject(),
+                'body' => EmailTemplateDefaults::emailReminder1Template(),
             ],
-        'reminder2' => [
-            'subject' => EmailTemplateDefaults::emailReminder2Subject(),
-            'body' => EmailTemplateDefaults::emailReminder2Template(),
+            'reminder2' => [
+                'subject' => EmailTemplateDefaults::emailReminder2Subject(),
+                'body' => EmailTemplateDefaults::emailReminder2Template(),
             ],
-        'reminder3' => [
-            'subject' => EmailTemplateDefaults::emailReminder3Subject(),
-            'body' => EmailTemplateDefaults::emailReminder3Template(),
+            'reminder3' => [
+                'subject' => EmailTemplateDefaults::emailReminder3Subject(),
+                'body' => EmailTemplateDefaults::emailReminder3Template(),
             ],
-        'reminder_endless' => [
-            'subject' => EmailTemplateDefaults::emailReminderEndlessSubject(),
-            'body' => EmailTemplateDefaults::emailReminderEndlessTemplate(),
+            'reminder_endless' => [
+                'subject' => EmailTemplateDefaults::emailReminderEndlessSubject(),
+                'body' => EmailTemplateDefaults::emailReminderEndlessTemplate(),
             ],
-        'statement' => [
-            'subject' => EmailTemplateDefaults::emailStatementSubject(),
-            'body' => EmailTemplateDefaults::emailStatementTemplate(),
+            'statement' => [
+                'subject' => EmailTemplateDefaults::emailStatementSubject(),
+                'body' => EmailTemplateDefaults::emailStatementTemplate(),
             ],
         ];
 
diff --git a/app/Http/Middleware/TokenAuth.php b/app/Http/Middleware/TokenAuth.php
index 19a255163a4d..0c646ffdd896 100644
--- a/app/Http/Middleware/TokenAuth.php
+++ b/app/Http/Middleware/TokenAuth.php
@@ -32,7 +32,6 @@ class TokenAuth
     public function handle($request, Closure $next)
     {
         if ($request->header('X-API-TOKEN') && ($company_token = CompanyToken::with(['user', 'company'])->where('token', $request->header('X-API-TOKEN'))->first())) {
-            
             $user = $company_token->user;
 
             $error = [
@@ -44,13 +43,12 @@ class TokenAuth
                 return response()->json($error, 403);
             }
 
-            if(Ninja::isHosted() && $company_token->is_system == 0 && !$user->account->isPaid()){
-                
+            if (Ninja::isHosted() && $company_token->is_system == 0 && ! $user->account->isPaid()) {
                 $error = [
                     'message' => 'Feature not available with free / unpaid account.',
                     'errors' => new stdClass,
                 ];
-                
+
                 return response()->json($error, 403);
             }
 
@@ -60,7 +58,7 @@ class TokenAuth
             $truth->setUser($company_token->user);
             $truth->setCompany($company_token->company);
             $truth->setCompanyToken($company_token);
-            
+
             /*
             |
             | Necessary evil here: As we are authenticating on CompanyToken,
@@ -86,7 +84,6 @@ class TokenAuth
             //stateless, don't remember the user.
             auth()->login($user, false);
             auth()->user()->setCompany($company_token->company);
-
         } else {
             $error = [
                 'message' => 'Invalid token',
diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php
index f24207bf730d..912675fec837 100644
--- a/app/Http/Middleware/TrimStrings.php
+++ b/app/Http/Middleware/TrimStrings.php
@@ -21,6 +21,7 @@ class TrimStrings extends Middleware
      * @var array
      */
     protected $except = [
+        'current_password',
         'password',
         'password_confirmation',
     ];
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
index 728b38443112..e50659d7773b 100644
--- a/app/Http/Middleware/TrustProxies.php
+++ b/app/Http/Middleware/TrustProxies.php
@@ -11,8 +11,8 @@
 
 namespace App\Http\Middleware;
 
-use Fideloper\Proxy\TrustProxies as Middleware;
 use Illuminate\Contracts\Config\Repository;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware
@@ -46,8 +46,8 @@ class TrustProxies extends Middleware
      */
     public function __construct(Repository $config)
     {
-        parent::__construct($config);
-    
+        // parent::__construct($config);
+
         if (config('ninja.trusted_proxies')) {
             $this->proxies = config('ninja.trusted_proxies');
         }
diff --git a/app/Http/Middleware/UrlSetDb.php b/app/Http/Middleware/UrlSetDb.php
index 165108db9a41..e51773217eaa 100644
--- a/app/Http/Middleware/UrlSetDb.php
+++ b/app/Http/Middleware/UrlSetDb.php
@@ -30,25 +30,25 @@ class UrlSetDb
      */
     public function handle($request, Closure $next)
     {
-        
         if (config('ninja.db.multi_db_enabled')) {
             $hashids = new Hashids(config('ninja.hash_salt'), 10);
 
             //parse URL hash and set DB
             $segments = explode('-', $request->route('confirmation_code'));
 
-            if(!is_array($segments))
+            if (! is_array($segments)) {
                 return response()->json(['message' => 'Invalid confirmation code'], 403);
+            }
 
             $hashed_db = $hashids->decode($segments[0]);
 
-            if(!is_array($hashed_db) || empty($hashed_db))
+            if (! is_array($hashed_db) || empty($hashed_db)) {
                 return response()->json(['message' => 'Invalid confirmation code'], 403);
+            }
 
             MultiDB::setDB(MultiDB::DB_PREFIX.str_pad($hashed_db[0], 2, '0', STR_PAD_LEFT));
         }
 
         return $next($request);
-
     }
 }
diff --git a/app/Http/Middleware/UserVerified.php b/app/Http/Middleware/UserVerified.php
index 9812af9c01a9..729b9c65864f 100644
--- a/app/Http/Middleware/UserVerified.php
+++ b/app/Http/Middleware/UserVerified.php
@@ -39,17 +39,19 @@ class UserVerified
      */
     public function handle($request, Closure $next)
     {
-        if(Ninja::isSelfHost())
+        if (Ninja::isSelfHost()) {
             return $next($request);
+        }
 
         $error = [
             'message' => 'Email confirmation required.',
             'errors' => new \stdClass,
         ];
 
-        if ($this->user && !$this->user->isVerified()) 
+        if ($this->user && ! $this->user->isVerified()) {
             return response()->json($error, 403);
-        
+        }
+
         return $next($request);
     }
 }
diff --git a/app/Http/Middleware/VendorContactKeyLogin.php b/app/Http/Middleware/VendorContactKeyLogin.php
new file mode 100644
index 000000000000..334f6609c72f
--- /dev/null
+++ b/app/Http/Middleware/VendorContactKeyLogin.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Http\Middleware;
+
+use App\Http\ViewComposers\PortalComposer;
+use App\Libraries\MultiDB;
+use App\Models\Vendor;
+use App\Models\VendorContact;
+use Auth;
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Str;
+
+class VendorContactKeyLogin
+{
+    /**
+     * Handle an incoming request.
+     *
+     * Sets a contact LOGGED IN if an appropriate vendor_hash is provided as a query parameter
+     * OR
+     * If the contact_key is provided in the route
+     *
+     * @param  Request  $request
+     * @param Closure $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if (Auth::guard('vendor')->check()) {
+            Auth::guard('vendor')->logout();
+            $request->session()->invalidate();
+        }
+
+        if ($request->segment(2) && $request->segment(2) == 'magic_link' && $request->segment(3)) {
+            $payload = Cache::get($request->segment(3));
+
+            if (! $payload) {
+                abort(403, 'Link expired.');
+            }
+
+            $contact_email = $payload['email'];
+
+            if ($vendor_contact = VendorContact::where('email', $contact_email)->where('company_id', $payload['company_id'])->first()) {
+                if (empty($vendor_contact->email)) {
+                    $vendor_contact->email = Str::random(15).'@example.com';
+                }
+                $vendor_contact->save();
+
+                auth()->guard('vendor')->loginUsingId($vendor_contact->id, true);
+
+                if ($request->query('redirect') && ! empty($request->query('redirect'))) {
+                    return redirect()->to($request->query('redirect'));
+                }
+
+                return redirect($this->setRedirectPath());
+            }
+        } elseif ($request->segment(3) && config('ninja.db.multi_db_enabled')) {
+            if (MultiDB::findAndSetDbByContactKey($request->segment(3))) {
+                if ($vendor_contact = VendorContact::where('contact_key', $request->segment(3))->first()) {
+                    if (empty($vendor_contact->email)) {
+                        $vendor_contact->email = Str::random(6).'@example.com';
+                    }
+                    $vendor_contact->save();
+
+                    auth()->guard('vendor')->loginUsingId($vendor_contact->id, true);
+
+                    if ($request->query('next')) {
+                        return redirect()->to($request->query('next'));
+                    }
+
+                    return redirect($this->setRedirectPath());
+                }
+            }
+        } elseif ($request->segment(2) && $request->segment(2) == 'key_login' && $request->segment(3)) {
+            if ($vendor_contact = VendorContact::where('contact_key', $request->segment(3))->first()) {
+                if (empty($vendor_contact->email)) {
+                    $vendor_contact->email = Str::random(6).'@example.com';
+                    $vendor_contact->save();
+                }
+
+                auth()->guard('vendor')->loginUsingId($vendor_contact->id, true);
+
+                if ($request->query('next')) {
+                    return redirect($request->query('next'));
+                }
+
+                return redirect($this->setRedirectPath());
+            }
+        } elseif ($request->has('vendor_hash') && config('ninja.db.multi_db_enabled')) {
+            if (MultiDB::findAndSetDbByClientHash($request->input('vendor_hash'))) {
+                if ($client = Vendor::where('vendor_hash', $request->input('vendor_hash'))->first()) {
+                    $primary_contact = $client->primary_contact()->first();
+
+                    if (empty($primary_contact->email)) {
+                        $primary_contact->email = Str::random(6).'@example.com';
+                    }
+                    $primary_contact->save();
+
+                    auth()->guard('vendor')->loginUsingId($primary_contact->id, true);
+
+                    return redirect($this->setRedirectPath());
+                }
+            }
+        } elseif ($request->has('vendor_hash')) {
+            if ($client = Vendor::where('vendor_hash', $request->input('vendor_hash'))->first()) {
+                $primary_contact = $client->primary_contact()->first();
+
+                if (empty($primary_contact->email)) {
+                    $primary_contact->email = Str::random(6).'@example.com';
+                }
+                $primary_contact->save();
+
+                auth()->guard('vendor')->loginUsingId($primary_contact->id, true);
+
+                return redirect($this->setRedirectPath());
+            }
+        } elseif ($request->segment(3)) {
+            if ($vendor_contact = VendorContact::where('contact_key', $request->segment(3))->first()) {
+                if (empty($vendor_contact->email)) {
+                    $vendor_contact->email = Str::random(6).'@example.com';
+                    $vendor_contact->save();
+                }
+
+                auth()->guard('vendor')->loginUsingId($vendor_contact->id, true);
+
+                if ($request->query('next')) {
+                    return redirect($request->query('next'));
+                }
+
+                return redirect($this->setRedirectPath());
+            }
+        }
+        //28-02-2022 middleware should not allow this to progress as we should have redirected by this stage.
+        abort(404, 'Unable to authenticate.');
+
+        return $next($request);
+    }
+
+    private function setRedirectPath()
+    {
+
+        return 'vendor/purchase_orders';
+
+    }
+}
diff --git a/app/Http/Middleware/VendorLocale.php b/app/Http/Middleware/VendorLocale.php
index 490973f00ddb..501bc115d179 100644
--- a/app/Http/Middleware/VendorLocale.php
+++ b/app/Http/Middleware/VendorLocale.php
@@ -27,13 +27,11 @@ class VendorLocale
      */
     public function handle($request, Closure $next)
     {
-
         if (auth()->guard('contact')->check()) {
             auth()->guard('contact')->logout();
             $request->session()->invalidate();
         }
 
-
         /*LOCALE SET */
         if ($request->has('lang')) {
             $locale = $request->input('lang');
@@ -41,13 +39,10 @@ class VendorLocale
         } elseif (auth()->guard('vendor')->user()) {
             App::setLocale(auth()->guard('vendor')->user()->company->locale());
         } elseif (auth()->user()) {
-
-            try{
+            try {
                 App::setLocale(auth()->user()->company()->getLocale());
+            } catch (\Exception $e) {
             }
-            catch(\Exception $e){
-            }
-
         } else {
             App::setLocale(config('ninja.i18n.locale'));
         }
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
index 4925412b28e9..2b10addce70f 100644
--- a/app/Http/Middleware/VerifyCsrfToken.php
+++ b/app/Http/Middleware/VerifyCsrfToken.php
@@ -32,7 +32,6 @@ class VerifyCsrfToken extends Middleware
         // 'livewire/message/*'
     ];
 
-
     // public function handle($request, \Closure $next) {
 
     //     try {
@@ -43,5 +42,4 @@ class VerifyCsrfToken extends Middleware
 
     //     }
     // }
-
 }
diff --git a/app/Http/Requests/Account/CreateAccountRequest.php b/app/Http/Requests/Account/CreateAccountRequest.php
index c073bc59e9b8..ca8fb883ec1f 100644
--- a/app/Http/Requests/Account/CreateAccountRequest.php
+++ b/app/Http/Requests/Account/CreateAccountRequest.php
@@ -36,12 +36,11 @@ class CreateAccountRequest extends Request
      */
     public function rules()
     {
-
-        if(Ninja::isHosted())
-            $email_rules = ['bail','required', 'email:rfc,dns', new NewUniqueUserRule, new BlackListRule, new EmailBlackListRule];
-        else
-            $email_rules = ['bail','required', 'email:rfc,dns', new NewUniqueUserRule];
-
+        if (Ninja::isHosted()) {
+            $email_rules = ['bail', 'required', 'email:rfc,dns', new NewUniqueUserRule, new BlackListRule, new EmailBlackListRule];
+        } else {
+            $email_rules = ['bail', 'required', 'email:rfc,dns', new NewUniqueUserRule];
+        }
 
         return [
             'first_name'        => 'string|max:100',
@@ -53,9 +52,8 @@ class CreateAccountRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
-        
         $input = $this->all();
 
         $input['user_agent'] = request()->server('HTTP_USER_AGENT');
diff --git a/app/Http/Requests/Account/UpdateAccountRequest.php b/app/Http/Requests/Account/UpdateAccountRequest.php
index a3197f51ee63..f39af8be11f5 100644
--- a/app/Http/Requests/Account/UpdateAccountRequest.php
+++ b/app/Http/Requests/Account/UpdateAccountRequest.php
@@ -26,7 +26,7 @@ class UpdateAccountRequest extends Request
      */
     public function authorize()
     {
-        return (auth()->user()->isAdmin() || auth()->user()->isOwner()) && (int)$this->account->id === auth()->user()->account_id;
+        return (auth()->user()->isAdmin() || auth()->user()->isOwner()) && (int) $this->account->id === auth()->user()->account_id;
     }
 
     /**
@@ -37,18 +37,17 @@ class UpdateAccountRequest extends Request
     public function rules()
     {
         return [
-            'set_react_as_default_ap' => 'required|bail|bool'
+            'set_react_as_default_ap' => 'required|bail|bool',
         ];
     }
 
     /* Only allow single field to update account table */
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
-        $cleaned_input = array_intersect_key( $input, array_flip(['set_react_as_default_ap']));
+        $cleaned_input = array_intersect_key($input, array_flip(['set_react_as_default_ap']));
 
         $this->replace($cleaned_input);
-
     }
 }
diff --git a/app/Http/Requests/Chart/ShowChartRequest.php b/app/Http/Requests/Chart/ShowChartRequest.php
index 2b40346303cd..6e268dd68813 100644
--- a/app/Http/Requests/Chart/ShowChartRequest.php
+++ b/app/Http/Requests/Chart/ShowChartRequest.php
@@ -34,17 +34,18 @@ class ShowChartRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
-            if(!array_key_exists('start_date', $input))
-                $input['start_date'] = now()->subDays(20);
+        if (! array_key_exists('start_date', $input)) {
+            $input['start_date'] = now()->subDays(20);
+        }
 
-            if(!array_key_exists('end_date', $input))
-                $input['end_date'] = now();
+        if (! array_key_exists('end_date', $input)) {
+            $input['end_date'] = now();
+        }
 
         $this->replace($input);
-
     }
 }
diff --git a/app/Http/Requests/Client/AdjustClientLedgerRequest.php b/app/Http/Requests/Client/AdjustClientLedgerRequest.php
index fc0fbc3cd7fa..0e3ef26c508c 100644
--- a/app/Http/Requests/Client/AdjustClientLedgerRequest.php
+++ b/app/Http/Requests/Client/AdjustClientLedgerRequest.php
@@ -44,12 +44,10 @@ class AdjustClientLedgerRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
         $this->replace($input);
     }
-
-
 }
diff --git a/app/Http/Requests/Client/EditClientRequest.php b/app/Http/Requests/Client/EditClientRequest.php
index f5d95809ce40..03db1dff22b7 100644
--- a/app/Http/Requests/Client/EditClientRequest.php
+++ b/app/Http/Requests/Client/EditClientRequest.php
@@ -24,5 +24,4 @@ class EditClientRequest extends Request
     {
         return auth()->user()->can('edit', $this->client);
     }
-
 }
diff --git a/app/Http/Requests/Client/StoreClientRequest.php b/app/Http/Requests/Client/StoreClientRequest.php
index 1101d26d60ea..463cc7b4a355 100644
--- a/app/Http/Requests/Client/StoreClientRequest.php
+++ b/app/Http/Requests/Client/StoreClientRequest.php
@@ -25,6 +25,7 @@ use Illuminate\Validation\Rule;
 class StoreClientRequest extends Request
 {
     use MakesHash;
+
     /**
      * Determine if the user is authorized to make this request.
      *
@@ -37,7 +38,6 @@ class StoreClientRequest extends Request
 
     public function rules()
     {
-        
         if ($this->input('documents') && is_array($this->input('documents'))) {
             $documents = count($this->input('documents'));
 
@@ -51,14 +51,14 @@ class StoreClientRequest extends Request
         if (isset($this->number)) {
             $rules['number'] = Rule::unique('clients')->where('company_id', auth()->user()->company()->id);
         }
-        
+
         $rules['country_id'] = 'integer|nullable';
 
-        if(isset($this->currency_code)){
+        if (isset($this->currency_code)) {
             $rules['currency_code'] = 'sometimes|exists:currencies,code';
         }
 
-        if(isset($this->country_code)){
+        if (isset($this->country_code)) {
             $rules['country_code'] = new CountryCodeExistsRule();
         }
 
@@ -68,70 +68,82 @@ class StoreClientRequest extends Request
         $rules['contacts'] = 'array';
         $rules['contacts.*.email'] = 'bail|nullable|distinct|sometimes|email';
         $rules['contacts.*.password'] = [
-                                        'nullable',
-                                        'sometimes',
-                                        'string',
-                                        'min:7',             // must be at least 10 characters in length
-                                        'regex:/[a-z]/',      // must contain at least one lowercase letter
-                                        'regex:/[A-Z]/',      // must contain at least one uppercase letter
-                                        'regex:/[0-9]/',      // must contain at least one digit
-                                        //'regex:/[@$!%*#?&.]/', // must contain a special character
-                                        ];
+            'bail',
+            'nullable',
+            'sometimes',
+            'string',
+            'min:7',             // must be at least 10 characters in length
+            'regex:/[a-z]/',      // must contain at least one lowercase letter
+            'regex:/[A-Z]/',      // must contain at least one uppercase letter
+            'regex:/[0-9]/',      // must contain at least one digit
+            //'regex:/[@$!%*#?&.]/', // must contain a special character
+        ];
 
         if (auth()->user()->company()->account->isFreeHostedClient()) {
             $rules['id'] = new CanStoreClientsRule(auth()->user()->company()->id);
         }
 
-        $rules['number'] = ['nullable',Rule::unique('clients')->where('company_id', auth()->user()->company()->id)];
-        $rules['id_number'] = ['nullable',Rule::unique('clients')->where('company_id', auth()->user()->company()->id)];
+        $rules['number'] = ['bail', 'nullable', Rule::unique('clients')->where('company_id', auth()->user()->company()->id)];
+        $rules['id_number'] = ['bail', 'nullable', Rule::unique('clients')->where('company_id', auth()->user()->company()->id)];
 
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
-        $settings = ClientSettings::defaults();
+        /* Default settings */
+        $settings = (array)ClientSettings::defaults();
 
-        if (array_key_exists('settings', $input) && ! empty($input['settings'])) {
-            foreach ($input['settings'] as $key => $value) {
+        /* Stub settings if they don't exist */
+        if(!array_key_exists('settings', $input))
+            $input['settings'] = [];
+        elseif(is_object($input['settings']))
+            $input['settings'] = (array)$input['settings'];
+        
+        /* Merge default into base settings */
+        $input['settings'] = array_merge($input['settings'], $settings);
 
-                if($key == 'default_task_rate')
-                    $value = floatval($value);
-                
-                $settings->{$key} = $value;
+        /* Type and property enforcement */
+        foreach ($input['settings'] as $key => $value) 
+        {
+            if ($key == 'default_task_rate') {
+                $value = floatval($value);
+                $input['settings'][$key] = $value;
             }
+
+            if($key == 'translations')
+                unset($input['settings']['translations']);
         }
 
+        /* Convert hashed IDs to IDs*/
         $input = $this->decodePrimaryKeys($input);
 
-        if(isset($input['group_settings_id']))
-            $input['group_settings_id'] = $this->decodePrimaryKey($input['group_settings_id']);
-
         //is no settings->currency_id is set then lets dive in and find either a group or company currency all the below may be redundant!!
-        if (! property_exists($settings, 'currency_id') && isset($input['group_settings_id'])) {
-
+        if (! array_key_exists('currency_id', $input['settings']) && isset($input['group_settings_id'])) {
             $group_settings = GroupSetting::find($input['group_settings_id']);
 
             if ($group_settings && property_exists($group_settings->settings, 'currency_id') && isset($group_settings->settings->currency_id)) {
-                $settings->currency_id = (string) $group_settings->settings->currency_id;
+                $input['settings']['currency_id'] = (string) $group_settings->settings->currency_id;
             } else {
-                $settings->currency_id = (string) auth()->user()->company()->settings->currency_id;
+                $input['settings']['currency_id'] = (string) auth()->user()->company()->settings->currency_id;
             }
-        } elseif (! property_exists($settings, 'currency_id')) {
-            $settings->currency_id = (string) auth()->user()->company()->settings->currency_id;
+
+        } elseif (! array_key_exists('currency_id', $input['settings'])) {
+            $input['settings']['currency_id'] = (string) auth()->user()->company()->settings->currency_id;
         }
 
         if (isset($input['currency_code'])) {
-            $settings->currency_id = $this->getCurrencyCode($input['currency_code']);
+            $input['settings']['currency_id'] = $this->getCurrencyCode($input['currency_code']);
         }
 
         if (isset($input['language_code'])) {
-            $settings->language_id = $this->getLanguageId($input['language_code']);
-        }
+            $input['settings']['language_id'] = $this->getLanguageId($input['language_code']);
 
-        $input['settings'] = $settings;
+            if(strlen($input['settings']['language_id']) == 0)
+                unset($input['settings']['language_id']);
+        }
 
         if (isset($input['country_code'])) {
             $input['country_id'] = $this->getCountryCode($input['country_code']);
@@ -141,9 +153,10 @@ class StoreClientRequest extends Request
             $input['shipping_country_id'] = $this->getCountryCode($input['shipping_country_code']);
         }
 
-        /* If there is no number, just unset it here. */
-        if(array_key_exists('number', $input) && ( is_null($input['number']) || empty($input['number'])))
+        /* If there is a client number, just unset it here. */
+        if (array_key_exists('number', $input) && (is_null($input['number']) || empty($input['number']))) {
             unset($input['number']);
+        }
 
         $this->replace($input);
     }
@@ -166,13 +179,13 @@ class StoreClientRequest extends Request
             return $item->locale == $language_code;
         })->first();
 
-        if($language)
+        if ($language) {
             return (string) $language->id;
+        }
 
-        return "";
+        return '';
     }
 
-
     private function getCountryCode($country_code)
     {
         $countries = Cache::get('countries');
@@ -181,10 +194,11 @@ class StoreClientRequest extends Request
             return $item->iso_3166_2 == $country_code || $item->iso_3166_3 == $country_code;
         })->first();
 
-        if($country)
+        if ($country) {
             return (string) $country->id;
+        }
 
-        return "";
+        return '';
     }
 
     private function getCurrencyCode($code)
@@ -195,9 +209,10 @@ class StoreClientRequest extends Request
             return $item->code == $code;
         })->first();
 
-        if($currency)
+        if ($currency) {
             return (string) $currency->id;
+        }
 
-        return "";
+        return '';
     }
 }
diff --git a/app/Http/Requests/Client/UpdateClientRequest.php b/app/Http/Requests/Client/UpdateClientRequest.php
index 5dd6b1f6c9e8..cf0da48a6926 100644
--- a/app/Http/Requests/Client/UpdateClientRequest.php
+++ b/app/Http/Requests/Client/UpdateClientRequest.php
@@ -56,25 +56,27 @@ class UpdateClientRequest extends Request
         //$rules['id_number'] = 'unique:clients,id_number,,id,company_id,' . auth()->user()->company()->id;
         //$rules['id_number'] = 'unique:clients,id_number,'.$this->id.',id,company_id,'.$this->company_id;
 
-        if($this->id_number)
+        if ($this->id_number) {
             $rules['id_number'] = Rule::unique('clients')->where('company_id', auth()->user()->company()->id)->ignore($this->client->id);
-        
-        if($this->number)
+        }
+
+        if ($this->number) {
             $rules['number'] = Rule::unique('clients')->where('company_id', auth()->user()->company()->id)->ignore($this->client->id);
+        }
 
         $rules['settings'] = new ValidClientGroupSettingsRule();
         $rules['contacts'] = 'array';
         $rules['contacts.*.email'] = 'bail|nullable|distinct|sometimes|email';
         $rules['contacts.*.password'] = [
-                                        'nullable',
-                                        'sometimes',
-                                        'string',
-                                        'min:7',             // must be at least 10 characters in length
-                                        'regex:/[a-z]/',      // must contain at least one lowercase letter
-                                        'regex:/[A-Z]/',      // must contain at least one uppercase letter
-                                        'regex:/[0-9]/',      // must contain at least one digit
-                                        //'regex:/[@$!%*#?&.]/', // must contain a special character
-                                        ];
+            'nullable',
+            'sometimes',
+            'string',
+            'min:7',             // must be at least 10 characters in length
+            'regex:/[a-z]/',      // must contain at least one lowercase letter
+            'regex:/[A-Z]/',      // must contain at least one uppercase letter
+            'regex:/[0-9]/',      // must contain at least one digit
+            //'regex:/[@$!%*#?&.]/', // must contain a special character
+        ];
 
         return $rules;
     }
@@ -91,16 +93,12 @@ class UpdateClientRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
-        if (isset($input['group_settings_id'])) {
-            $input['group_settings_id'] = $this->decodePrimaryKey($input['group_settings_id']);
-        }
-
         /* If the user removes the currency we must always set the default */
-        if (array_key_exists('settings', $input)  && ! array_key_exists('currency_id', $input['settings'])) {
+        if (array_key_exists('settings', $input) && ! array_key_exists('currency_id', $input['settings'])) {
             $input['settings']['currency_id'] = (string) auth()->user()->company()->settings->currency_id;
         }
 
@@ -117,7 +115,6 @@ class UpdateClientRequest extends Request
         $this->replace($input);
     }
 
-
     private function getLanguageId($language_code)
     {
         $languages = Cache::get('languages');
@@ -126,13 +123,13 @@ class UpdateClientRequest extends Request
             return $item->locale == $language_code;
         })->first();
 
-        if($language)
+        if ($language) {
             return (string) $language->id;
+        }
 
-        return "";
+        return '';
     }
 
-
     /**
      * For the hosted platform, we restrict the feature settings.
      *
@@ -159,10 +156,9 @@ class UpdateClientRequest extends Request
             }
 
             //26-04-2022 - In case settings are returned as array instead of object
-            if($key == 'default_task_rate' && is_array($settings)){
+            if ($key == 'default_task_rate' && is_array($settings)) {
                 $settings['default_task_rate'] = floatval($value);
-            }
-            elseif($key == 'default_task_rate' && is_object($settings)) {
+            } elseif ($key == 'default_task_rate' && is_object($settings)) {
                 $settings->default_task_rate = floatval($value);
             }
         }
diff --git a/app/Http/Requests/Client/UploadClientRequest.php b/app/Http/Requests/Client/UploadClientRequest.php
index 8a18b8387c06..dba3924e25a5 100644
--- a/app/Http/Requests/Client/UploadClientRequest.php
+++ b/app/Http/Requests/Client/UploadClientRequest.php
@@ -27,13 +27,12 @@ class UploadClientRequest extends Request
 
     public function rules()
     {
+        $rules = [];
 
-    	$rules = [];
-
-		if($this->input('documents'))
+        if ($this->input('documents')) {
             $rules['documents'] = 'file|mimes:csv,png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:2000000';
+        }
 
-    	return $rules;
-
+        return $rules;
     }
 }
diff --git a/app/Http/Requests/ClientGatewayToken/EditClientGatewayTokenRequest.php b/app/Http/Requests/ClientGatewayToken/EditClientGatewayTokenRequest.php
index 21cee2db2666..390202507210 100644
--- a/app/Http/Requests/ClientGatewayToken/EditClientGatewayTokenRequest.php
+++ b/app/Http/Requests/ClientGatewayToken/EditClientGatewayTokenRequest.php
@@ -24,5 +24,4 @@ class EditClientGatewayTokenRequest extends Request
     {
         return auth()->user()->isAdmin();
     }
-
 }
diff --git a/app/Http/Requests/ClientGatewayToken/StoreClientGatewayTokenRequest.php b/app/Http/Requests/ClientGatewayToken/StoreClientGatewayTokenRequest.php
index 14f68992b5af..30521b042a34 100644
--- a/app/Http/Requests/ClientGatewayToken/StoreClientGatewayTokenRequest.php
+++ b/app/Http/Requests/ClientGatewayToken/StoreClientGatewayTokenRequest.php
@@ -45,12 +45,10 @@ class StoreClientGatewayTokenRequest extends Request
             'meta' => 'required',
         ];
 
-
         return $this->globalRules($rules);
-    
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
@@ -64,5 +62,4 @@ class StoreClientGatewayTokenRequest extends Request
         return [
         ];
     }
-
 }
diff --git a/app/Http/Requests/ClientGatewayToken/UpdateClientGatewayTokenRequest.php b/app/Http/Requests/ClientGatewayToken/UpdateClientGatewayTokenRequest.php
index 8ca8a3abf93a..73224e715353 100644
--- a/app/Http/Requests/ClientGatewayToken/UpdateClientGatewayTokenRequest.php
+++ b/app/Http/Requests/ClientGatewayToken/UpdateClientGatewayTokenRequest.php
@@ -36,6 +36,7 @@ class UpdateClientGatewayTokenRequest extends Request
     {
         /* Ensure we have a client name, and that all emails are unique*/
         $rules = [];
+
         return $rules;
     }
 
@@ -45,12 +46,10 @@ class UpdateClientGatewayTokenRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
-
         $this->replace($input);
     }
-
 }
diff --git a/app/Http/Requests/ClientPortal/Contact/ContactPasswordResetRequest.php b/app/Http/Requests/ClientPortal/Contact/ContactPasswordResetRequest.php
index ae18f4507cad..f6dd989601ea 100644
--- a/app/Http/Requests/ClientPortal/Contact/ContactPasswordResetRequest.php
+++ b/app/Http/Requests/ClientPortal/Contact/ContactPasswordResetRequest.php
@@ -27,5 +27,4 @@ class ContactPasswordResetRequest extends FormRequest
             'email' => 'required',
         ];
     }
-
 }
diff --git a/app/Http/Requests/ClientPortal/Credits/ShowCreditRequest.php b/app/Http/Requests/ClientPortal/Credits/ShowCreditRequest.php
index c01afe8cf7ab..dee356bad22c 100644
--- a/app/Http/Requests/ClientPortal/Credits/ShowCreditRequest.php
+++ b/app/Http/Requests/ClientPortal/Credits/ShowCreditRequest.php
@@ -14,7 +14,7 @@ class ShowCreditRequest extends FormRequest
      */
     public function authorize()
     {
-        return !$this->credit->is_deleted
+        return ! $this->credit->is_deleted
             && auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS
             && auth()->guard('contact')->user()->client_id === $this->credit->client_id;
     }
diff --git a/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php b/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php
index c781f6f94195..5a914392e08f 100644
--- a/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php
+++ b/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php
@@ -13,7 +13,6 @@
 namespace App\Http\Requests\ClientPortal\Documents;
 
 use App\Utils\Traits\MakesHash;
-
 use Illuminate\Foundation\Http\FormRequest;
 
 class ShowDocumentRequest extends FormRequest
@@ -27,10 +26,8 @@ class ShowDocumentRequest extends FormRequest
      */
     public function authorize()
     {
-
         return auth()->guard('contact')->user()->client_id == $this->document->documentable_id
             || $this->document->company_id == auth()->guard('contact')->user()->company_id;
-
     }
 
     /**
diff --git a/app/Http/Requests/ClientPortal/Invoices/ShowInvoiceRequest.php b/app/Http/Requests/ClientPortal/Invoices/ShowInvoiceRequest.php
index 8d246f98bdf9..49f1bd87c010 100644
--- a/app/Http/Requests/ClientPortal/Invoices/ShowInvoiceRequest.php
+++ b/app/Http/Requests/ClientPortal/Invoices/ShowInvoiceRequest.php
@@ -23,7 +23,7 @@ class ShowInvoiceRequest extends Request
      */
     public function authorize() : bool
     {
-        return (int)auth()->guard('contact')->user()->client_id === (int)$this->invoice->client_id
-            &&  auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES;
+        return (int) auth()->guard('contact')->user()->client_id === (int) $this->invoice->client_id
+            && auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES;
     }
 }
diff --git a/app/Http/Requests/ClientPortal/PaymentMethod/CreatePaymentMethodRequest.php b/app/Http/Requests/ClientPortal/PaymentMethod/CreatePaymentMethodRequest.php
index cda603051f8d..6450f83f62d3 100644
--- a/app/Http/Requests/ClientPortal/PaymentMethod/CreatePaymentMethodRequest.php
+++ b/app/Http/Requests/ClientPortal/PaymentMethod/CreatePaymentMethodRequest.php
@@ -4,9 +4,9 @@ namespace App\Http\Requests\ClientPortal\PaymentMethod;
 
 use App\Http\Requests\Request;
 use App\Models\Client;
-use Illuminate\Foundation\Http\FormRequest;
 use function auth;
 use function collect;
+use Illuminate\Foundation\Http\FormRequest;
 
 class CreatePaymentMethodRequest extends FormRequest
 {
@@ -27,8 +27,9 @@ class CreatePaymentMethodRequest extends FormRequest
                 $available_methods[] = $method['gateway_type_id'];
             });
 
-        if (in_array($this->query('method'), $available_methods)) 
-            return true;        
+        if (in_array($this->query('method'), $available_methods)) {
+            return true;
+        }
 
         return false;
     }
diff --git a/app/Http/Requests/ClientPortal/PaymentMethod/VerifyPaymentMethodRequest.php b/app/Http/Requests/ClientPortal/PaymentMethod/VerifyPaymentMethodRequest.php
index 12120c59552d..2dd661178711 100644
--- a/app/Http/Requests/ClientPortal/PaymentMethod/VerifyPaymentMethodRequest.php
+++ b/app/Http/Requests/ClientPortal/PaymentMethod/VerifyPaymentMethodRequest.php
@@ -25,7 +25,7 @@ class VerifyPaymentMethodRequest extends FormRequest
     public function rules()
     {
         return [
-            'transactions.*' => 'integer'
+            'transactions.*' => 'integer',
         ];
     }
 }
diff --git a/app/Http/Requests/ClientPortal/Payments/PaymentResponseRequest.php b/app/Http/Requests/ClientPortal/Payments/PaymentResponseRequest.php
index fbfe24f90a4f..f7a1195e072c 100644
--- a/app/Http/Requests/ClientPortal/Payments/PaymentResponseRequest.php
+++ b/app/Http/Requests/ClientPortal/Payments/PaymentResponseRequest.php
@@ -46,13 +46,13 @@ class PaymentResponseRequest extends FormRequest
     {
         if ($this->has('store_card')) {
             $this->merge([
-                'store_card' => ($this->store_card === "true" || $this->store_card === true) ? true : false,
+                'store_card' => ($this->store_card === 'true' || $this->store_card === true) ? true : false,
             ]);
         }
 
         if ($this->has('pay_with_token')) {
             $this->merge([
-                'pay_with_token' => ($this->pay_with_token === "true" || $this->pay_with_token === true) ? true : false,
+                'pay_with_token' => ($this->pay_with_token === 'true' || $this->pay_with_token === true) ? true : false,
             ]);
         }
     }
diff --git a/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php b/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php
index 289ccc7f9b56..6e5e7efc05f5 100644
--- a/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php
+++ b/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php
@@ -13,8 +13,8 @@
 namespace App\Http\Requests\ClientPortal\Quotes;
 
 use App\Http\ViewComposers\PortalComposer;
-use Illuminate\Foundation\Http\FormRequest;
 use function auth;
+use Illuminate\Foundation\Http\FormRequest;
 
 class ProcessQuotesInBulkRequest extends FormRequest
 {
diff --git a/app/Http/Requests/ClientPortal/Quotes/ShowQuoteRequest.php b/app/Http/Requests/ClientPortal/Quotes/ShowQuoteRequest.php
index a510377f322d..f2d5fda84fd6 100644
--- a/app/Http/Requests/ClientPortal/Quotes/ShowQuoteRequest.php
+++ b/app/Http/Requests/ClientPortal/Quotes/ShowQuoteRequest.php
@@ -19,7 +19,7 @@ class ShowQuoteRequest extends FormRequest
 {
     public function authorize()
     {
-         return auth()->guard('contact')->user()->client->id === (int)$this->quote->client_id
+        return auth()->guard('contact')->user()->client->id === (int) $this->quote->client_id
              && auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES;
     }
 
diff --git a/app/Http/Requests/ClientPortal/RegisterRequest.php b/app/Http/Requests/ClientPortal/RegisterRequest.php
index 8b54ccc5488d..6bd835c74417 100644
--- a/app/Http/Requests/ClientPortal/RegisterRequest.php
+++ b/app/Http/Requests/ClientPortal/RegisterRequest.php
@@ -40,7 +40,7 @@ class RegisterRequest extends FormRequest
                 $rules[$field] = array_merge($rules[$field], ['email:rfc,dns', 'max:255']);
             }
 
-            if ($field === 'password') {
+            if ($field === 'current_password') {
                 $rules[$field] = array_merge($rules[$field], ['string', 'min:6', 'confirmed']);
             }
         }
@@ -56,24 +56,25 @@ class RegisterRequest extends FormRequest
     {
 
         //this should be all we need, the rest SHOULD be redundant because of our Middleware
-        if ($this->key)
+        if ($this->key) {
             return Company::where('company_key', $this->key)->first();
+        }
 
         if ($this->company_key) {
             return Company::where('company_key', $this->company_key)->firstOrFail();
         }
 
-        if (!$this->route()->parameter('company_key') && Ninja::isSelfHost()) {
+        if (! $this->route()->parameter('company_key') && Ninja::isSelfHost()) {
             $company = Account::first()->default_company;
 
-            if(!$company->client_can_register)
-                abort(403, "This page is restricted");
+            if (! $company->client_can_register) {
+                abort(403, 'This page is restricted');
+            }
 
             return $company;
         }
 
         if (Ninja::isHosted()) {
-
             $subdomain = explode('.', $this->getHost())[0];
 
             $query = [
@@ -81,17 +82,18 @@ class RegisterRequest extends FormRequest
                 'portal_mode' => 'subdomain',
             ];
 
-            if($company = MultiDB::findAndSetDbByDomain($query))
+            if ($company = MultiDB::findAndSetDbByDomain($query)) {
                 return $company;
+            }
 
             $query = [
                 'portal_domain' => $this->getSchemeAndHttpHost(),
                 'portal_mode' => 'domain',
             ];
 
-            if($company = MultiDB::findAndSetDbByDomain($query))
+            if ($company = MultiDB::findAndSetDbByDomain($query)) {
                 return $company;
-
+            }
         }
 
         abort(400, 'Register request not found.');
diff --git a/app/Http/Requests/ClientPortal/Statements/ShowStatementRequest.php b/app/Http/Requests/ClientPortal/Statements/ShowStatementRequest.php
index aa571296526a..c263248e83bb 100644
--- a/app/Http/Requests/ClientPortal/Statements/ShowStatementRequest.php
+++ b/app/Http/Requests/ClientPortal/Statements/ShowStatementRequest.php
@@ -34,7 +34,7 @@ class ShowStatementRequest extends FormRequest
      *
      * @return void
      */
-    protected function prepareForValidation(): void
+    public function prepareForValidation(): void
     {
         $this->merge([
             'show_payments_table' => $this->has('show_payments_table') ? \boolval($this->show_payments_table) : false,
diff --git a/app/Http/Requests/ClientPortal/Subscriptions/ShowPlanSwitchRequest.php b/app/Http/Requests/ClientPortal/Subscriptions/ShowPlanSwitchRequest.php
index 0764ad47eeac..a3fe7e8fb2a3 100644
--- a/app/Http/Requests/ClientPortal/Subscriptions/ShowPlanSwitchRequest.php
+++ b/app/Http/Requests/ClientPortal/Subscriptions/ShowPlanSwitchRequest.php
@@ -17,8 +17,7 @@ class ShowPlanSwitchRequest extends FormRequest
      */
     public function authorize()
     {
-        
-        return (bool)$this->recurring_invoice->subscription->allow_plan_changes;
+        return (bool) $this->recurring_invoice->subscription->allow_plan_changes;
     }
 
     /**
diff --git a/app/Http/Requests/ClientPortal/Tasks/ShowTasksRequest.php b/app/Http/Requests/ClientPortal/Tasks/ShowTasksRequest.php
index 76accc3f42f2..fb408a2d869c 100644
--- a/app/Http/Requests/ClientPortal/Tasks/ShowTasksRequest.php
+++ b/app/Http/Requests/ClientPortal/Tasks/ShowTasksRequest.php
@@ -23,7 +23,7 @@ class ShowTasksRequest extends FormRequest
      */
     public function authorize()
     {
-        return (bool)auth()->guard('contact')->user()->client->getSetting('enable_client_portal_tasks');
+        return (bool) auth()->guard('contact')->user()->client->getSetting('enable_client_portal_tasks');
     }
 
     /**
diff --git a/app/Http/Requests/Company/DefaultCompanyRequest.php b/app/Http/Requests/Company/DefaultCompanyRequest.php
index 266ea07772ce..c2f9da3ac9cf 100644
--- a/app/Http/Requests/Company/DefaultCompanyRequest.php
+++ b/app/Http/Requests/Company/DefaultCompanyRequest.php
@@ -27,10 +27,8 @@ class DefaultCompanyRequest extends Request
 
     public function rules()
     {
-    	
-    	$rules = [];
-
-    	return $rules;
+        $rules = [];
 
+        return $rules;
     }
 }
diff --git a/app/Http/Requests/Company/EditCompanyRequest.php b/app/Http/Requests/Company/EditCompanyRequest.php
index d2bf40a98234..c045ab79246d 100644
--- a/app/Http/Requests/Company/EditCompanyRequest.php
+++ b/app/Http/Requests/Company/EditCompanyRequest.php
@@ -32,7 +32,7 @@ class EditCompanyRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Company/StoreCompanyRequest.php b/app/Http/Requests/Company/StoreCompanyRequest.php
index 684dca281740..da6b9b141f9d 100644
--- a/app/Http/Requests/Company/StoreCompanyRequest.php
+++ b/app/Http/Requests/Company/StoreCompanyRequest.php
@@ -47,19 +47,17 @@ class StoreCompanyRequest extends Request
         if (isset($input['portal_mode']) && ($input['portal_mode'] == 'domain' || $input['portal_mode'] == 'iframe')) {
             $rules['portal_domain'] = 'sometimes|url';
         } else {
-           
-            if(Ninja::isHosted()){
+            if (Ninja::isHosted()) {
                 $rules['subdomain'] = ['nullable', 'regex:/^[a-zA-Z0-9][a-zA-Z0-9.-]+[a-zA-Z0-9]$/', new ValidSubdomain($this->all())];
-            }
-            else
+            } else {
                 $rules['subdomain'] = 'nullable|alpha_num';
-           
+            }
         }
 
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
@@ -77,8 +75,9 @@ class StoreCompanyRequest extends Request
             }
         }
 
-        if(array_key_exists('portal_domain', $input))
+        if (array_key_exists('portal_domain', $input)) {
             $input['portal_domain'] = strtolower($input['portal_domain']);
+        }
 
         $this->replace($input);
     }
diff --git a/app/Http/Requests/Company/UpdateCompanyRequest.php b/app/Http/Requests/Company/UpdateCompanyRequest.php
index 06fafc82bccc..37cf05e5400e 100644
--- a/app/Http/Requests/Company/UpdateCompanyRequest.php
+++ b/app/Http/Requests/Company/UpdateCompanyRequest.php
@@ -35,7 +35,7 @@ class UpdateCompanyRequest extends Request
     public function rules()
     {
         $input = $this->all();
-        
+
         $rules = [];
 
         $rules['company_logo'] = 'mimes:jpeg,jpg,png,gif|max:10000'; // max 10000kb
@@ -49,32 +49,28 @@ class UpdateCompanyRequest extends Request
         if (isset($input['portal_mode']) && ($input['portal_mode'] == 'domain' || $input['portal_mode'] == 'iframe')) {
             $rules['portal_domain'] = 'sometimes|url';
         } else {
-
-            if(Ninja::isHosted()){
+            if (Ninja::isHosted()) {
                 $rules['subdomain'] = ['nullable', 'regex:/^[a-zA-Z0-9.-]+[a-zA-Z0-9]$/', new ValidSubdomain($this->all())];
-            }
-            else
+            } else {
                 $rules['subdomain'] = 'nullable|alpha_num';
+            }
         }
 
-        // if($this->company->account->isPaidHostedClient()) {
-        //     return $settings;
-        // }
-
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
+    
         $input = $this->all();
 
-        if(Ninja::isHosted() && array_key_exists('portal_domain', $input) && strlen($input['portal_domain']) > 1){
+        if (Ninja::isHosted() && array_key_exists('portal_domain', $input) && strlen($input['portal_domain']) > 1) {
             $input['portal_domain'] = $this->addScheme($input['portal_domain']);
             $input['portal_domain'] = strtolower($input['portal_domain']);
         }
 
         if (array_key_exists('settings', $input)) {
-            $input['settings'] = $this->filterSaveableSettings($input['settings']);
+            $input['settings'] = (array)$this->filterSaveableSettings($input['settings']);
         }
 
         $this->replace($input);
@@ -111,12 +107,10 @@ class UpdateCompanyRequest extends Request
 
     private function addScheme($url, $scheme = 'https://')
     {
+        $url = str_replace('http://', '', $url);
 
-      $url = str_replace("http://", "", $url);
-
-      $url =  parse_url($url, PHP_URL_SCHEME) === null ? $scheme . $url : $url;
-
-      return rtrim($url, '/');
+        $url = parse_url($url, PHP_URL_SCHEME) === null ? $scheme.$url : $url;
 
+        return rtrim($url, '/');
     }
 }
diff --git a/app/Http/Requests/Company/UploadCompanyRequest.php b/app/Http/Requests/Company/UploadCompanyRequest.php
index ec3783f48d92..a4b987d11e94 100644
--- a/app/Http/Requests/Company/UploadCompanyRequest.php
+++ b/app/Http/Requests/Company/UploadCompanyRequest.php
@@ -27,13 +27,12 @@ class UploadCompanyRequest extends Request
 
     public function rules()
     {
-    	
-    	$rules = [];
+        $rules = [];
 
-		if($this->input('documents'))
+        if ($this->input('documents')) {
             $rules['documents'] = 'file|mimes:png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:20000';
+        }
 
-    	return $rules;
-
+        return $rules;
     }
 }
diff --git a/app/Http/Requests/CompanyGateway/DestroyCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/DestroyCompanyGatewayRequest.php
index f17cbc62b8f4..59fc1636c44a 100644
--- a/app/Http/Requests/CompanyGateway/DestroyCompanyGatewayRequest.php
+++ b/app/Http/Requests/CompanyGateway/DestroyCompanyGatewayRequest.php
@@ -32,7 +32,7 @@ class DestroyCompanyGatewayRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/CompanyGateway/EditCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/EditCompanyGatewayRequest.php
index dc609f5c0f85..dc7b89656e1d 100644
--- a/app/Http/Requests/CompanyGateway/EditCompanyGatewayRequest.php
+++ b/app/Http/Requests/CompanyGateway/EditCompanyGatewayRequest.php
@@ -32,7 +32,7 @@ class EditCompanyGatewayRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/CompanyGateway/ShowCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/ShowCompanyGatewayRequest.php
index 6a07f72022f1..76cff6888344 100644
--- a/app/Http/Requests/CompanyGateway/ShowCompanyGatewayRequest.php
+++ b/app/Http/Requests/CompanyGateway/ShowCompanyGatewayRequest.php
@@ -32,7 +32,7 @@ class ShowCompanyGatewayRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/CompanyGateway/StoreCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/StoreCompanyGatewayRequest.php
index 8dd856470ca6..cd013302c085 100644
--- a/app/Http/Requests/CompanyGateway/StoreCompanyGatewayRequest.php
+++ b/app/Http/Requests/CompanyGateway/StoreCompanyGatewayRequest.php
@@ -25,7 +25,6 @@ class StoreCompanyGatewayRequest extends Request
      *
      * @return bool
      */
-    
     public function authorize() : bool
     {
         return auth()->user()->isAdmin();
@@ -41,39 +40,31 @@ class StoreCompanyGatewayRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
-        
-        if($gateway = Gateway::where('key', $input['gateway_key'])->first())
-        {
-
+        if ($gateway = Gateway::where('key', $input['gateway_key'])->first()) {
             $default_gateway_fields = json_decode($gateway->fields);
 
             /*Force gateway properties */
             if (isset($input['config']) && is_object(json_decode($input['config']))) {
-
                 foreach (json_decode($input['config']) as $key => $value) {
-
                     $default_gateway_fields->{$key} = $value;
-
                 }
 
                 $input['config'] = json_encode($default_gateway_fields);
-
             }
 
-            if (isset($input['config'])) 
+            if (isset($input['config'])) {
                 $input['config'] = encrypt($input['config']);
-            
-            if (isset($input['fees_and_limits'])) 
+            }
+
+            if (isset($input['fees_and_limits'])) {
                 $input['fees_and_limits'] = $this->cleanFeesAndLimits($input['fees_and_limits']);
-        
+            }
         }
 
         $this->replace($input);
     }
-
-
 }
diff --git a/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php
index 4d8b2dfbe00e..4267f3726515 100644
--- a/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php
+++ b/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php
@@ -39,7 +39,7 @@ class UpdateCompanyGatewayRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
@@ -61,8 +61,9 @@ class UpdateCompanyGatewayRequest extends Request
             $input['fees_and_limits'] = $this->cleanFeesAndLimits($input['fees_and_limits']);
         }
 
-        if (isset($input['token_billing']) && $input['token_billing'] == 'disabled') 
+        if (isset($input['token_billing']) && $input['token_billing'] == 'disabled') {
             $input['token_billing'] = 'off';
+        }
 
         $this->replace($input);
     }
diff --git a/app/Http/Requests/Credit/CreateCreditRequest.php b/app/Http/Requests/Credit/CreateCreditRequest.php
index fcab09a7ff7b..3b6191fe52c8 100644
--- a/app/Http/Requests/Credit/CreateCreditRequest.php
+++ b/app/Http/Requests/Credit/CreateCreditRequest.php
@@ -9,7 +9,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Http\Requests\Credit;
 
 use App\Http\Requests\Request;
diff --git a/app/Http/Requests/Credit/DestroyCreditRequest.php b/app/Http/Requests/Credit/DestroyCreditRequest.php
index 050350c672b9..430a5dffaa05 100644
--- a/app/Http/Requests/Credit/DestroyCreditRequest.php
+++ b/app/Http/Requests/Credit/DestroyCreditRequest.php
@@ -9,7 +9,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Http\Requests\Credit;
 
 use App\Http\Requests\Request;
diff --git a/app/Http/Requests/Credit/EditCreditRequest.php b/app/Http/Requests/Credit/EditCreditRequest.php
index 1cc9a3f02001..8627457f03e3 100644
--- a/app/Http/Requests/Credit/EditCreditRequest.php
+++ b/app/Http/Requests/Credit/EditCreditRequest.php
@@ -9,7 +9,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Http\Requests\Credit;
 
 use App\Http\Requests\Request;
diff --git a/app/Http/Requests/Credit/ShowCreditRequest.php b/app/Http/Requests/Credit/ShowCreditRequest.php
index ff29602efa71..61d62da6423a 100644
--- a/app/Http/Requests/Credit/ShowCreditRequest.php
+++ b/app/Http/Requests/Credit/ShowCreditRequest.php
@@ -9,7 +9,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Http\Requests\Credit;
 
 use App\Http\Requests\Request;
diff --git a/app/Http/Requests/Credit/StoreCreditRequest.php b/app/Http/Requests/Credit/StoreCreditRequest.php
index 05374281e1fc..6258893af516 100644
--- a/app/Http/Requests/Credit/StoreCreditRequest.php
+++ b/app/Http/Requests/Credit/StoreCreditRequest.php
@@ -57,19 +57,19 @@ class StoreCreditRequest extends Request
 
         // $rules['number'] = new UniqueCreditNumberRule($this->all());
         $rules['number'] = ['nullable', Rule::unique('credits')->where('company_id', auth()->user()->company()->id)];
-        $rules['discount']  = 'sometimes|numeric';
+        $rules['discount'] = 'sometimes|numeric';
         $rules['is_amount_discount'] = ['boolean'];
-        
-        
-        if($this->invoice_id)
+
+        if ($this->invoice_id) {
             $rules['invoice_id'] = new ValidInvoiceCreditRule();
+        }
 
         $rules['line_items'] = 'array';
 
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Credit/UpdateCreditRequest.php b/app/Http/Requests/Credit/UpdateCreditRequest.php
index be42ffde5e5d..ae10af3b75e5 100644
--- a/app/Http/Requests/Credit/UpdateCreditRequest.php
+++ b/app/Http/Requests/Credit/UpdateCreditRequest.php
@@ -9,7 +9,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Http\Requests\Credit;
 
 use App\Http\Requests\Request;
@@ -53,17 +52,18 @@ class UpdateCreditRequest extends Request
             $rules['documents'] = 'file|mimes:png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:20000';
         }
 
-        if($this->number)
+        if ($this->number) {
             $rules['number'] = Rule::unique('credits')->where('company_id', auth()->user()->company()->id)->ignore($this->credit->id);
+        }
 
         $rules['line_items'] = 'array';
-        $rules['discount']  = 'sometimes|numeric';
+        $rules['discount'] = 'sometimes|numeric';
         $rules['is_amount_discount'] = ['boolean'];
-        
+
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
@@ -72,7 +72,7 @@ class UpdateCreditRequest extends Request
         if (isset($input['line_items'])) {
             $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
         }
-        
+
         $input['id'] = $this->credit->id;
 
         $this->replace($input);
diff --git a/app/Http/Requests/Credit/UploadCreditRequest.php b/app/Http/Requests/Credit/UploadCreditRequest.php
index 29c0e6a097e7..617b8c51d6ae 100644
--- a/app/Http/Requests/Credit/UploadCreditRequest.php
+++ b/app/Http/Requests/Credit/UploadCreditRequest.php
@@ -27,13 +27,12 @@ class UploadCreditRequest extends Request
 
     public function rules()
     {
+        $rules = [];
 
-    	$rules = [];
-
-		if($this->input('documents'))
+        if ($this->input('documents')) {
             $rules['documents'] = 'file|mimes:csv,png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:2000000';
+        }
 
-    	return $rules;
-
+        return $rules;
     }
 }
diff --git a/app/Http/Requests/Design/DefaultDesignRequest.php b/app/Http/Requests/Design/DefaultDesignRequest.php
index 92270f73db70..33ba3e06a954 100644
--- a/app/Http/Requests/Design/DefaultDesignRequest.php
+++ b/app/Http/Requests/Design/DefaultDesignRequest.php
@@ -33,12 +33,12 @@ class DefaultDesignRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
         $input = $this->decodePrimaryKeys($input);
-        
+
         $this->replace($input);
     }
 }
diff --git a/app/Http/Requests/Design/StoreDesignRequest.php b/app/Http/Requests/Design/StoreDesignRequest.php
index 6368204676bc..9d23cf40144a 100644
--- a/app/Http/Requests/Design/StoreDesignRequest.php
+++ b/app/Http/Requests/Design/StoreDesignRequest.php
@@ -34,7 +34,7 @@ class StoreDesignRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
@@ -49,11 +49,11 @@ class StoreDesignRequest extends Request
         if (! array_key_exists('includes', $input['design']) || is_null($input['design']['includes'])) {
             $input['design']['includes'] = '';
         }
-        
+
         if (! array_key_exists('footer', $input['design']) || is_null($input['design']['footer'])) {
             $input['design']['footer'] = '';
         }
-        
+
         if (! array_key_exists('header', $input['design']) || is_null($input['design']['header'])) {
             $input['design']['header'] = '';
         }
diff --git a/app/Http/Requests/Design/UpdateDesignRequest.php b/app/Http/Requests/Design/UpdateDesignRequest.php
index a1796a0c09fe..33eaf62397ee 100644
--- a/app/Http/Requests/Design/UpdateDesignRequest.php
+++ b/app/Http/Requests/Design/UpdateDesignRequest.php
@@ -33,7 +33,7 @@ class UpdateDesignRequest extends Request
         return [];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
@@ -48,7 +48,7 @@ class UpdateDesignRequest extends Request
         if (! array_key_exists('includes', $input['design']) || is_null($input['design']['includes'])) {
             $input['design']['includes'] = '';
         }
-        
+
         if (! array_key_exists('footer', $input['design']) || is_null($input['design']['footer'])) {
             $input['design']['footer'] = '';
         }
diff --git a/app/Http/Requests/Document/StoreDocumentRequest.php b/app/Http/Requests/Document/StoreDocumentRequest.php
index 0f80d3868ac5..2a002f2dd23a 100644
--- a/app/Http/Requests/Document/StoreDocumentRequest.php
+++ b/app/Http/Requests/Document/StoreDocumentRequest.php
@@ -32,7 +32,7 @@ class StoreDocumentRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Document/UpdateDocumentRequest.php b/app/Http/Requests/Document/UpdateDocumentRequest.php
index a071665552b9..c075a3ca6703 100644
--- a/app/Http/Requests/Document/UpdateDocumentRequest.php
+++ b/app/Http/Requests/Document/UpdateDocumentRequest.php
@@ -33,7 +33,7 @@ class UpdateDocumentRequest extends Request
         return [];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Email/SendEmailRequest.php b/app/Http/Requests/Email/SendEmailRequest.php
index 3cfcc61a9365..291a1108aea5 100644
--- a/app/Http/Requests/Email/SendEmailRequest.php
+++ b/app/Http/Requests/Email/SendEmailRequest.php
@@ -43,7 +43,7 @@ class SendEmailRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Expense/BulkExpenseRequest.php b/app/Http/Requests/Expense/BulkExpenseRequest.php
index 20d9cd36db2c..92fd544687a0 100644
--- a/app/Http/Requests/Expense/BulkExpenseRequest.php
+++ b/app/Http/Requests/Expense/BulkExpenseRequest.php
@@ -9,7 +9,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Http\Requests\Expense;
 
 use App\Http\Requests\Request;
diff --git a/app/Http/Requests/Expense/StoreExpenseRequest.php b/app/Http/Requests/Expense/StoreExpenseRequest.php
index 438d8683db58..90b0734a41c6 100644
--- a/app/Http/Requests/Expense/StoreExpenseRequest.php
+++ b/app/Http/Requests/Expense/StoreExpenseRequest.php
@@ -36,16 +36,18 @@ class StoreExpenseRequest extends Request
     {
         $rules = [];
 
-        if ($this->number) 
+        if ($this->number) {
             $rules['number'] = Rule::unique('expenses')->where('company_id', auth()->user()->company()->id);
-        
-        if(!empty($this->client_id))
+        }
+
+        if (! empty($this->client_id)) {
             $rules['client_id'] = 'bail|sometimes|exists:clients,id,company_id,'.auth()->user()->company()->id;
+        }
 
         return $this->globalRules($rules);
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
@@ -56,11 +58,12 @@ class StoreExpenseRequest extends Request
         }
 
         if (! array_key_exists('currency_id', $input) || strlen($input['currency_id']) == 0) {
-            $input['currency_id'] = (string)auth()->user()->company()->settings->currency_id;
+            $input['currency_id'] = (string) auth()->user()->company()->settings->currency_id;
         }
 
-        if(array_key_exists('color', $input) && is_null($input['color']))
+        if (array_key_exists('color', $input) && is_null($input['color'])) {
             $input['color'] = '';
+        }
 
         $this->replace($input);
     }
diff --git a/app/Http/Requests/Expense/UpdateExpenseRequest.php b/app/Http/Requests/Expense/UpdateExpenseRequest.php
index f18b223a2db3..e1e0ad094470 100644
--- a/app/Http/Requests/Expense/UpdateExpenseRequest.php
+++ b/app/Http/Requests/Expense/UpdateExpenseRequest.php
@@ -56,7 +56,7 @@ class UpdateExpenseRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
@@ -71,7 +71,7 @@ class UpdateExpenseRequest extends Request
         }
 
         if (! array_key_exists('currency_id', $input) || strlen($input['currency_id']) == 0) {
-            $input['currency_id'] = (string)auth()->user()->company()->settings->currency_id;
+            $input['currency_id'] = (string) auth()->user()->company()->settings->currency_id;
         }
 
         $this->replace($input);
diff --git a/app/Http/Requests/Expense/UploadExpenseRequest.php b/app/Http/Requests/Expense/UploadExpenseRequest.php
index 219d75c7b827..2455541274b7 100644
--- a/app/Http/Requests/Expense/UploadExpenseRequest.php
+++ b/app/Http/Requests/Expense/UploadExpenseRequest.php
@@ -27,13 +27,12 @@ class UploadExpenseRequest extends Request
 
     public function rules()
     {
+        $rules = [];
 
-    	$rules = [];
-
-		if($this->input('documents'))
+        if ($this->input('documents')) {
             $rules['documents'] = 'file|mimes:csv,png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:2000000';
+        }
 
-    	return $rules;
-
+        return $rules;
     }
 }
diff --git a/app/Http/Requests/ExpenseCategory/BulkExpenseCategoryRequest.php b/app/Http/Requests/ExpenseCategory/BulkExpenseCategoryRequest.php
index a8f359a0dd35..766b141b7f63 100644
--- a/app/Http/Requests/ExpenseCategory/BulkExpenseCategoryRequest.php
+++ b/app/Http/Requests/ExpenseCategory/BulkExpenseCategoryRequest.php
@@ -9,7 +9,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Http\Requests\ExpenseCategory;
 
 use App\Http\Requests\Request;
diff --git a/app/Http/Requests/ExpenseCategory/StoreExpenseCategoryRequest.php b/app/Http/Requests/ExpenseCategory/StoreExpenseCategoryRequest.php
index 4e926177c63a..441eda1dd10d 100644
--- a/app/Http/Requests/ExpenseCategory/StoreExpenseCategoryRequest.php
+++ b/app/Http/Requests/ExpenseCategory/StoreExpenseCategoryRequest.php
@@ -16,7 +16,6 @@ use App\Models\ExpenseCategory;
 
 class StoreExpenseCategoryRequest extends Request
 {
-
     /**
      * Determine if the user is authorized to make this request.
      *
@@ -36,15 +35,16 @@ class StoreExpenseCategoryRequest extends Request
         return $this->globalRules($rules);
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
         $input = $this->decodePrimaryKeys($input);
 
-        if(array_key_exists('color', $input) && is_null($input['color']))
+        if (array_key_exists('color', $input) && is_null($input['color'])) {
             $input['color'] = '';
+        }
 
         $this->replace($input);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Http/Requests/ExpenseCategory/UpdateExpenseCategoryRequest.php b/app/Http/Requests/ExpenseCategory/UpdateExpenseCategoryRequest.php
index 3b751345a03f..a70ba54b20a5 100644
--- a/app/Http/Requests/ExpenseCategory/UpdateExpenseCategoryRequest.php
+++ b/app/Http/Requests/ExpenseCategory/UpdateExpenseCategoryRequest.php
@@ -34,20 +34,20 @@ class UpdateExpenseCategoryRequest extends Request
         $rules = [];
 
         if ($this->input('name')) {
-           // $rules['name'] = 'unique:expense_categories,name,'.$this->id.',id,company_id,'.$this->expense_category->company_id;
+            // $rules['name'] = 'unique:expense_categories,name,'.$this->id.',id,company_id,'.$this->expense_category->company_id;
             $rules['name'] = Rule::unique('expense_categories')->where('company_id', auth()->user()->company()->id)->ignore($this->expense_category->id);
-
         }
 
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
-            if(array_key_exists('color', $input) && is_null($input['color']))
-                $input['color'] = '';
+        if (array_key_exists('color', $input) && is_null($input['color'])) {
+            $input['color'] = '';
+        }
 
         $this->replace($input);
     }
diff --git a/app/Http/Requests/Export/StoreExportRequest.php b/app/Http/Requests/Export/StoreExportRequest.php
index 8bd27de687fb..26c7f2a58ce0 100644
--- a/app/Http/Requests/Export/StoreExportRequest.php
+++ b/app/Http/Requests/Export/StoreExportRequest.php
@@ -9,14 +9,12 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Http\Requests\Export;
 
 use App\Http\Requests\Request;
 
 class StoreExportRequest extends Request
 {
-
     /**
      * Determine if the user is authorized to make this request.
      *
diff --git a/app/Http/Requests/Gateways/GoCardless/IbpRequest.php b/app/Http/Requests/Gateways/GoCardless/IbpRequest.php
index 5fb41a7edc04..33fa3340e2fd 100644
--- a/app/Http/Requests/Gateways/GoCardless/IbpRequest.php
+++ b/app/Http/Requests/Gateways/GoCardless/IbpRequest.php
@@ -12,13 +12,13 @@
 
 namespace App\Http\Requests\Gateways\GoCardless;
 
+use App\Libraries\MultiDB;
 use App\Models\Client;
 use App\Models\Company;
 use App\Models\CompanyGateway;
 use App\Models\PaymentHash;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Foundation\Http\FormRequest;
-use App\Libraries\MultiDB;
 
 class IbpRequest extends FormRequest
 {
diff --git a/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php b/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php
index 166bf2504164..5249aec571e5 100644
--- a/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php
+++ b/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php
@@ -37,7 +37,7 @@ class StoreGroupSettingRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php b/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php
index 887b963700da..6dd355849093 100644
--- a/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php
+++ b/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php
@@ -36,7 +36,7 @@ class UpdateGroupSettingRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/GroupSetting/UploadGroupSettingRequest.php b/app/Http/Requests/GroupSetting/UploadGroupSettingRequest.php
index e7d9b9de29b5..5c7d84562da3 100644
--- a/app/Http/Requests/GroupSetting/UploadGroupSettingRequest.php
+++ b/app/Http/Requests/GroupSetting/UploadGroupSettingRequest.php
@@ -27,13 +27,12 @@ class UploadGroupSettingRequest extends Request
 
     public function rules()
     {
+        $rules = [];
 
-    	$rules = [];
-
-		if($this->input('documents'))
+        if ($this->input('documents')) {
             $rules['documents'] = 'file|mimes:csv,png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:2000000';
+        }
 
-    	return $rules;
-
+        return $rules;
     }
 }
diff --git a/app/Http/Requests/Import/ImportRequest.php b/app/Http/Requests/Import/ImportRequest.php
index 53ba09eb4757..5fafed626bef 100644
--- a/app/Http/Requests/Import/ImportRequest.php
+++ b/app/Http/Requests/Import/ImportRequest.php
@@ -28,12 +28,12 @@ class ImportRequest extends Request
     public function rules()
     {
         return [
-			'import_type' => 'required',
+            'import_type' => 'required',
             'files' => 'required_without:hash|array|min:1|max:6',
             'hash' => 'nullable|string',
             'column_map' => 'required_with:hash|array',
             'skip_header' => 'required_with:hash|boolean',
-			'files.*' => 'file|mimes:csv,txt',
+            'files.*' => 'file|mimes:csv,txt',
         ];
     }
 }
diff --git a/app/Http/Requests/Import/PreImportRequest.php b/app/Http/Requests/Import/PreImportRequest.php
index 359929541fe0..6c72cbb88fea 100644
--- a/app/Http/Requests/Import/PreImportRequest.php
+++ b/app/Http/Requests/Import/PreImportRequest.php
@@ -28,7 +28,7 @@ class PreImportRequest extends Request
     public function rules()
     {
         return [
-			'files.*' => 'file|mimes:csv,txt',
+            'files.*' => 'file|mimes:csv,txt',
             'files' => 'required|array|min:1|max:6',
             'import_type' => 'required',
         ];
diff --git a/app/Http/Requests/Invoice/ActionInvoiceRequest.php b/app/Http/Requests/Invoice/ActionInvoiceRequest.php
index 6bc889813439..ff19f7e547c7 100644
--- a/app/Http/Requests/Invoice/ActionInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/ActionInvoiceRequest.php
@@ -20,6 +20,7 @@ class ActionInvoiceRequest extends Request
 {
     use MakesHash;
     use ActionsInvoice;
+
     /**
      * Determine if the user is authorized to make this request.
      *
@@ -30,32 +31,32 @@ class ActionInvoiceRequest extends Request
     // private $invoice;
 
     public function authorize() : bool
-    { 
+    {
         return auth()->user()->can('edit', $this->invoice);
     }
 
     public function rules()
     {
         return [
-            'action' => 'required'
+            'action' => 'required',
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
-        if($this->action){
+        if ($this->action) {
             $input['action'] = $this->action;
-        } elseif (!array_key_exists('action', $input) ) {
+        } elseif (! array_key_exists('action', $input)) {
             $this->error_msg = 'Action is a required field';
-        } elseif (!$this->invoiceDeletable($this->invoice)) {
+        } elseif (! $this->invoiceDeletable($this->invoice)) {
             unset($input['action']);
             $this->error_msg = 'This invoice cannot be deleted';
-        } elseif (!$this->invoiceCancellable($this->invoice)) {
+        } elseif (! $this->invoiceCancellable($this->invoice)) {
             unset($input['action']);
             $this->error_msg = 'This invoice cannot be cancelled';
-        } elseif (!$this->invoiceReversable($this->invoice)) {
+        } elseif (! $this->invoiceReversable($this->invoice)) {
             unset($input['action']);
             $this->error_msg = 'This invoice cannot be reversed';
         }
diff --git a/app/Http/Requests/Invoice/StoreInvoiceRequest.php b/app/Http/Requests/Invoice/StoreInvoiceRequest.php
index d8e05af55f3a..2cb1535c5bee 100644
--- a/app/Http/Requests/Invoice/StoreInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/StoreInvoiceRequest.php
@@ -64,33 +64,37 @@ class StoreInvoiceRequest extends Request
 
         $rules['number'] = ['nullable', Rule::unique('invoices')->where('company_id', auth()->user()->company()->id)];
 
-        $rules['project_id'] =  ['bail', 'sometimes', new ValidProjectForClient($this->all())];
+        $rules['project_id'] = ['bail', 'sometimes', new ValidProjectForClient($this->all())];
         $rules['is_amount_discount'] = ['boolean'];
-        
+
         $rules['line_items'] = 'array';
-        $rules['discount']  = 'sometimes|numeric';
+        $rules['discount'] = 'sometimes|numeric';
 
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
         $input = $this->decodePrimaryKeys($input);
 
-        if (isset($input['line_items']) && is_array($input['line_items'])) 
+        if (isset($input['line_items']) && is_array($input['line_items'])) {
             $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
-        
+        }
+
         $input['amount'] = 0;
         $input['balance'] = 0;
-        
-        if(array_key_exists('tax_rate1', $input) && is_null($input['tax_rate1']))
+
+        if (array_key_exists('tax_rate1', $input) && is_null($input['tax_rate1'])) {
             $input['tax_rate1'] = 0;
-        if(array_key_exists('tax_rate2', $input) && is_null($input['tax_rate2']))
+        }
+        if (array_key_exists('tax_rate2', $input) && is_null($input['tax_rate2'])) {
             $input['tax_rate2'] = 0;
-        if(array_key_exists('tax_rate3', $input) && is_null($input['tax_rate3']))
+        }
+        if (array_key_exists('tax_rate3', $input) && is_null($input['tax_rate3'])) {
             $input['tax_rate3'] = 0;
+        }
 
         $this->replace($input);
     }
diff --git a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
index e555c1975271..9dffb29ff6ca 100644
--- a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php
@@ -53,30 +53,31 @@ class UpdateInvoiceRequest extends Request
 
         $rules['id'] = new LockedInvoiceRule($this->invoice);
 
-        if($this->number)
+        if ($this->number) {
             $rules['number'] = Rule::unique('invoices')->where('company_id', auth()->user()->company()->id)->ignore($this->invoice->id);
+        }
 
         $rules['is_amount_discount'] = ['boolean'];
-        
+
         $rules['line_items'] = 'array';
-        $rules['discount']  = 'sometimes|numeric';
-        $rules['project_id'] =  ['bail', 'sometimes', new ValidProjectForClient($this->all())];
+        $rules['discount'] = 'sometimes|numeric';
+        $rules['project_id'] = ['bail', 'sometimes', new ValidProjectForClient($this->all())];
 
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
         $input = $this->decodePrimaryKeys($input);
 
         $input['id'] = $this->invoice->id;
-        
+
         if (isset($input['line_items']) && is_array($input['line_items'])) {
             $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
         }
-        
+
         if (array_key_exists('documents', $input)) {
             unset($input['documents']);
         }
diff --git a/app/Http/Requests/Invoice/UploadInvoiceRequest.php b/app/Http/Requests/Invoice/UploadInvoiceRequest.php
index 38752abcac2c..878b1516a0d2 100644
--- a/app/Http/Requests/Invoice/UploadInvoiceRequest.php
+++ b/app/Http/Requests/Invoice/UploadInvoiceRequest.php
@@ -27,16 +27,16 @@ class UploadInvoiceRequest extends Request
 
     public function rules()
     {
+        $rules = [];
 
-    	$rules = [];
-
-		if($this->input('documents'))
+        if ($this->input('documents')) {
             $rules['documents'] = 'file|mimes:csv,png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:2000000';
+        }
 
-        if($this->input('file'))
+        if ($this->input('file')) {
             $rules['file'] = 'file|mimes:csv,png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:2000000';
+        }
 
-    	return $rules;
-
+        return $rules;
     }
 }
diff --git a/app/Http/Requests/Login/LoginRequest.php b/app/Http/Requests/Login/LoginRequest.php
index 01c67c281e4c..f02169180c7d 100644
--- a/app/Http/Requests/Login/LoginRequest.php
+++ b/app/Http/Requests/Login/LoginRequest.php
@@ -9,7 +9,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Http\Requests\Login;
 
 use App\Http\Requests\Request;
@@ -19,7 +18,6 @@ use App\Utils\Ninja;
 
 class LoginRequest extends Request
 {
-
     /**
      * Determine if the user is authorized to make this request.
      *
@@ -37,11 +35,11 @@ class LoginRequest extends Request
      */
     public function rules()
     {
-
-        if(Ninja::isHosted())
+        if (Ninja::isHosted()) {
             $email_rules = ['required', new BlackListRule, new EmailBlackListRule];
-        else
+        } else {
             $email_rules = 'required';
+        }
 
         return [
             'email' => $email_rules,
@@ -49,7 +47,7 @@ class LoginRequest extends Request
         ];
     }
 
-    // protected function prepareForValidation()
+    // public function prepareForValidation()
     // {
     //     $input = $this->all();
 
@@ -57,7 +55,7 @@ class LoginRequest extends Request
     //     //     $input['password'] = base64_decode($input['password']);
 
     //     // nlog($input['password']);
-        
+
     //     $this->replace($input);
     // }
 }
diff --git a/app/Http/Requests/Migration/UploadMigrationFileRequest.php b/app/Http/Requests/Migration/UploadMigrationFileRequest.php
index ce0b3b0109b7..609dffd94ba3 100644
--- a/app/Http/Requests/Migration/UploadMigrationFileRequest.php
+++ b/app/Http/Requests/Migration/UploadMigrationFileRequest.php
@@ -9,7 +9,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Http\Requests\Migration;
 
 use App\Http\Requests\Request;
diff --git a/app/Http/Requests/OneTimeToken/OneTimeRouterRequest.php b/app/Http/Requests/OneTimeToken/OneTimeRouterRequest.php
index fd36c1171fe3..9cdfc1893ffa 100644
--- a/app/Http/Requests/OneTimeToken/OneTimeRouterRequest.php
+++ b/app/Http/Requests/OneTimeToken/OneTimeRouterRequest.php
@@ -37,7 +37,7 @@ class OneTimeRouterRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         // $input = $this->all();
         // $this->replace($input);
diff --git a/app/Http/Requests/OneTimeToken/OneTimeTokenRequest.php b/app/Http/Requests/OneTimeToken/OneTimeTokenRequest.php
index 4abdaf1854c2..7c8a47ed9fd6 100644
--- a/app/Http/Requests/OneTimeToken/OneTimeTokenRequest.php
+++ b/app/Http/Requests/OneTimeToken/OneTimeTokenRequest.php
@@ -37,7 +37,7 @@ class OneTimeTokenRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         // $input = $this->all();
         // $this->replace($input);
diff --git a/app/Http/Requests/Payment/EditPaymentRequest.php b/app/Http/Requests/Payment/EditPaymentRequest.php
index 6cfc821c64fe..79dae31beff7 100644
--- a/app/Http/Requests/Payment/EditPaymentRequest.php
+++ b/app/Http/Requests/Payment/EditPaymentRequest.php
@@ -32,7 +32,7 @@ class EditPaymentRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Payment/RefundPaymentRequest.php b/app/Http/Requests/Payment/RefundPaymentRequest.php
index d7eeb04e004e..a0223fd02f69 100644
--- a/app/Http/Requests/Payment/RefundPaymentRequest.php
+++ b/app/Http/Requests/Payment/RefundPaymentRequest.php
@@ -31,7 +31,7 @@ class RefundPaymentRequest extends Request
         return auth()->user()->isAdmin();
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Payment/StorePaymentRequest.php b/app/Http/Requests/Payment/StorePaymentRequest.php
index 48d8fe7daa3f..3341ddf67833 100644
--- a/app/Http/Requests/Payment/StorePaymentRequest.php
+++ b/app/Http/Requests/Payment/StorePaymentRequest.php
@@ -36,7 +36,7 @@ class StorePaymentRequest extends Request
         return auth()->user()->can('create', Payment::class);
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
@@ -55,9 +55,9 @@ class StorePaymentRequest extends Request
             foreach ($input['invoices'] as $key => $value) {
                 $input['invoices'][$key]['invoice_id'] = $this->decodePrimaryKey($value['invoice_id']);
 
-                if(array_key_exists('amount', $value))
+                if (array_key_exists('amount', $value)) {
                     $invoices_total += $value['amount'];
-
+                }
             }
         }
 
diff --git a/app/Http/Requests/Payment/UpdatePaymentRequest.php b/app/Http/Requests/Payment/UpdatePaymentRequest.php
index 766aae657d82..0071c2ec691e 100644
--- a/app/Http/Requests/Payment/UpdatePaymentRequest.php
+++ b/app/Http/Requests/Payment/UpdatePaymentRequest.php
@@ -41,8 +41,9 @@ class UpdatePaymentRequest extends Request
             'documents' => 'mimes:png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx',
         ];
 
-        if($this->number)
+        if ($this->number) {
             $rules['number'] = Rule::unique('payments')->where('company_id', auth()->user()->company()->id)->ignore($this->payment->id);
+        }
 
         if ($this->input('documents') && is_array($this->input('documents'))) {
             $documents = count($this->input('documents'));
@@ -57,7 +58,7 @@ class UpdatePaymentRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
@@ -73,9 +74,9 @@ class UpdatePaymentRequest extends Request
 
         if (isset($input['invoices']) && is_array($input['invoices']) !== false) {
             foreach ($input['invoices'] as $key => $value) {
-
-                if(array_key_exists('invoice_id', $input['invoices'][$key]))
+                if (array_key_exists('invoice_id', $input['invoices'][$key])) {
                     $input['invoices'][$key]['invoice_id'] = $this->decodePrimaryKey($value['invoice_id']);
+                }
             }
         }
         $this->replace($input);
diff --git a/app/Http/Requests/Payment/UploadPaymentRequest.php b/app/Http/Requests/Payment/UploadPaymentRequest.php
index 7a2fc7c9a15e..4be1947ba2a6 100644
--- a/app/Http/Requests/Payment/UploadPaymentRequest.php
+++ b/app/Http/Requests/Payment/UploadPaymentRequest.php
@@ -27,13 +27,12 @@ class UploadPaymentRequest extends Request
 
     public function rules()
     {
+        $rules = [];
 
-    	$rules = [];
-
-		if($this->input('documents'))
+        if ($this->input('documents')) {
             $rules['documents'] = 'file|mimes:csv,png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:2000000';
+        }
 
-    	return $rules;
-
+        return $rules;
     }
 }
diff --git a/app/Http/Requests/PaymentTerm/EditPaymentTermRequest.php b/app/Http/Requests/PaymentTerm/EditPaymentTermRequest.php
index dcc265e267b5..e8d9cdbad2fa 100644
--- a/app/Http/Requests/PaymentTerm/EditPaymentTermRequest.php
+++ b/app/Http/Requests/PaymentTerm/EditPaymentTermRequest.php
@@ -32,7 +32,7 @@ class EditPaymentTermRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/PaymentTerm/StorePaymentTermRequest.php b/app/Http/Requests/PaymentTerm/StorePaymentTermRequest.php
index c63b11c24202..4bca6fda88b1 100644
--- a/app/Http/Requests/PaymentTerm/StorePaymentTermRequest.php
+++ b/app/Http/Requests/PaymentTerm/StorePaymentTermRequest.php
@@ -28,7 +28,7 @@ class StorePaymentTermRequest extends Request
         return auth()->user()->isAdmin();
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/PaymentTerm/UpdatePaymentTermRequest.php b/app/Http/Requests/PaymentTerm/UpdatePaymentTermRequest.php
index a6d20e818540..5dd166edadf2 100644
--- a/app/Http/Requests/PaymentTerm/UpdatePaymentTermRequest.php
+++ b/app/Http/Requests/PaymentTerm/UpdatePaymentTermRequest.php
@@ -35,7 +35,7 @@ class UpdatePaymentTermRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Payments/PaymentNotificationWebhookRequest.php b/app/Http/Requests/Payments/PaymentNotificationWebhookRequest.php
index f91c05b68757..97727b407d33 100644
--- a/app/Http/Requests/Payments/PaymentNotificationWebhookRequest.php
+++ b/app/Http/Requests/Payments/PaymentNotificationWebhookRequest.php
@@ -38,5 +38,4 @@ class PaymentNotificationWebhookRequest extends Request
             //
         ];
     }
-
 }
diff --git a/app/Http/Requests/Payments/PaymentWebhookRequest.php b/app/Http/Requests/Payments/PaymentWebhookRequest.php
index 8e103e533bcd..b3c528c776d9 100644
--- a/app/Http/Requests/Payments/PaymentWebhookRequest.php
+++ b/app/Http/Requests/Payments/PaymentWebhookRequest.php
@@ -46,7 +46,7 @@ class PaymentWebhookRequest extends Request
     public function getCompanyGateway()
     {
         MultiDB::findAndSetDbByCompanyKey($this->company_key);
-        
+
         return CompanyGateway::withTrashed()->findOrFail($this->decodePrimaryKey($this->company_gateway_id));
     }
 
@@ -59,9 +59,8 @@ class PaymentWebhookRequest extends Request
     public function getPaymentHash()
     {
         if ($this->query('hash')) {
-        
             MultiDB::findAndSetDbByCompanyKey($this->company_key);
-        
+
             return PaymentHash::where('hash', $this->query('hash'))->firstOrFail();
         }
 
diff --git a/app/Http/Requests/Preview/PreviewInvoiceRequest.php b/app/Http/Requests/Preview/PreviewInvoiceRequest.php
index 53d9befc8ead..9215703d34c5 100644
--- a/app/Http/Requests/Preview/PreviewInvoiceRequest.php
+++ b/app/Http/Requests/Preview/PreviewInvoiceRequest.php
@@ -13,8 +13,8 @@ namespace App\Http\Requests\Preview;
 
 use App\Http\Requests\Request;
 use App\Http\ValidationRules\Project\ValidProjectForClient;
-use App\Models\Invoice;
 use App\Models\Credit;
+use App\Models\Invoice;
 use App\Models\Quote;
 use App\Models\RecurringInvoice;
 use App\Utils\Traits\CleanLineItems;
@@ -45,7 +45,7 @@ class PreviewInvoiceRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
@@ -54,8 +54,8 @@ class PreviewInvoiceRequest extends Request
         $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
         $input['amount'] = 0;
         $input['balance'] = 0;
-        $input['number'] = ctrans('texts.live_preview') . " #". rand(0,1000);
-        
+        $input['number'] = ctrans('texts.live_preview').' #'.rand(0, 1000);
+
         $this->replace($input);
     }
 }
diff --git a/app/Http/Requests/Preview/PreviewPurchaseOrderRequest.php b/app/Http/Requests/Preview/PreviewPurchaseOrderRequest.php
index 92b892690cd3..32de5ef8c739 100644
--- a/app/Http/Requests/Preview/PreviewPurchaseOrderRequest.php
+++ b/app/Http/Requests/Preview/PreviewPurchaseOrderRequest.php
@@ -46,7 +46,7 @@ class PreviewPurchaseOrderRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Product/StoreProductRequest.php b/app/Http/Requests/Product/StoreProductRequest.php
index 89c476e346ee..793917e880cc 100644
--- a/app/Http/Requests/Product/StoreProductRequest.php
+++ b/app/Http/Requests/Product/StoreProductRequest.php
@@ -44,11 +44,11 @@ class StoreProductRequest extends Request
         $rules['in_stock_quantity'] = 'sometimes|numeric';
         $rules['stock_notification_threshold'] = 'sometimes|numeric';
         $rules['stock_notification'] = 'sometimes|bool';
-        
+
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Product/UpdateProductRequest.php b/app/Http/Requests/Product/UpdateProductRequest.php
index f122686c293c..ce0fed8764d1 100644
--- a/app/Http/Requests/Product/UpdateProductRequest.php
+++ b/app/Http/Requests/Product/UpdateProductRequest.php
@@ -51,7 +51,7 @@ class UpdateProductRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
@@ -63,10 +63,8 @@ class UpdateProductRequest extends Request
             $input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
         }
 
-        if(array_key_exists('in_stock_quantity', $input) && request()->has('update_in_stock_quantity') && request()->input('update_in_stock_quantity') == 'true'){
-
-        }
-        elseif(array_key_exists('in_stock_quantity', $input)){
+        if (array_key_exists('in_stock_quantity', $input) && request()->has('update_in_stock_quantity') && request()->input('update_in_stock_quantity') == 'true') {
+        } elseif (array_key_exists('in_stock_quantity', $input)) {
             unset($input['in_stock_quantity']);
         }
 
diff --git a/app/Http/Requests/Product/UploadProductRequest.php b/app/Http/Requests/Product/UploadProductRequest.php
index b8089bda3bf9..8a12376f7ab6 100644
--- a/app/Http/Requests/Product/UploadProductRequest.php
+++ b/app/Http/Requests/Product/UploadProductRequest.php
@@ -27,13 +27,12 @@ class UploadProductRequest extends Request
 
     public function rules()
     {
+        $rules = [];
 
-    	$rules = [];
-
-		if($this->input('documents'))
+        if ($this->input('documents')) {
             $rules['documents'] = 'file|mimes:csv,png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:2000000';
+        }
 
-    	return $rules;
-
+        return $rules;
     }
 }
diff --git a/app/Http/Requests/Project/StoreProjectRequest.php b/app/Http/Requests/Project/StoreProjectRequest.php
index dfda233cbb10..7d5a77de78d7 100644
--- a/app/Http/Requests/Project/StoreProjectRequest.php
+++ b/app/Http/Requests/Project/StoreProjectRequest.php
@@ -20,7 +20,7 @@ use Illuminate\Validation\Rule;
 class StoreProjectRequest extends Request
 {
     use MakesHash;
-    
+
     /**
      * Determine if the user is authorized to make this request.
      *
@@ -45,14 +45,14 @@ class StoreProjectRequest extends Request
         return $this->globalRules($rules);
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->decodePrimaryKeys($this->all());
 
-
-        if(array_key_exists('color', $input) && is_null($input['color']))
+        if (array_key_exists('color', $input) && is_null($input['color'])) {
             $input['color'] = '';
-        
+        }
+
         $this->replace($input);
     }
 
diff --git a/app/Http/Requests/Project/UpdateProjectRequest.php b/app/Http/Requests/Project/UpdateProjectRequest.php
index a63f493a15c8..02949bd243ae 100644
--- a/app/Http/Requests/Project/UpdateProjectRequest.php
+++ b/app/Http/Requests/Project/UpdateProjectRequest.php
@@ -32,7 +32,7 @@ class UpdateProjectRequest extends Request
     public function rules()
     {
         $rules = [];
-        
+
         if (isset($this->number)) {
             $rules['number'] = Rule::unique('projects')->where('company_id', auth()->user()->company()->id)->ignore($this->project->id);
         }
@@ -40,7 +40,7 @@ class UpdateProjectRequest extends Request
         return $this->globalRules($rules);
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->decodePrimaryKeys($this->all());
 
@@ -48,8 +48,9 @@ class UpdateProjectRequest extends Request
             unset($input['client_id']);
         }
 
-        if(array_key_exists('color', $input) && is_null($input['color']))
+        if (array_key_exists('color', $input) && is_null($input['color'])) {
             $input['color'] = '';
+        }
 
         $this->replace($input);
     }
diff --git a/app/Http/Requests/Project/UploadProjectRequest.php b/app/Http/Requests/Project/UploadProjectRequest.php
index 18a9e25c6036..cccf73f4bad3 100644
--- a/app/Http/Requests/Project/UploadProjectRequest.php
+++ b/app/Http/Requests/Project/UploadProjectRequest.php
@@ -27,13 +27,12 @@ class UploadProjectRequest extends Request
 
     public function rules()
     {
+        $rules = [];
 
-    	$rules = [];
-
-		if($this->input('documents'))
+        if ($this->input('documents')) {
             $rules['documents'] = 'file|mimes:csv,png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:2000000';
+        }
 
-    	return $rules;
-
+        return $rules;
     }
 }
diff --git a/app/Http/Requests/PurchaseOrder/ActionPurchaseOrderRequest.php b/app/Http/Requests/PurchaseOrder/ActionPurchaseOrderRequest.php
index 6768f171316d..ea63c89bef74 100644
--- a/app/Http/Requests/PurchaseOrder/ActionPurchaseOrderRequest.php
+++ b/app/Http/Requests/PurchaseOrder/ActionPurchaseOrderRequest.php
@@ -18,6 +18,7 @@ use App\Utils\Traits\MakesHash;
 class ActionPurchaseOrderRequest extends Request
 {
     use MakesHash;
+
     /**
      * Determine if the user is authorized to make this request.
      *
@@ -28,26 +29,26 @@ class ActionPurchaseOrderRequest extends Request
     // private $invoice;
 
     public function authorize() : bool
-    { 
+    {
         return auth()->user()->can('edit', $this->purchase_order);
     }
 
     public function rules()
     {
         return [
-            'action' => 'required'
+            'action' => 'required',
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
-        if($this->action){
+        if ($this->action) {
             $input['action'] = $this->action;
-        } elseif (!array_key_exists('action', $input) ) {
+        } elseif (! array_key_exists('action', $input)) {
             $this->error_msg = 'Action is a required field';
-        } 
+        }
 
         $this->replace($input);
     }
diff --git a/app/Http/Requests/PurchaseOrder/CreatePurchaseOrderRequest.php b/app/Http/Requests/PurchaseOrder/CreatePurchaseOrderRequest.php
index 439e1a025e95..e17cbf750840 100644
--- a/app/Http/Requests/PurchaseOrder/CreatePurchaseOrderRequest.php
+++ b/app/Http/Requests/PurchaseOrder/CreatePurchaseOrderRequest.php
@@ -11,7 +11,6 @@
 
 namespace App\Http\Requests\PurchaseOrder;
 
-
 use App\Http\Requests\Request;
 use App\Models\PurchaseOrder;
 
diff --git a/app/Http/Requests/PurchaseOrder/DestroyPurchaseOrderRequest.php b/app/Http/Requests/PurchaseOrder/DestroyPurchaseOrderRequest.php
index 652a0c7815ae..e965dbd0f422 100644
--- a/app/Http/Requests/PurchaseOrder/DestroyPurchaseOrderRequest.php
+++ b/app/Http/Requests/PurchaseOrder/DestroyPurchaseOrderRequest.php
@@ -11,7 +11,6 @@
 
 namespace App\Http\Requests\PurchaseOrder;
 
-
 use App\Http\Requests\Request;
 
 class DestroyPurchaseOrderRequest extends Request
diff --git a/app/Http/Requests/PurchaseOrder/EditPurchaseOrderRequest.php b/app/Http/Requests/PurchaseOrder/EditPurchaseOrderRequest.php
index 53f6b15106ce..b80aa4970ed6 100644
--- a/app/Http/Requests/PurchaseOrder/EditPurchaseOrderRequest.php
+++ b/app/Http/Requests/PurchaseOrder/EditPurchaseOrderRequest.php
@@ -11,7 +11,6 @@
 
 namespace App\Http\Requests\PurchaseOrder;
 
-
 use App\Http\Requests\Request;
 
 class EditPurchaseOrderRequest extends Request
diff --git a/app/Http/Requests/PurchaseOrder/ShowPurchaseOrderRequest.php b/app/Http/Requests/PurchaseOrder/ShowPurchaseOrderRequest.php
index fa8dad6f6088..467b1075aff0 100644
--- a/app/Http/Requests/PurchaseOrder/ShowPurchaseOrderRequest.php
+++ b/app/Http/Requests/PurchaseOrder/ShowPurchaseOrderRequest.php
@@ -11,7 +11,6 @@
 
 namespace App\Http\Requests\PurchaseOrder;
 
-
 use App\Http\Requests\Request;
 
 class ShowPurchaseOrderRequest extends Request
diff --git a/app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php b/app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php
index 6bad2016aee1..4cfa1301d0b5 100644
--- a/app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php
+++ b/app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php
@@ -51,7 +51,7 @@ class StorePurchaseOrderRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/PurchaseOrder/UpdatePurchaseOrderRequest.php b/app/Http/Requests/PurchaseOrder/UpdatePurchaseOrderRequest.php
index a95e1ee4c0c0..71f81857913b 100644
--- a/app/Http/Requests/PurchaseOrder/UpdatePurchaseOrderRequest.php
+++ b/app/Http/Requests/PurchaseOrder/UpdatePurchaseOrderRequest.php
@@ -11,7 +11,6 @@
 
 namespace App\Http\Requests\PurchaseOrder;
 
-
 use App\Http\Requests\Request;
 use App\Utils\Traits\ChecksEntityStatus;
 use App\Utils\Traits\CleanLineItems;
@@ -33,6 +32,7 @@ class UpdatePurchaseOrderRequest extends Request
     {
         return auth()->user()->can('edit', $this->purchase_order);
     }
+
     /**
      * Get the validation rules that apply to the request.
      *
@@ -42,16 +42,18 @@ class UpdatePurchaseOrderRequest extends Request
     {
         $rules = [];
 
-        if($this->number)
+        if ($this->number) {
             $rules['number'] = Rule::unique('purchase_orders')->where('company_id', auth()->user()->company()->id)->ignore($this->purchase_order->id);
+        }
 
         $rules['line_items'] = 'array';
-        $rules['discount']  = 'sometimes|numeric';
+        $rules['discount'] = 'sometimes|numeric';
         $rules['is_amount_discount'] = ['boolean'];
 
         return $rules;
     }
-    protected function prepareForValidation()
+
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Quote/BulkActionQuoteRequest.php b/app/Http/Requests/Quote/BulkActionQuoteRequest.php
index f9a3d39f8fe7..a8d8cf86bd1b 100644
--- a/app/Http/Requests/Quote/BulkActionQuoteRequest.php
+++ b/app/Http/Requests/Quote/BulkActionQuoteRequest.php
@@ -32,10 +32,10 @@ class BulkActionQuoteRequest extends Request
 
         $rules = [];
 
-        if($input['action'] == 'convert_to_invoice')
-            $rules['action'] = [new ConvertableQuoteRule()]; 
+        if ($input['action'] == 'convert_to_invoice') {
+            $rules['action'] = [new ConvertableQuoteRule()];
+        }
 
         return $rules;
     }
-
 }
diff --git a/app/Http/Requests/Quote/StoreQuoteRequest.php b/app/Http/Requests/Quote/StoreQuoteRequest.php
index 39a84cadaa57..bdcee570c8e5 100644
--- a/app/Http/Requests/Quote/StoreQuoteRequest.php
+++ b/app/Http/Requests/Quote/StoreQuoteRequest.php
@@ -49,18 +49,18 @@ class StoreQuoteRequest extends Request
             $rules['documents'] = 'file|mimes:png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:20000';
         }
 
-        $rules['number'] = ['nullable',Rule::unique('quotes')->where('company_id', auth()->user()->company()->id)];
-        $rules['discount']  = 'sometimes|numeric';
+        $rules['number'] = ['nullable', Rule::unique('quotes')->where('company_id', auth()->user()->company()->id)];
+        $rules['discount'] = 'sometimes|numeric';
 
         $rules['is_amount_discount'] = ['boolean'];
-        
+
         // $rules['number'] = new UniqueQuoteNumberRule($this->all());
         $rules['line_items'] = 'array';
 
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
@@ -69,7 +69,7 @@ class StoreQuoteRequest extends Request
         $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
         $input['amount'] = 0;
         $input['balance'] = 0;
-        
+
         $this->replace($input);
     }
 }
diff --git a/app/Http/Requests/Quote/UpdateQuoteRequest.php b/app/Http/Requests/Quote/UpdateQuoteRequest.php
index 3a29d065a67b..7b32663f59b4 100644
--- a/app/Http/Requests/Quote/UpdateQuoteRequest.php
+++ b/app/Http/Requests/Quote/UpdateQuoteRequest.php
@@ -47,18 +47,18 @@ class UpdateQuoteRequest extends Request
             $rules['documents'] = 'file|mimes:png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:20000';
         }
 
-        if($this->number)
+        if ($this->number) {
             $rules['number'] = Rule::unique('quotes')->where('company_id', auth()->user()->company()->id)->ignore($this->quote->id);
+        }
 
         $rules['line_items'] = 'array';
-        $rules['discount']  = 'sometimes|numeric';
+        $rules['discount'] = 'sometimes|numeric';
         $rules['is_amount_discount'] = ['boolean'];
-        
 
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Quote/UploadQuoteRequest.php b/app/Http/Requests/Quote/UploadQuoteRequest.php
index 15caea9fe110..ee7a125df8c2 100644
--- a/app/Http/Requests/Quote/UploadQuoteRequest.php
+++ b/app/Http/Requests/Quote/UploadQuoteRequest.php
@@ -27,13 +27,12 @@ class UploadQuoteRequest extends Request
 
     public function rules()
     {
+        $rules = [];
 
-    	$rules = [];
-
-		if($this->input('documents'))
+        if ($this->input('documents')) {
             $rules['documents'] = 'file|mimes:csv,png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:2000000';
+        }
 
-    	return $rules;
-
+        return $rules;
     }
 }
diff --git a/app/Http/Requests/RecurringExpense/BulkRecurringExpenseRequest.php b/app/Http/Requests/RecurringExpense/BulkRecurringExpenseRequest.php
index 1c63c53b87b7..58b170a72455 100644
--- a/app/Http/Requests/RecurringExpense/BulkRecurringExpenseRequest.php
+++ b/app/Http/Requests/RecurringExpense/BulkRecurringExpenseRequest.php
@@ -9,7 +9,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Http\Requests\RecurringExpense;
 
 use App\Http\Requests\Request;
diff --git a/app/Http/Requests/RecurringExpense/EditRecurringExpenseRequest.php b/app/Http/Requests/RecurringExpense/EditRecurringExpenseRequest.php
index 137241b8acd3..2e115349f336 100644
--- a/app/Http/Requests/RecurringExpense/EditRecurringExpenseRequest.php
+++ b/app/Http/Requests/RecurringExpense/EditRecurringExpenseRequest.php
@@ -24,5 +24,4 @@ class EditRecurringExpenseRequest extends Request
     {
         return auth()->user()->can('edit', $this->recurring_expense);
     }
-
 }
diff --git a/app/Http/Requests/RecurringExpense/StoreRecurringExpenseRequest.php b/app/Http/Requests/RecurringExpense/StoreRecurringExpenseRequest.php
index 177b7adbff86..ef256795c05f 100644
--- a/app/Http/Requests/RecurringExpense/StoreRecurringExpenseRequest.php
+++ b/app/Http/Requests/RecurringExpense/StoreRecurringExpenseRequest.php
@@ -35,11 +35,13 @@ class StoreRecurringExpenseRequest extends Request
     {
         $rules = [];
 
-        if ($this->number) 
+        if ($this->number) {
             $rules['number'] = Rule::unique('recurring_expenses')->where('company_id', auth()->user()->company()->id);
-        
-        if(!empty($this->client_id))
+        }
+
+        if (! empty($this->client_id)) {
             $rules['client_id'] = 'bail|sometimes|exists:clients,id,company_id,'.auth()->user()->company()->id;
+        }
 
         $rules['frequency_id'] = 'required|integer|digits_between:1,12';
         $rules['tax_amount1'] = 'numeric';
@@ -49,7 +51,7 @@ class StoreRecurringExpenseRequest extends Request
         return $this->globalRules($rules);
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
@@ -57,22 +59,23 @@ class StoreRecurringExpenseRequest extends Request
 
         if (array_key_exists('next_send_date', $input) && is_string($input['next_send_date'])) {
             $input['next_send_date_client'] = $input['next_send_date'];
-        }   
-        
+        }
+
         if (array_key_exists('category_id', $input) && is_string($input['category_id'])) {
             $input['category_id'] = $this->decodePrimaryKey($input['category_id']);
         }
 
         if (! array_key_exists('currency_id', $input) || strlen($input['currency_id']) == 0) {
-            $input['currency_id'] = (string)auth()->user()->company()->settings->currency_id;
+            $input['currency_id'] = (string) auth()->user()->company()->settings->currency_id;
         }
 
-        if(array_key_exists('color', $input) && is_null($input['color']))
+        if (array_key_exists('color', $input) && is_null($input['color'])) {
             $input['color'] = '';
+        }
 
-        if(array_key_exists('foreign_amount', $input) && is_null($input['foreign_amount']))
+        if (array_key_exists('foreign_amount', $input) && is_null($input['foreign_amount'])) {
             $input['foreign_amount'] = 0;
-
+        }
 
         $this->replace($input);
     }
diff --git a/app/Http/Requests/RecurringExpense/UpdateRecurringExpenseRequest.php b/app/Http/Requests/RecurringExpense/UpdateRecurringExpenseRequest.php
index 745282b7fe42..0909c775c880 100644
--- a/app/Http/Requests/RecurringExpense/UpdateRecurringExpenseRequest.php
+++ b/app/Http/Requests/RecurringExpense/UpdateRecurringExpenseRequest.php
@@ -60,7 +60,7 @@ class UpdateRecurringExpenseRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
@@ -68,8 +68,8 @@ class UpdateRecurringExpenseRequest extends Request
 
         if (array_key_exists('next_send_date', $input) && is_string($input['next_send_date'])) {
             $input['next_send_date_client'] = $input['next_send_date'];
-        }   
-        
+        }
+
         if (array_key_exists('category_id', $input) && is_string($input['category_id'])) {
             $input['category_id'] = $this->decodePrimaryKey($input['category_id']);
         }
@@ -79,7 +79,7 @@ class UpdateRecurringExpenseRequest extends Request
         }
 
         if (! array_key_exists('currency_id', $input) || strlen($input['currency_id']) == 0) {
-            $input['currency_id'] = (string)auth()->user()->company()->settings->currency_id;
+            $input['currency_id'] = (string) auth()->user()->company()->settings->currency_id;
         }
 
         $this->replace($input);
diff --git a/app/Http/Requests/RecurringExpense/UploadRecurringExpenseRequest.php b/app/Http/Requests/RecurringExpense/UploadRecurringExpenseRequest.php
index bbc21f10b922..4584b5e3e327 100644
--- a/app/Http/Requests/RecurringExpense/UploadRecurringExpenseRequest.php
+++ b/app/Http/Requests/RecurringExpense/UploadRecurringExpenseRequest.php
@@ -27,13 +27,12 @@ class UploadRecurringExpenseRequest extends Request
 
     public function rules()
     {
+        $rules = [];
 
-    	$rules = [];
-
-		if($this->input('documents'))
+        if ($this->input('documents')) {
             $rules['documents'] = 'file|mimes:csv,png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:2000000';
+        }
 
-    	return $rules;
-
+        return $rules;
     }
 }
diff --git a/app/Http/Requests/RecurringInvoice/EditRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/EditRecurringInvoiceRequest.php
index c97e8d541008..82d564e792d6 100644
--- a/app/Http/Requests/RecurringInvoice/EditRecurringInvoiceRequest.php
+++ b/app/Http/Requests/RecurringInvoice/EditRecurringInvoiceRequest.php
@@ -32,7 +32,7 @@ class EditRecurringInvoiceRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
index 087acdca7f5d..c220fca528fd 100644
--- a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
+++ b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
@@ -45,7 +45,6 @@ class StoreRecurringInvoiceRequest extends Request
             foreach (range(0, $documents) as $index) {
                 $rules['documents.'.$index] = 'file|mimes:png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:20000';
             }
-
         } elseif ($this->input('documents')) {
             $rules['documents'] = 'file|mimes:png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:20000';
         }
@@ -56,20 +55,20 @@ class StoreRecurringInvoiceRequest extends Request
 
         $rules['frequency_id'] = 'required|integer|digits_between:1,12';
 
-        $rules['project_id'] =  ['bail', 'sometimes', new ValidProjectForClient($this->all())];
+        $rules['project_id'] = ['bail', 'sometimes', new ValidProjectForClient($this->all())];
 
         $rules['number'] = new UniqueRecurringInvoiceNumberRule($this->all());
 
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
         if (array_key_exists('next_send_date', $input) && is_string($input['next_send_date'])) {
             $input['next_send_date_client'] = $input['next_send_date'];
-        }        
+        }
 
         if (array_key_exists('design_id', $input) && is_string($input['design_id'])) {
             $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
@@ -91,7 +90,6 @@ class StoreRecurringInvoiceRequest extends Request
             $input['project_id'] = $this->decodePrimaryKey($input['project_id']);
         }
 
-
         if (isset($input['client_contacts'])) {
             foreach ($input['client_contacts'] as $key => $contact) {
                 if (! array_key_exists('send_email', $contact) || ! array_key_exists('id', $contact)) {
@@ -117,7 +115,7 @@ class StoreRecurringInvoiceRequest extends Request
         }
 
         $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
-        
+
         if (isset($input['auto_bill'])) {
             $input['auto_bill_enabled'] = $this->setAutoBillFlag($input['auto_bill']);
         } else {
@@ -126,11 +124,12 @@ class StoreRecurringInvoiceRequest extends Request
                 $input['auto_bill_enabled'] = $this->setAutoBillFlag($input['auto_bill']);
             }
         }
-    
+
         /* If there is no number, just unset it here. */
-        if(array_key_exists('number', $input) && ( is_null($input['number']) || empty($input['number'])))
+        if (array_key_exists('number', $input) && (is_null($input['number']) || empty($input['number']))) {
             unset($input['number']);
-    
+        }
+
         $this->replace($input);
     }
 
@@ -141,7 +140,6 @@ class StoreRecurringInvoiceRequest extends Request
         }
 
         return false;
-        
     }
 
     public function messages()
diff --git a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
index e697de25436c..b13dc0efc0c7 100644
--- a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
+++ b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
@@ -49,22 +49,23 @@ class UpdateRecurringInvoiceRequest extends Request
             $rules['documents'] = 'file|mimes:png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:20000';
         }
 
-        if($this->number)
+        if ($this->number) {
             $rules['number'] = Rule::unique('recurring_invoices')->where('company_id', auth()->user()->company()->id)->ignore($this->recurring_invoice->id);
+        }
 
-        $rules['project_id'] =  ['bail', 'sometimes', new ValidProjectForClient($this->all())];
+        $rules['project_id'] = ['bail', 'sometimes', new ValidProjectForClient($this->all())];
 
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
         if (array_key_exists('next_send_date', $input) && is_string($input['next_send_date'])) {
             $input['next_send_date_client'] = $input['next_send_date'];
-        }    
-        
+        }
+
         if (array_key_exists('design_id', $input) && is_string($input['design_id'])) {
             $input['design_id'] = $this->decodePrimaryKey($input['design_id']);
         }
@@ -81,7 +82,6 @@ class UpdateRecurringInvoiceRequest extends Request
             $input['project_id'] = $this->decodePrimaryKey($input['project_id']);
         }
 
-
         if (isset($input['invitations'])) {
             foreach ($input['invitations'] as $key => $value) {
                 if (is_numeric($input['invitations'][$key]['id'])) {
@@ -109,7 +109,7 @@ class UpdateRecurringInvoiceRequest extends Request
         if (array_key_exists('documents', $input)) {
             unset($input['documents']);
         }
-        
+
         $this->replace($input);
     }
 
@@ -124,9 +124,10 @@ class UpdateRecurringInvoiceRequest extends Request
      */
     private function setAutoBillFlag($auto_bill) :bool
     {
-        if ($auto_bill == 'always') 
+        if ($auto_bill == 'always') {
             return true;
-        
+        }
+
         return false;
     }
 }
diff --git a/app/Http/Requests/RecurringInvoice/UploadRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/UploadRecurringInvoiceRequest.php
index 8217f16afca2..b975ad85ed5a 100644
--- a/app/Http/Requests/RecurringInvoice/UploadRecurringInvoiceRequest.php
+++ b/app/Http/Requests/RecurringInvoice/UploadRecurringInvoiceRequest.php
@@ -27,13 +27,12 @@ class UploadRecurringInvoiceRequest extends Request
 
     public function rules()
     {
+        $rules = [];
 
-    	$rules = [];
-
-		if($this->input('documents'))
+        if ($this->input('documents')) {
             $rules['documents'] = 'file|mimes:csv,png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:2000000';
+        }
 
-    	return $rules;
-
+        return $rules;
     }
 }
diff --git a/app/Http/Requests/RecurringQuote/EditRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/EditRecurringQuoteRequest.php
index 8bfe061ae495..a2de0210282a 100644
--- a/app/Http/Requests/RecurringQuote/EditRecurringQuoteRequest.php
+++ b/app/Http/Requests/RecurringQuote/EditRecurringQuoteRequest.php
@@ -32,7 +32,7 @@ class EditRecurringQuoteRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php
index 3be6f6854f4d..8b602bc0b1b6 100644
--- a/app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php
+++ b/app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php
@@ -44,7 +44,6 @@ class StoreRecurringQuoteRequest extends Request
             foreach (range(0, $documents) as $index) {
                 $rules['documents.'.$index] = 'file|mimes:png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:20000';
             }
-
         } elseif ($this->input('documents')) {
             $rules['documents'] = 'file|mimes:png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:20000';
         }
@@ -60,13 +59,13 @@ class StoreRecurringQuoteRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
         $input = $this->decodePrimaryKeys($input);
 
         $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
-        
+
         if (isset($input['auto_bill'])) {
             $input['auto_bill_enabled'] = $this->setAutoBillFlag($input['auto_bill']);
         } else {
@@ -75,7 +74,7 @@ class StoreRecurringQuoteRequest extends Request
                 $input['auto_bill_enabled'] = $this->setAutoBillFlag($input['auto_bill']);
             }
         }
-    
+
         $this->replace($input);
     }
 
@@ -86,7 +85,6 @@ class StoreRecurringQuoteRequest extends Request
         }
 
         return false;
-        
     }
 
     public function messages()
diff --git a/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php
index 1f6908b0feec..c0bb695ca4ce 100644
--- a/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php
+++ b/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php
@@ -48,14 +48,14 @@ class UpdateRecurringQuoteRequest extends Request
             $rules['documents'] = 'file|mimes:png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:20000';
         }
 
-        if($this->number)
+        if ($this->number) {
             $rules['number'] = Rule::unique('recurring_quotes')->where('company_id', auth()->user()->company()->id)->ignore($this->recurring_quote->id);
-
+        }
 
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
         $input = $this->decodePrimaryKeys($input);
@@ -71,7 +71,7 @@ class UpdateRecurringQuoteRequest extends Request
         if (array_key_exists('documents', $input)) {
             unset($input['documents']);
         }
-        
+
         $this->replace($input);
     }
 
@@ -93,7 +93,7 @@ class UpdateRecurringQuoteRequest extends Request
         // if($auto_bill == '')
         // off / optin / optout will reset the status of this field to off to allow
         // the client to choose whether to auto_bill or not.
-        
+
         return false;
     }
 }
diff --git a/app/Http/Requests/RecurringQuote/UploadRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/UploadRecurringQuoteRequest.php
index 4ef3e806e2b1..ed6b6824ff2f 100644
--- a/app/Http/Requests/RecurringQuote/UploadRecurringQuoteRequest.php
+++ b/app/Http/Requests/RecurringQuote/UploadRecurringQuoteRequest.php
@@ -27,13 +27,12 @@ class UploadRecurringQuoteRequest extends Request
 
     public function rules()
     {
+        $rules = [];
 
-    	$rules = [];
-
-		if($this->input('documents'))
+        if ($this->input('documents')) {
             $rules['documents'] = 'file|mimes:csv,png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:2000000';
+        }
 
-    	return $rules;
-
+        return $rules;
     }
 }
diff --git a/app/Http/Requests/Report/GenericReportRequest.php b/app/Http/Requests/Report/GenericReportRequest.php
index 5658942dc6dd..b0a311ee5630 100644
--- a/app/Http/Requests/Report/GenericReportRequest.php
+++ b/app/Http/Requests/Report/GenericReportRequest.php
@@ -41,14 +41,17 @@ class GenericReportRequest extends Request
     {
         $input = $this->all();
 
-        if(!array_key_exists('date_range', $input))
+        if (! array_key_exists('date_range', $input)) {
             $input['date_range'] = 'all';
+        }
 
-        if(!array_key_exists('report_keys', $input))
+        if (! array_key_exists('report_keys', $input)) {
             $input['report_keys'] = [];
+        }
 
-        if(!array_key_exists('send_email', $input))
+        if (! array_key_exists('send_email', $input)) {
             $input['send_email'] = true;
+        }
 
         $this->replace($input);
     }
diff --git a/app/Http/Requests/Report/ProfitLossRequest.php b/app/Http/Requests/Report/ProfitLossRequest.php
index 14f5046cc740..2886b4eb1944 100644
--- a/app/Http/Requests/Report/ProfitLossRequest.php
+++ b/app/Http/Requests/Report/ProfitLossRequest.php
@@ -42,8 +42,9 @@ class ProfitLossRequest extends Request
     {
         $input = $this->all();
 
-        if(!array_key_exists('date_range', $input))
+        if (! array_key_exists('date_range', $input)) {
             $input['date_range'] = 'all';
+        }
 
         $this->replace($input);
     }
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
index 34ca17ec0211..601a7a621a8b 100644
--- a/app/Http/Requests/Request.php
+++ b/app/Http/Requests/Request.php
@@ -20,6 +20,7 @@ class Request extends FormRequest
 {
     use MakesHash;
     use RuntimeFormRequest;
+
     /**
      * Get the validation rules that apply to the request.
      *
@@ -41,8 +42,9 @@ class Request extends FormRequest
         }
 
         //01-02-2022 needed for CSV Imports
-        if(!$merge_rules)
+        if (! $merge_rules) {
             return $rules;
+        }
 
         return array_merge($merge_rules, $rules);
     }
@@ -50,11 +52,11 @@ class Request extends FormRequest
     private function assigned_user_id($rules)
     {
         $rules['assigned_user_id'] = [
-            'bail' ,
+            'bail',
             'sometimes',
             'nullable',
-                new RelatedUserRule($this->all())
-            ];
+            new RelatedUserRule($this->all()),
+        ];
 
         return $rules;
     }
@@ -75,6 +77,10 @@ class Request extends FormRequest
 
     public function decodePrimaryKeys($input)
     {
+        if (array_key_exists('group_settings_id', $input) && is_string($input['group_settings_id'])) {
+            $input['group_settings_id'] = $this->decodePrimaryKey($input['group_settings_id']);
+        }
+        
         if (array_key_exists('group_id', $input) && is_string($input['group_id'])) {
             $input['group_id'] = $this->decodePrimaryKey($input['group_id']);
         }
@@ -141,9 +147,9 @@ class Request extends FormRequest
 
         if (isset($input['contacts']) && is_array($input['contacts'])) {
             foreach ($input['contacts'] as $key => $contact) {
-
-                if(!is_array($contact))
+                if (! is_array($contact)) {
                     continue;
+                }
 
                 if (array_key_exists('id', $contact) && is_numeric($contact['id'])) {
                     unset($input['contacts'][$key]['id']);
@@ -164,18 +170,16 @@ class Request extends FormRequest
                     }
                 }
 
-                if (array_key_exists('email', $contact)) 
+                if (array_key_exists('email', $contact)) {
                     $input['contacts'][$key]['email'] = trim($contact['email']);
-
-
+                }
             }
         }
-        
+
         return $input;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
-
     }
 }
diff --git a/app/Http/Requests/RuntimeFormRequest.php b/app/Http/Requests/RuntimeFormRequest.php
index 680985c9d1b9..b0e4fea09abb 100644
--- a/app/Http/Requests/RuntimeFormRequest.php
+++ b/app/Http/Requests/RuntimeFormRequest.php
@@ -24,7 +24,6 @@ trait RuntimeFormRequest
         return $instance;
     }
 
-
     protected static function getMockedRequestByParameters($paramters)
     {
         $mockRequest = Request::create('', 'POST');
@@ -33,4 +32,4 @@ trait RuntimeFormRequest
 
         return $mockRequest;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Http/Requests/Setup/CheckDatabaseRequest.php b/app/Http/Requests/Setup/CheckDatabaseRequest.php
index 856e6e0fb9e5..2297408876fa 100644
--- a/app/Http/Requests/Setup/CheckDatabaseRequest.php
+++ b/app/Http/Requests/Setup/CheckDatabaseRequest.php
@@ -9,7 +9,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Http\Requests\Setup;
 
 use App\Http\Requests\Request;
@@ -33,15 +32,15 @@ class CheckDatabaseRequest extends Request
      */
     public function rules()
     {
-		if ( config( 'ninja.preconfigured_install' ) ) {
-			return [];
-		}
+        if (config('ninja.preconfigured_install')) {
+            return [];
+        }
 
-		return [
-			'db_host'     => [ 'required' ],
-			'db_port'     => [ 'required' ],
-			'db_database' => [ 'required' ],
-			'db_username' => [ 'required' ],
-		];
-	}
+        return [
+            'db_host'     => ['required'],
+            'db_port'     => ['required'],
+            'db_database' => ['required'],
+            'db_username' => ['required'],
+        ];
+    }
 }
diff --git a/app/Http/Requests/Setup/CheckMailRequest.php b/app/Http/Requests/Setup/CheckMailRequest.php
index c39683a464d8..7df6368212c9 100644
--- a/app/Http/Requests/Setup/CheckMailRequest.php
+++ b/app/Http/Requests/Setup/CheckMailRequest.php
@@ -9,7 +9,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Http\Requests\Setup;
 
 use App\Http\Requests\Request;
diff --git a/app/Http/Requests/Setup/StoreSetupRequest.php b/app/Http/Requests/Setup/StoreSetupRequest.php
index 657f7451d21c..5432ea689e69 100644
--- a/app/Http/Requests/Setup/StoreSetupRequest.php
+++ b/app/Http/Requests/Setup/StoreSetupRequest.php
@@ -28,39 +28,39 @@ class StoreSetupRequest extends Request
     public function rules()
     {
         $rules = [
-			/*System*/
-			'url'              => 'required',
-			/*Mail driver*/
-			'mail_driver'      => 'required',
-			'encryption'       => 'required_unless:mail_driver,log',
-			'mail_host'        => 'required_unless:mail_driver,log',
-			'mail_username'    => 'required_unless:mail_driver,log',
-			'mail_name'        => 'required_unless:mail_driver,log',
-			'mail_address'     => 'required_unless:mail_driver,log',
-			'mail_password'    => 'required_unless:mail_driver,log',
-			/*user registration*/
-			'privacy_policy'   => 'required',
-			'terms_of_service' => 'required',
-			'first_name'       => 'required',
-			'last_name'        => 'required',
-			'email'            => 'required|email:rfc,dns',
-			'password'         => 'required',
-		];
+            /*System*/
+            'url'              => 'required',
+            /*Mail driver*/
+            'mail_driver'      => 'required',
+            'encryption'       => 'required_unless:mail_driver,log',
+            'mail_host'        => 'required_unless:mail_driver,log',
+            'mail_username'    => 'required_unless:mail_driver,log',
+            'mail_name'        => 'required_unless:mail_driver,log',
+            'mail_address'     => 'required_unless:mail_driver,log',
+            'mail_password'    => 'required_unless:mail_driver,log',
+            /*user registration*/
+            'privacy_policy'   => 'required',
+            'terms_of_service' => 'required',
+            'first_name'       => 'required',
+            'last_name'        => 'required',
+            'email'            => 'required|email:rfc,dns',
+            'password'         => 'required',
+        ];
 
-		if ( ! config( 'ninja.preconfigured_install' ) ) {
-			$rules = array_merge( $rules, [
-				/*Database*/
-				'db_host'     => 'required',
-				'db_database' => 'required',
-				'db_username' => 'required',
-				'db_password' => '',
-			] );
-		}
+        if (! config('ninja.preconfigured_install')) {
+            $rules = array_merge($rules, [
+                /*Database*/
+                'db_host'     => 'required',
+                'db_database' => 'required',
+                'db_username' => 'required',
+                'db_password' => '',
+            ]);
+        }
 
-		return $rules;
-	}
+        return $rules;
+    }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Shop/StoreShopClientRequest.php b/app/Http/Requests/Shop/StoreShopClientRequest.php
index f643890e4efa..95932ea24985 100644
--- a/app/Http/Requests/Shop/StoreShopClientRequest.php
+++ b/app/Http/Requests/Shop/StoreShopClientRequest.php
@@ -55,15 +55,15 @@ class StoreShopClientRequest extends Request
         $rules['settings'] = new ValidClientGroupSettingsRule();
         $rules['contacts.*.email'] = 'nullable|distinct';
         $rules['contacts.*.password'] = [
-                                        'nullable',
-                                        'sometimes',
-                                        'string',
-                                        'min:7',             // must be at least 10 characters in length
-                                        'regex:/[a-z]/',      // must contain at least one lowercase letter
-                                        'regex:/[A-Z]/',      // must contain at least one uppercase letter
-                                        'regex:/[0-9]/',      // must contain at least one digit
-                                        //'regex:/[@$!%*#?&.]/', // must contain a special character
-                                        ];
+            'nullable',
+            'sometimes',
+            'string',
+            'min:7',             // must be at least 10 characters in length
+            'regex:/[a-z]/',      // must contain at least one lowercase letter
+            'regex:/[A-Z]/',      // must contain at least one uppercase letter
+            'regex:/[0-9]/',      // must contain at least one digit
+            //'regex:/[@$!%*#?&.]/', // must contain a special character
+        ];
 
         if ($this->company->account->isFreeHostedClient()) {
             $rules['hosted_clients'] = new CanStoreClientsRule($this->company->id);
@@ -72,7 +72,7 @@ class StoreShopClientRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $this->company = Company::where('company_key', request()->header('X-API-COMPANY-KEY'))->firstOrFail();
 
diff --git a/app/Http/Requests/Shop/StoreShopInvoiceRequest.php b/app/Http/Requests/Shop/StoreShopInvoiceRequest.php
index 8b9802166eb8..d5a70993e57e 100644
--- a/app/Http/Requests/Shop/StoreShopInvoiceRequest.php
+++ b/app/Http/Requests/Shop/StoreShopInvoiceRequest.php
@@ -57,7 +57,7 @@ class StoreShopInvoiceRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $this->company = Company::where('company_key', request()->header('X-API-COMPANY-KEY'))->firstOrFail();
 
diff --git a/app/Http/Requests/Statements/CreateStatementRequest.php b/app/Http/Requests/Statements/CreateStatementRequest.php
index 05d043b6a7c6..2d2adac6e757 100644
--- a/app/Http/Requests/Statements/CreateStatementRequest.php
+++ b/app/Http/Requests/Statements/CreateStatementRequest.php
@@ -9,6 +9,7 @@ use App\Utils\Traits\MakesHash;
 class CreateStatementRequest extends Request
 {
     use MakesHash;
+
     /**
      * Determine if the user is authorized to make this request.
      *
@@ -19,7 +20,6 @@ class CreateStatementRequest extends Request
         // return auth()->user()->isAdmin();
 
         return auth()->user()->can('view', $this->client());
-
     }
 
     /**
@@ -32,14 +32,14 @@ class CreateStatementRequest extends Request
         return [
             'start_date' => 'required|date_format:Y-m-d',
             'end_date'   => 'required|date_format:Y-m-d',
-            'client_id'  => 'bail|required|exists:clients,id,company_id,' . auth()->user()->company()->id,
+            'client_id'  => 'bail|required|exists:clients,id,company_id,'.auth()->user()->company()->id,
             'show_payments_table' => 'boolean',
             'show_aging_table' => 'boolean',
             'status' => 'string',
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/StripeConnect/InitializeStripeConnectRequest.php b/app/Http/Requests/StripeConnect/InitializeStripeConnectRequest.php
index 5156993b9403..3dc5bab1bc95 100644
--- a/app/Http/Requests/StripeConnect/InitializeStripeConnectRequest.php
+++ b/app/Http/Requests/StripeConnect/InitializeStripeConnectRequest.php
@@ -49,9 +49,10 @@ class InitializeStripeConnectRequest extends FormRequest
      */
     public function getTokenContent()
     {
-        if($this->state)
+        if ($this->state) {
             $this->token = $this->state;
-        
+        }
+
         $data = Cache::get($this->token);
 
         return $data;
diff --git a/app/Http/Requests/Subscription/StoreSubscriptionRequest.php b/app/Http/Requests/Subscription/StoreSubscriptionRequest.php
index 7eca75a721ee..441cdd755d18 100644
--- a/app/Http/Requests/Subscription/StoreSubscriptionRequest.php
+++ b/app/Http/Requests/Subscription/StoreSubscriptionRequest.php
@@ -34,7 +34,7 @@ class StoreSubscriptionRequest extends Request
      */
     public function rules()
     {
-        $rules =  [
+        $rules = [
             'product_ids' => ['sometimes'],
             'recurring_product_ids' => ['sometimes'],
             'assigned_user_id' => ['sometimes'],
@@ -54,14 +54,13 @@ class StoreSubscriptionRequest extends Request
             'allow_plan_changes' => ['sometimes'],
             'refund_period' => ['sometimes'],
             'webhook_configuration' => ['array'],
-            'name' => ['required', Rule::unique('subscriptions')->where('company_id', auth()->user()->company()->id)]
+            'name' => ['required', Rule::unique('subscriptions')->where('company_id', auth()->user()->company()->id)],
         ];
 
         return $this->globalRules($rules);
-
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Subscription/UpdateSubscriptionRequest.php b/app/Http/Requests/Subscription/UpdateSubscriptionRequest.php
index a23186882314..2b34f4fd61de 100644
--- a/app/Http/Requests/Subscription/UpdateSubscriptionRequest.php
+++ b/app/Http/Requests/Subscription/UpdateSubscriptionRequest.php
@@ -36,7 +36,7 @@ class UpdateSubscriptionRequest extends Request
      */
     public function rules()
     {
-        $rules =  [
+        $rules = [
             'product_ids' => ['sometimes'],
             'recurring_product_ids' => ['sometimes'],
             'assigned_user_id' => ['sometimes'],
@@ -56,15 +56,13 @@ class UpdateSubscriptionRequest extends Request
             'allow_plan_changes' => ['sometimes'],
             'refund_period' => ['sometimes'],
             'webhook_configuration' => ['array'],
-            'name' => ['sometimes', Rule::unique('subscriptions')->where('company_id', auth()->user()->company()->id)->ignore($this->subscription->id)]
+            'name' => ['sometimes', Rule::unique('subscriptions')->where('company_id', auth()->user()->company()->id)->ignore($this->subscription->id)],
         ];
 
         return $this->globalRules($rules);
-
-
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Task/BulkTaskRequest.php b/app/Http/Requests/Task/BulkTaskRequest.php
index 3b1a14f13f36..b5a4a7a0f36a 100644
--- a/app/Http/Requests/Task/BulkTaskRequest.php
+++ b/app/Http/Requests/Task/BulkTaskRequest.php
@@ -9,7 +9,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Http\Requests\Task;
 
 use App\Http\Requests\Request;
diff --git a/app/Http/Requests/Task/SortTaskRequest.php b/app/Http/Requests/Task/SortTaskRequest.php
index 5843b8728fac..1edfea8c45d5 100644
--- a/app/Http/Requests/Task/SortTaskRequest.php
+++ b/app/Http/Requests/Task/SortTaskRequest.php
@@ -22,16 +22,12 @@ class SortTaskRequest extends Request
      */
     public function authorize() : bool
     {
-
         return true;
 
     }
 
     public function rules()
     {
-
         return [];
-
     }
-
 }
diff --git a/app/Http/Requests/Task/StoreTaskRequest.php b/app/Http/Requests/Task/StoreTaskRequest.php
index d2b2a50ba91b..a1de7bec3f75 100644
--- a/app/Http/Requests/Task/StoreTaskRequest.php
+++ b/app/Http/Requests/Task/StoreTaskRequest.php
@@ -33,15 +33,15 @@ class StoreTaskRequest extends Request
     public function rules()
     {
         $rules = [];
-        
+
         if (isset($this->number)) {
             $rules['number'] = Rule::unique('tasks')->where('company_id', auth()->user()->company()->id);
         }
-    
+
         return $this->globalRules($rules);
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Task/UpdateTaskRequest.php b/app/Http/Requests/Task/UpdateTaskRequest.php
index c62a96151c58..1389f5ce4124 100644
--- a/app/Http/Requests/Task/UpdateTaskRequest.php
+++ b/app/Http/Requests/Task/UpdateTaskRequest.php
@@ -42,16 +42,17 @@ class UpdateTaskRequest extends Request
         return $this->globalRules($rules);
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->decodePrimaryKeys($this->all());
 
         if (array_key_exists('status_id', $input) && is_string($input['status_id'])) {
             $input['status_id'] = $this->decodePrimaryKey($input['status_id']);
         }
-        
-        if(array_key_exists('color', $input) && is_null($input['color']))
+
+        if (array_key_exists('color', $input) && is_null($input['color'])) {
             $input['color'] = '';
+        }
 
         $this->replace($input);
     }
diff --git a/app/Http/Requests/Task/UploadTaskRequest.php b/app/Http/Requests/Task/UploadTaskRequest.php
index d14512cad6dc..250f76cf9198 100644
--- a/app/Http/Requests/Task/UploadTaskRequest.php
+++ b/app/Http/Requests/Task/UploadTaskRequest.php
@@ -27,13 +27,12 @@ class UploadTaskRequest extends Request
 
     public function rules()
     {
+        $rules = [];
 
-    	$rules = [];
-
-		if($this->input('documents'))
+        if ($this->input('documents')) {
             $rules['documents'] = 'file|mimes:csv,png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:2000000';
+        }
 
-    	return $rules;
-
+        return $rules;
     }
 }
diff --git a/app/Http/Requests/TaskScheduler/CreateScheduledTaskRequest.php b/app/Http/Requests/TaskScheduler/CreateScheduledTaskRequest.php
index b4710301ff7f..80b4fc76bfd0 100644
--- a/app/Http/Requests/TaskScheduler/CreateScheduledTaskRequest.php
+++ b/app/Http/Requests/TaskScheduler/CreateScheduledTaskRequest.php
@@ -1,9 +1,7 @@
 <?php
 
-
 namespace App\Http\Requests\TaskScheduler;
 
-
 use App\Http\Requests\Request;
 
 class CreateScheduledTaskRequest extends Request
@@ -32,8 +30,9 @@ class CreateScheduledTaskRequest extends Request
     {
         $input = $this->all();
 
-        if(!array_key_exists('start_from', $input))
+        if (! array_key_exists('start_from', $input)) {
             $input['start_from'] = now();
+        }
 
         $this->replace($input);
     }
diff --git a/app/Http/Requests/TaskScheduler/UpdateScheduleRequest.php b/app/Http/Requests/TaskScheduler/UpdateScheduleRequest.php
index e0bc8a3f9c0c..69b819e84575 100644
--- a/app/Http/Requests/TaskScheduler/UpdateScheduleRequest.php
+++ b/app/Http/Requests/TaskScheduler/UpdateScheduleRequest.php
@@ -9,7 +9,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Http\Requests\TaskScheduler;
 
 use App\Http\Requests\Request;
@@ -34,7 +33,7 @@ class UpdateScheduleRequest extends Request
             'paused' => 'sometimes|bool',
             'repeat_every' => 'sometimes|string|in:DAY,WEEK,BIWEEKLY,MONTH,3MONTHS,YEAR',
             'start_from' => 'sometimes',
-            'scheduled_run'=>'sometimes'
+            'scheduled_run'=>'sometimes',
         ];
     }
 
@@ -43,8 +42,8 @@ class UpdateScheduleRequest extends Request
         $input = $this->all();
 
         if (isset($input['start_from'])) {
-            $input['scheduled_run'] = Carbon::parse((int)$input['start_from']);
-            $input['start_from'] = Carbon::parse((int)$input['start_from']);
+            $input['scheduled_run'] = Carbon::parse((int) $input['start_from']);
+            $input['start_from'] = Carbon::parse((int) $input['start_from']);
         }
 
         $this->replace($input);
diff --git a/app/Http/Requests/TaskScheduler/UpdateScheduledJobRequest.php b/app/Http/Requests/TaskScheduler/UpdateScheduledJobRequest.php
index 96e3ec47bbfd..0db34ccc000f 100644
--- a/app/Http/Requests/TaskScheduler/UpdateScheduledJobRequest.php
+++ b/app/Http/Requests/TaskScheduler/UpdateScheduledJobRequest.php
@@ -1,14 +1,11 @@
 <?php
 
-
 namespace App\Http\Requests\TaskScheduler;
 
-
 use App\Http\Requests\Request;
 
 class UpdateScheduledJobRequest extends Request
 {
-
     /**
      * Determine if the user is authorized to make this request.
      *
diff --git a/app/Http/Requests/TaskStatus/EditTaskStatusRequest.php b/app/Http/Requests/TaskStatus/EditTaskStatusRequest.php
index 834af8d2f2e2..7b9ced466626 100644
--- a/app/Http/Requests/TaskStatus/EditTaskStatusRequest.php
+++ b/app/Http/Requests/TaskStatus/EditTaskStatusRequest.php
@@ -32,7 +32,7 @@ class EditTaskStatusRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php b/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php
index aee32aede593..201ebe22b8e6 100644
--- a/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php
+++ b/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php
@@ -28,12 +28,13 @@ class StoreTaskStatusRequest extends Request
         return auth()->user()->isAdmin();
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
-            if(array_key_exists('color', $input) && is_null($input['color']))
-                $input['color'] = '';
+        if (array_key_exists('color', $input) && is_null($input['color'])) {
+            $input['color'] = '';
+        }
 
         $this->replace($input);
     }
@@ -42,7 +43,7 @@ class StoreTaskStatusRequest extends Request
     {
         $rules = [];
 
-        $rules['name'] ='required|unique:task_statuses,name,null,null,company_id,'.auth()->user()->companyId();
+        $rules['name'] = 'required|unique:task_statuses,name,null,null,company_id,'.auth()->user()->companyId();
 
         return $rules;
     }
diff --git a/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php b/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php
index 491069af4eb2..ce3a19f4c238 100644
--- a/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php
+++ b/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php
@@ -38,16 +38,16 @@ class UpdateTaskStatusRequest extends Request
         //     $rules['name'] = Rule::unique('task_statuses')->where('company_id', auth()->user()->company()->id)->ignore($this->task_status->id);
         // }
 
-
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
-            if(array_key_exists('color', $input) && is_null($input['color']))
-                $input['color'] = '';
+        if (array_key_exists('color', $input) && is_null($input['color'])) {
+            $input['color'] = '';
+        }
 
         $this->replace($input);
     }
diff --git a/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php b/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php
index 41cf961b44ba..ab50161c858f 100644
--- a/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php
+++ b/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php
@@ -32,10 +32,10 @@ class UpdateTaxRateRequest extends Request
 
         $rules['rate'] = 'numeric';
 
-        if($this->number)
+        if ($this->number) {
             $rules['number'] = Rule::unique('tax_rates')->where('company_id', auth()->user()->company()->id)->ignore($this->tax_rate->id);
+        }
 
         return $rules;
-
     }
 }
diff --git a/app/Http/Requests/Template/ShowTemplateRequest.php b/app/Http/Requests/Template/ShowTemplateRequest.php
index c686857a07c4..922299c59ac7 100644
--- a/app/Http/Requests/Template/ShowTemplateRequest.php
+++ b/app/Http/Requests/Template/ShowTemplateRequest.php
@@ -37,7 +37,7 @@ class ShowTemplateRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Token/BulkTokenRequest.php b/app/Http/Requests/Token/BulkTokenRequest.php
index 9ae5fb3e888b..94afadcc1f6e 100644
--- a/app/Http/Requests/Token/BulkTokenRequest.php
+++ b/app/Http/Requests/Token/BulkTokenRequest.php
@@ -9,7 +9,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Http\Requests\Token;
 
 use App\Http\Requests\Request;
diff --git a/app/Http/Requests/Twilio/ConfirmSmsRequest.php b/app/Http/Requests/Twilio/ConfirmSmsRequest.php
new file mode 100644
index 000000000000..537dcbab7da4
--- /dev/null
+++ b/app/Http/Requests/Twilio/ConfirmSmsRequest.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Http\Requests\Twilio;
+
+use App\Http\Requests\Request;
+
+
+class ConfirmSmsRequest extends Request
+{
+
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize() : bool
+    {
+        return auth()->user()->isAdmin();
+    }
+
+    public function rules()
+    {
+
+        return [
+            'code' => 'required',
+        ];
+    }
+
+}
diff --git a/app/Http/Requests/Twilio/GenerateSmsRequest.php b/app/Http/Requests/Twilio/GenerateSmsRequest.php
new file mode 100644
index 000000000000..c22580dcf46f
--- /dev/null
+++ b/app/Http/Requests/Twilio/GenerateSmsRequest.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Http\Requests\Twilio;
+
+use App\Http\Requests\Request;
+
+
+class GenerateSmsRequest extends Request
+{
+
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize() : bool
+    {
+        return auth()->user()->isAdmin();
+    }
+
+
+    public function rules()
+    {
+
+        return [
+            'phone' => 'required|regex:^\+[1-9]\d{1,14}$^',
+        ];
+        
+    }
+}
diff --git a/app/Http/Requests/User/AttachCompanyUserRequest.php b/app/Http/Requests/User/AttachCompanyUserRequest.php
index 4cba2f792003..b89c6641e9c7 100644
--- a/app/Http/Requests/User/AttachCompanyUserRequest.php
+++ b/app/Http/Requests/User/AttachCompanyUserRequest.php
@@ -30,7 +30,7 @@ class AttachCompanyUserRequest extends Request
         return auth()->user()->isAdmin();
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $is_admin = request()->has('is_admin') ? request()->input('is_admin') : false;
         $permissions = request()->has('permissions') ? request()->input('permissions') : '';
diff --git a/app/Http/Requests/User/BulkUserRequest.php b/app/Http/Requests/User/BulkUserRequest.php
index f8f2109bddcc..0b47131c4d0f 100644
--- a/app/Http/Requests/User/BulkUserRequest.php
+++ b/app/Http/Requests/User/BulkUserRequest.php
@@ -30,16 +30,16 @@ class BulkUserRequest extends Request
 
     public function rules()
     {
-
         $rules = [];
 
-        if(Ninja::isHosted() && $this->action && $this->action == 'restore')
+        if (Ninja::isHosted() && $this->action && $this->action == 'restore') {
             $rules['ids'] = new CanRestoreUserRule();
+        }
 
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/User/DetachCompanyUserRequest.php b/app/Http/Requests/User/DetachCompanyUserRequest.php
index 90d1fce86a41..def5c66edfc4 100644
--- a/app/Http/Requests/User/DetachCompanyUserRequest.php
+++ b/app/Http/Requests/User/DetachCompanyUserRequest.php
@@ -20,7 +20,7 @@ class DetachCompanyUserRequest extends Request
 {
     use MakesHash;
     use ChecksEntityStatus;
-    
+
     /**
      * Determine if the user is authorized to make this request.
      *
diff --git a/app/Http/Requests/User/StoreUserRequest.php b/app/Http/Requests/User/StoreUserRequest.php
index 75e33cc915d6..dfd752d1e09c 100644
--- a/app/Http/Requests/User/StoreUserRequest.php
+++ b/app/Http/Requests/User/StoreUserRequest.php
@@ -54,14 +54,15 @@ class StoreUserRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
         //unique user rule - check company_user table for user_id / company_id  / account_id if none exist we can add the user. ELSE return false
 
-        if(array_key_exists('email', $input))
+        if (array_key_exists('email', $input)) {
             $input['email'] = trim($input['email']);
+        }
 
         if (isset($input['company_user'])) {
             if (! isset($input['company_user']['is_admin'])) {
diff --git a/app/Http/Requests/User/UpdateUserRequest.php b/app/Http/Requests/User/UpdateUserRequest.php
index 6af6de21abf5..42fa3f66e82e 100644
--- a/app/Http/Requests/User/UpdateUserRequest.php
+++ b/app/Http/Requests/User/UpdateUserRequest.php
@@ -41,12 +41,13 @@ class UpdateUserRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
-        if(array_key_exists('email', $input))
+        if (array_key_exists('email', $input)) {
             $input['email'] = trim($input['email']);
+        }
 
         $this->replace($input);
     }
diff --git a/app/Http/Requests/Vendor/BulkVendorRequest.php b/app/Http/Requests/Vendor/BulkVendorRequest.php
index 9914685c288a..c978773296bb 100644
--- a/app/Http/Requests/Vendor/BulkVendorRequest.php
+++ b/app/Http/Requests/Vendor/BulkVendorRequest.php
@@ -9,7 +9,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Http\Requests\Vendor;
 
 use App\Http\Requests\Request;
diff --git a/app/Http/Requests/Vendor/StoreVendorRequest.php b/app/Http/Requests/Vendor/StoreVendorRequest.php
index 09da4ffa6476..02bc2bcf37cc 100644
--- a/app/Http/Requests/Vendor/StoreVendorRequest.php
+++ b/app/Http/Requests/Vendor/StoreVendorRequest.php
@@ -38,7 +38,7 @@ class StoreVendorRequest extends Request
         //$rules['name'] = 'required|min:1';
         // $rules['id_number'] = 'unique:vendors,id_number,'.$this->id.',id,company_id,'.auth()->user()->company()->id;
         //$rules['settings'] = new ValidVendorGroupSettingsRule();
-        
+
         $rules['contacts.*.email'] = 'bail|nullable|distinct|sometimes|email';
 
         if (isset($this->number)) {
@@ -52,12 +52,12 @@ class StoreVendorRequest extends Request
         return $rules;
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
         $input = $this->decodePrimaryKeys($input);
-        
+
         $this->replace($input);
     }
 
diff --git a/app/Http/Requests/Vendor/UpdateVendorRequest.php b/app/Http/Requests/Vendor/UpdateVendorRequest.php
index 0f964d3d2597..aa0d9ad62abd 100644
--- a/app/Http/Requests/Vendor/UpdateVendorRequest.php
+++ b/app/Http/Requests/Vendor/UpdateVendorRequest.php
@@ -36,11 +36,12 @@ class UpdateVendorRequest extends Request
         /* Ensure we have a client name, and that all emails are unique*/
 
         $rules['country_id'] = 'integer|nullable';
-        
-        if($this->number)
-            $rules['number'] = Rule::unique('vendors')->where('company_id', auth()->user()->company()->id)->ignore($this->vendor->id);
 
-        // if($this->id_number)   
+        if ($this->number) {
+            $rules['number'] = Rule::unique('vendors')->where('company_id', auth()->user()->company()->id)->ignore($this->vendor->id);
+        }
+
+        // if($this->id_number)
         //     $rules['id_number'] = Rule::unique('vendors')->where('company_id', auth()->user()->company()->id)->ignore($this->vendor->id);
 
         $rules['contacts.*.email'] = 'nullable|distinct';
@@ -58,7 +59,7 @@ class UpdateVendorRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Vendor/UploadVendorRequest.php b/app/Http/Requests/Vendor/UploadVendorRequest.php
index 62e9a21a1f4c..ca89b547cbba 100644
--- a/app/Http/Requests/Vendor/UploadVendorRequest.php
+++ b/app/Http/Requests/Vendor/UploadVendorRequest.php
@@ -27,13 +27,12 @@ class UploadVendorRequest extends Request
 
     public function rules()
     {
+        $rules = [];
 
-    	$rules = [];
-
-		if($this->input('documents'))
+        if ($this->input('documents')) {
             $rules['documents'] = 'file|mimes:csv,png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:2000000';
+        }
 
-    	return $rules;
-
+        return $rules;
     }
 }
diff --git a/app/Http/Requests/VendorPortal/Documents/ShowDocumentRequest.php b/app/Http/Requests/VendorPortal/Documents/ShowDocumentRequest.php
new file mode 100644
index 000000000000..f9594292f8fc
--- /dev/null
+++ b/app/Http/Requests/VendorPortal/Documents/ShowDocumentRequest.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Http\Requests\VendorPortal\Documents;
+
+use App\Utils\Traits\MakesHash;
+use Illuminate\Foundation\Http\FormRequest;
+
+class ShowDocumentRequest extends FormRequest
+{
+    use MakesHash;
+
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return auth()->guard('vendor')->user()->client_id == $this->document->documentable_id
+            || $this->document->company_id == auth()->guard('vendor')->user()->company_id;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            //
+        ];
+    }
+}
diff --git a/app/Http/Requests/VendorPortal/PurchaseOrders/ShowPurchaseOrderRequest.php b/app/Http/Requests/VendorPortal/PurchaseOrders/ShowPurchaseOrderRequest.php
index 03b074d04fb8..83f3349df017 100644
--- a/app/Http/Requests/VendorPortal/PurchaseOrders/ShowPurchaseOrderRequest.php
+++ b/app/Http/Requests/VendorPortal/PurchaseOrders/ShowPurchaseOrderRequest.php
@@ -23,7 +23,7 @@ class ShowPurchaseOrderRequest extends Request
      */
     public function authorize() : bool
     {
-        return (int)auth()->guard('vendor')->user()->vendor_id === (int)$this->purchase_order->vendor_id
-            &&  auth()->guard('vendor')->user()->company->enabled_modules & PortalComposer::MODULE_PURCHASE_ORDERS;
+        return (int) auth()->guard('vendor')->user()->vendor_id === (int) $this->purchase_order->vendor_id
+            && auth()->guard('vendor')->user()->company->enabled_modules & PortalComposer::MODULE_PURCHASE_ORDERS;
     }
 }
diff --git a/app/Http/Requests/VendorPortal/PurchaseOrders/ShowPurchaseOrdersRequest.php b/app/Http/Requests/VendorPortal/PurchaseOrders/ShowPurchaseOrdersRequest.php
index c15a2bc3e04d..0632a865009b 100644
--- a/app/Http/Requests/VendorPortal/PurchaseOrders/ShowPurchaseOrdersRequest.php
+++ b/app/Http/Requests/VendorPortal/PurchaseOrders/ShowPurchaseOrdersRequest.php
@@ -24,6 +24,5 @@ class ShowPurchaseOrdersRequest extends Request
     public function authorize() : bool
     {
         return auth()->guard('vendor')->user()->company->enabled_modules & PortalComposer::MODULE_PURCHASE_ORDERS;
-
     }
 }
diff --git a/app/Http/Requests/Webhook/BulkWebhookRequest.php b/app/Http/Requests/Webhook/BulkWebhookRequest.php
index 773ddce18a81..8d1afe5014fe 100644
--- a/app/Http/Requests/Webhook/BulkWebhookRequest.php
+++ b/app/Http/Requests/Webhook/BulkWebhookRequest.php
@@ -9,7 +9,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Http\Requests\Webhook;
 
 use App\Http\Requests\Request;
diff --git a/app/Http/Requests/Webhook/StoreWebhookRequest.php b/app/Http/Requests/Webhook/StoreWebhookRequest.php
index e1db86ac73a2..22978933693b 100644
--- a/app/Http/Requests/Webhook/StoreWebhookRequest.php
+++ b/app/Http/Requests/Webhook/StoreWebhookRequest.php
@@ -33,7 +33,7 @@ class StoreWebhookRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/Requests/Webhook/UpdateWebhookRequest.php b/app/Http/Requests/Webhook/UpdateWebhookRequest.php
index 5b946c548563..bc255153f889 100644
--- a/app/Http/Requests/Webhook/UpdateWebhookRequest.php
+++ b/app/Http/Requests/Webhook/UpdateWebhookRequest.php
@@ -37,7 +37,7 @@ class UpdateWebhookRequest extends Request
         ];
     }
 
-    protected function prepareForValidation()
+    public function prepareForValidation()
     {
         $input = $this->all();
 
diff --git a/app/Http/ValidationRules/Account/BlackListRule.php b/app/Http/ValidationRules/Account/BlackListRule.php
index 8dee26c6ad2b..51fab56af44a 100644
--- a/app/Http/ValidationRules/Account/BlackListRule.php
+++ b/app/Http/ValidationRules/Account/BlackListRule.php
@@ -23,6 +23,8 @@ class BlackListRule implements Rule
         'candassociates.com',
         'vusra.com',
         'fourthgenet.com',
+        'arxxwalls.com',
+        'superhostforumla.com'
     ];
 
     /**
@@ -32,17 +34,13 @@ class BlackListRule implements Rule
      */
     public function passes($attribute, $value)
     {
-        
-    $parts = explode("@", $value);
+        $parts = explode('@', $value);
 
-        if(is_array($parts))
-        {
+        if (is_array($parts)) {
             return ! in_array($parts[1], $this->blacklist);
-        }
-        else
+        } else {
             return true;
-
-
+        }
     }
 
     /**
@@ -50,8 +48,6 @@ class BlackListRule implements Rule
      */
     public function message()
     {
-        return "This domain is blacklisted, if you think this is in error, please email contact@invoiceninja.com";
+        return 'This domain is blacklisted, if you think this is in error, please email contact@invoiceninja.com';
     }
-
-
 }
diff --git a/app/Http/ValidationRules/Account/EmailBlackListRule.php b/app/Http/ValidationRules/Account/EmailBlackListRule.php
index 06a5f854a986..4f391c0a2571 100644
--- a/app/Http/ValidationRules/Account/EmailBlackListRule.php
+++ b/app/Http/ValidationRules/Account/EmailBlackListRule.php
@@ -20,7 +20,7 @@ use Illuminate\Contracts\Validation\Rule;
 class EmailBlackListRule implements Rule
 {
     public array $blacklist = [
-        
+
     ];
 
     /**
@@ -30,9 +30,7 @@ class EmailBlackListRule implements Rule
      */
     public function passes($attribute, $value)
     {
-        
-        return !in_array($value, $this->blacklist);
-
+        return ! in_array($value, $this->blacklist);
     }
 
     /**
@@ -40,8 +38,6 @@ class EmailBlackListRule implements Rule
      */
     public function message()
     {
-        return "This email address is blacklisted, if you think this is in error, please email contact@invoiceninja.com";
+        return 'This email address is blacklisted, if you think this is in error, please email contact@invoiceninja.com';
     }
-
-
 }
diff --git a/app/Http/ValidationRules/Client/CountryCodeExistsRule.php b/app/Http/ValidationRules/Client/CountryCodeExistsRule.php
index c5c037d1465a..a846764eb26f 100644
--- a/app/Http/ValidationRules/Client/CountryCodeExistsRule.php
+++ b/app/Http/ValidationRules/Client/CountryCodeExistsRule.php
@@ -19,7 +19,6 @@ use Illuminate\Contracts\Validation\Rule;
  */
 class CountryCodeExistsRule implements Rule
 {
-
     public function __construct()
     {
     }
@@ -40,7 +39,6 @@ class CountryCodeExistsRule implements Rule
     public function message()
     {
         return 'Country code does not exist';
-
     }
 
     /**
@@ -52,9 +50,10 @@ class CountryCodeExistsRule implements Rule
                         ->orWhere('iso_3166_3', $value)
                         ->exists();
 
-        if ($country) 
+        if ($country) {
             return true;
-        
+        }
+
         return false;
     }
 }
diff --git a/app/Http/ValidationRules/Company/ValidCompanyQuantity.php b/app/Http/ValidationRules/Company/ValidCompanyQuantity.php
index 2471c43ee861..a465aef0a3a0 100644
--- a/app/Http/ValidationRules/Company/ValidCompanyQuantity.php
+++ b/app/Http/ValidationRules/Company/ValidCompanyQuantity.php
@@ -26,12 +26,11 @@ class ValidCompanyQuantity implements Rule
      */
     public function passes($attribute, $value)
     {
-        if(Ninja::isSelfHost())
+        if (Ninja::isSelfHost()) {
             return auth()->user()->company()->account->companies->count() < 10;
-
+        }
 
         return auth()->user()->company()->account->companies->count() < auth()->user()->company()->account->hosted_company_count;
-
     }
 
     /**
diff --git a/app/Http/ValidationRules/Company/ValidSubdomain.php b/app/Http/ValidationRules/Company/ValidSubdomain.php
index d060816fe11f..abc0866b572c 100644
--- a/app/Http/ValidationRules/Company/ValidSubdomain.php
+++ b/app/Http/ValidationRules/Company/ValidSubdomain.php
@@ -24,7 +24,6 @@ class ValidSubdomain implements Rule
      * @param mixed $value
      * @return bool
      */
-    
     private $input;
 
     public function __construct($input)
@@ -34,8 +33,9 @@ class ValidSubdomain implements Rule
 
     public function passes($attribute, $value)
     {
-        if(empty($input['subdomain']))
+        if (empty($input['subdomain'])) {
             return true;
+        }
 
         return MultiDB::checkDomainAvailable($input['subdomain']);
     }
diff --git a/app/Http/ValidationRules/Credit/CreditsSumRule.php b/app/Http/ValidationRules/Credit/CreditsSumRule.php
index 6d133aae9c51..8cdc1fab2523 100644
--- a/app/Http/ValidationRules/Credit/CreditsSumRule.php
+++ b/app/Http/ValidationRules/Credit/CreditsSumRule.php
@@ -21,7 +21,6 @@ class CreditsSumRule implements Rule
 {
     use MakesHash;
 
-
     private $input;
 
     public function __construct($input)
diff --git a/app/Http/ValidationRules/Credit/ValidCreditsRules.php b/app/Http/ValidationRules/Credit/ValidCreditsRules.php
index cef99ee4ede0..f80b24e5bf48 100644
--- a/app/Http/ValidationRules/Credit/ValidCreditsRules.php
+++ b/app/Http/ValidationRules/Credit/ValidCreditsRules.php
@@ -44,7 +44,6 @@ class ValidCreditsRules implements Rule
     private function checkCreditsAreHomogenous()
     {
         if (! array_key_exists('client_id', $this->input)) {
-
             $this->error_msg = ctrans('texts.client_id_required');
 
             return false;
@@ -83,7 +82,6 @@ class ValidCreditsRules implements Rule
         }
 
         if (count($this->input['credits']) >= 1) {
-
         }
 
         return true;
diff --git a/app/Http/ValidationRules/Credit/ValidInvoiceCreditRule.php b/app/Http/ValidationRules/Credit/ValidInvoiceCreditRule.php
index 086493a9f568..ec91a0e91ce2 100644
--- a/app/Http/ValidationRules/Credit/ValidInvoiceCreditRule.php
+++ b/app/Http/ValidationRules/Credit/ValidInvoiceCreditRule.php
@@ -50,15 +50,17 @@ class ValidInvoiceCreditRule implements Rule
     {
         $invoice = Invoice::withTrashed()->find($value);
 
-        if($invoice->balance >= $invoice->amount){
-            $this->error_message = "Cannot reverse an invoice with no payment applied.";
+        if ($invoice->balance >= $invoice->amount) {
+            $this->error_message = 'Cannot reverse an invoice with no payment applied.';
+
             return false;
         }
 
         $existing_credit_amounts = $invoice->credits()->sum('amount');
 
-        if($this->sumCredit() > ($invoice->amount - $invoice->balance - $existing_credit_amounts)){
-            $this->error_message = "Credit cannot exceed the payment / credits already applied to invoice.";
+        if ($this->sumCredit() > ($invoice->amount - $invoice->balance - $existing_credit_amounts)) {
+            $this->error_message = 'Credit cannot exceed the payment / credits already applied to invoice.';
+
             return false;
         }
 
@@ -69,8 +71,7 @@ class ValidInvoiceCreditRule implements Rule
     {
         $cost = 0;
 
-        foreach(request()->input('line_items') as $item)
-        {
+        foreach (request()->input('line_items') as $item) {
             $cost += $item['cost'] * $item['quantity'];
         }
 
diff --git a/app/Http/ValidationRules/Expense/UniqueExpenseNumberRule.php b/app/Http/ValidationRules/Expense/UniqueExpenseNumberRule.php
index 68afe5bf45cf..02c3a5a502f5 100644
--- a/app/Http/ValidationRules/Expense/UniqueExpenseNumberRule.php
+++ b/app/Http/ValidationRules/Expense/UniqueExpenseNumberRule.php
@@ -58,6 +58,5 @@ class UniqueExpenseNumberRule implements Rule
                           ->withTrashed();
 
         return $expense->exists();
-
     }
 }
diff --git a/app/Http/ValidationRules/Invoice/InvoiceBalanceSanity.php b/app/Http/ValidationRules/Invoice/InvoiceBalanceSanity.php
index 6ac1f1cf39fb..54db3d809bdb 100644
--- a/app/Http/ValidationRules/Invoice/InvoiceBalanceSanity.php
+++ b/app/Http/ValidationRules/Invoice/InvoiceBalanceSanity.php
@@ -26,7 +26,6 @@ class InvoiceBalanceSanity implements Rule
 
     private $message;
 
-
     public function __construct(Invoice $invoice, $input)
     {
         $this->invoice = $invoice;
@@ -56,22 +55,20 @@ class InvoiceBalanceSanity implements Rule
      */
     private function checkIfInvoiceBalanceIsSane() : bool
     {
-
         DB::connection(config('database.default'))->beginTransaction();
 
         $this->invoice = Invoice::on(config('database.default'))->withTrashed()->find($this->invoice->id);
         $this->invoice->line_items = $this->input['line_items'];
         $temp_invoice = $this->invoice->calc()->getTempEntity();
- 
+
         DB::connection(config('database.default'))->rollBack();
 
-        if($temp_invoice->balance < 0){
+        if ($temp_invoice->balance < 0) {
             $this->message = 'Invoice balance cannot go negative';
+
             return false;
         }
 
-
-       return true;
-
+        return true;
     }
 }
diff --git a/app/Http/ValidationRules/Ninja/CanAddUserRule.php b/app/Http/ValidationRules/Ninja/CanAddUserRule.php
index 875039bb9fbf..feacc80543ac 100644
--- a/app/Http/ValidationRules/Ninja/CanAddUserRule.php
+++ b/app/Http/ValidationRules/Ninja/CanAddUserRule.php
@@ -20,7 +20,6 @@ use Illuminate\Contracts\Validation\Rule;
  */
 class CanAddUserRule implements Rule
 {
-
     public function __construct()
     {
     }
@@ -34,8 +33,9 @@ class CanAddUserRule implements Rule
     {
 
         /* If the user is active then we can add them to the company */
-        if(User::where('email', request()->input('email'))->where('account_id', auth()->user()->account_id)->where('is_deleted',0)->exists())
+        if (User::where('email', request()->input('email'))->where('account_id', auth()->user()->account_id)->where('is_deleted', 0)->exists()) {
             return true;
+        }
 
         /* Check that we have sufficient quota to allow this to happen */
         $count = CompanyUser::query()
@@ -47,7 +47,6 @@ class CanAddUserRule implements Rule
                           ->count('company_user.user_id');
 
         return $count < auth()->user()->company()->account->num_users;
-
     }
 
     /**
diff --git a/app/Http/ValidationRules/Ninja/CanRestoreUserRule.php b/app/Http/ValidationRules/Ninja/CanRestoreUserRule.php
index 55ce7b35fa9b..6a239afb07df 100644
--- a/app/Http/ValidationRules/Ninja/CanRestoreUserRule.php
+++ b/app/Http/ValidationRules/Ninja/CanRestoreUserRule.php
@@ -20,7 +20,6 @@ use Illuminate\Contracts\Validation\Rule;
  */
 class CanRestoreUserRule implements Rule
 {
-
     public function __construct()
     {
     }
@@ -32,8 +31,7 @@ class CanRestoreUserRule implements Rule
      */
     public function passes($attribute, $value)
     {
-
-          $count = CompanyUser::query()
+        $count = CompanyUser::query()
                               ->where('company_user.account_id', auth()->user()->account_id)
                               ->join('users', 'users.id', '=', 'company_user.user_id')
                               ->whereNull('users.deleted_at')
@@ -42,7 +40,6 @@ class CanRestoreUserRule implements Rule
                               ->count('company_user.user_id');
 
         return $count < auth()->user()->company()->account->num_users;
-
     }
 
     /**
diff --git a/app/Http/ValidationRules/Payment/ValidInvoicesRules.php b/app/Http/ValidationRules/Payment/ValidInvoicesRules.php
index 121c1e7078c5..a3360fcd9c58 100644
--- a/app/Http/ValidationRules/Payment/ValidInvoicesRules.php
+++ b/app/Http/ValidationRules/Payment/ValidInvoicesRules.php
@@ -44,51 +44,44 @@ class ValidInvoicesRules implements Rule
     private function checkInvoicesAreHomogenous()
     {
         if (! array_key_exists('client_id', $this->input)) {
-
             $this->error_msg = ctrans('texts.client_id_required');
 
             return false;
         }
 
         $unique_array = [];
-        
+
         //todo optimize this into a single query
         foreach ($this->input['invoices'] as $invoice) {
-
             $unique_array[] = $invoice['invoice_id'];
 
-            if(!array_key_exists('amount', $invoice)){
-                $this->error_msg = ctrans('texts.amount') . " required";
+            if (! array_key_exists('amount', $invoice)) {
+                $this->error_msg = ctrans('texts.amount').' required';
+
                 return false;
             }
 
             $inv = Invoice::withTrashed()->whereId($invoice['invoice_id'])->first();
 
             if (! $inv) {
-
                 $this->error_msg = ctrans('texts.invoice_not_found');
 
                 return false;
             }
 
             if ($inv->client_id != $this->input['client_id']) {
-
                 $this->error_msg = ctrans('texts.invoices_dont_match_client');
 
                 return false;
             }
 
-            if($inv->status_id == Invoice::STATUS_DRAFT && $invoice['amount'] <= $inv->amount){
+            if ($inv->status_id == Invoice::STATUS_DRAFT && $invoice['amount'] <= $inv->amount) {
                 //catch here nothing to do - we need this to prevent the last elseif triggering
-            }
-            else if($inv->status_id == Invoice::STATUS_DRAFT && floatval($invoice['amount']) > floatval($inv->amount)){
-
+            } elseif ($inv->status_id == Invoice::STATUS_DRAFT && floatval($invoice['amount']) > floatval($inv->amount)) {
                 $this->error_msg = 'Amount cannot be greater than invoice balance';
 
                 return false;
-            }
-            else if(floatval($invoice['amount']) > floatval($inv->balance)) {
-
+            } elseif (floatval($invoice['amount']) > floatval($inv->balance)) {
                 $this->error_msg = ctrans('texts.amount_greater_than_balance_v5');
 
                 return false;
diff --git a/app/Http/ValidationRules/Payment/ValidRefundableRequest.php b/app/Http/ValidationRules/Payment/ValidRefundableRequest.php
index 93b0b24f1260..a6e09e000bb2 100644
--- a/app/Http/ValidationRules/Payment/ValidRefundableRequest.php
+++ b/app/Http/ValidationRules/Payment/ValidRefundableRequest.php
@@ -63,7 +63,6 @@ class ValidRefundableRequest implements Rule
             }
         }
 
-
         foreach ($request_invoices as $request_invoice) {
             $this->checkInvoiceIsPaymentable($request_invoice, $payment);
         }
@@ -79,8 +78,9 @@ class ValidRefundableRequest implements Rule
     {
         $invoice = Invoice::whereId($invoice['invoice_id'])->whereCompanyId($payment->company_id)->withTrashed()->first();
 
-        if(!$invoice){
-            $this->error_msg = "Invoice not found for refund";
+        if (! $invoice) {
+            $this->error_msg = 'Invoice not found for refund';
+
             return false;
         }
 
@@ -158,7 +158,7 @@ class ValidRefundableRequest implements Rule
                 if ($request_credit['amount'] > $refundable_amount) {
                     $credit = $paymentable;
 
-                    $this->error_msg = ctrans('texts.max_refundable_credit',['credit' => $credit->hashed_id, 'amount' => $refundable_amount]);
+                    $this->error_msg = ctrans('texts.max_refundable_credit', ['credit' => $credit->hashed_id, 'amount' => $refundable_amount]);
 
                     return false;
                 }
diff --git a/app/Http/ValidationRules/PaymentAmountsBalanceRule.php b/app/Http/ValidationRules/PaymentAmountsBalanceRule.php
index 5169b133e95d..85664349cdf9 100644
--- a/app/Http/ValidationRules/PaymentAmountsBalanceRule.php
+++ b/app/Http/ValidationRules/PaymentAmountsBalanceRule.php
@@ -59,24 +59,22 @@ class PaymentAmountsBalanceRule implements Rule
 
         if (request()->input('credits') && is_array(request()->input('credits'))) {
             foreach (request()->input('credits') as $credit) {
-                
-                if(array_key_exists('amount', $credit))
+                if (array_key_exists('amount', $credit)) {
                     $payment_amounts += $credit['amount'];
+                }
             }
         }
 
         if (request()->input('invoices') && is_array(request()->input('invoices'))) {
             foreach (request()->input('invoices') as $invoice) {
- 
-                if(array_key_exists('amount', $invoice))
+                if (array_key_exists('amount', $invoice)) {
                     $invoice_amounts += $invoice['amount'];
+                }
             }
         } else {
             return true;
-        } 
-        
-        return round($payment_amounts,2) >= round($invoice_amounts,2);
+        }
 
+        return round($payment_amounts, 2) >= round($invoice_amounts, 2);
     }
-
 }
diff --git a/app/Http/ValidationRules/PaymentAppliedValidAmount.php b/app/Http/ValidationRules/PaymentAppliedValidAmount.php
index 424926aa90fd..676155b292fe 100644
--- a/app/Http/ValidationRules/PaymentAppliedValidAmount.php
+++ b/app/Http/ValidationRules/PaymentAppliedValidAmount.php
@@ -53,13 +53,13 @@ class PaymentAppliedValidAmount implements Rule
 
         $payment_amounts = $payment->amount - $payment->refunded - $payment->applied;
 
-        if(request()->has('credits') 
-            && is_array(request()->input('credits')) 
-            && count(request()->input('credits')) == 0 
-            && request()->has('invoices') 
-            && is_array(request()->input('invoices')) 
-            && count(request()->input('invoices')) == 0){
-           return true;
+        if (request()->has('credits')
+            && is_array(request()->input('credits'))
+            && count(request()->input('credits')) == 0
+            && request()->has('invoices')
+            && is_array(request()->input('invoices'))
+            && count(request()->input('invoices')) == 0) {
+            return true;
         }
 
         if (request()->input('credits') && is_array(request()->input('credits'))) {
@@ -75,6 +75,6 @@ class PaymentAppliedValidAmount implements Rule
         }
 
         // nlog("{round($payment_amounts,3)} >= {round($invoice_amounts,3)}");
-        return  round($payment_amounts,3) >= round($invoice_amounts,3);
+        return  round($payment_amounts, 3) >= round($invoice_amounts, 3);
     }
 }
diff --git a/app/Http/ValidationRules/Project/ValidProjectForClient.php b/app/Http/ValidationRules/Project/ValidProjectForClient.php
index d9c5e47dfb6d..f69de6356611 100644
--- a/app/Http/ValidationRules/Project/ValidProjectForClient.php
+++ b/app/Http/ValidationRules/Project/ValidProjectForClient.php
@@ -30,6 +30,7 @@ class ValidProjectForClient implements Rule
     {
         $this->input = $input;
     }
+
     /**
      * @param string $attribute
      * @param mixed $value
@@ -42,15 +43,16 @@ class ValidProjectForClient implements Rule
         if (empty($this->input['project_id'])) {
             return true;
         }
-        
+
         // if (is_string($this->input['project_id'])) {
         //     $this->input['project_id'] = $this->decodePrimaryKey($this->input['project_id']);
         // }
 
         $project = Project::find($this->input['project_id']);
 
-        if(!$project){
-            $this->message = "Project not found";
+        if (! $project) {
+            $this->message = 'Project not found';
+
             return;
         }
 
diff --git a/app/Http/ValidationRules/Quote/ConvertableQuoteRule.php b/app/Http/ValidationRules/Quote/ConvertableQuoteRule.php
index afa88f4c8de8..55e9d2a26b29 100644
--- a/app/Http/ValidationRules/Quote/ConvertableQuoteRule.php
+++ b/app/Http/ValidationRules/Quote/ConvertableQuoteRule.php
@@ -24,7 +24,6 @@ class ConvertableQuoteRule implements Rule
 
     public function __construct()
     {
-
     }
 
     /**
@@ -54,14 +53,12 @@ class ConvertableQuoteRule implements Rule
 
         $quotes = Quote::withTrashed()->whereIn('id', $this->transformKeys($ids))->company()->get();
 
-        foreach($quotes as $quote){
-
-            if(!$quote->service()->isConvertable())
+        foreach ($quotes as $quote) {
+            if (! $quote->service()->isConvertable()) {
                 return false;
-
+            }
         }
 
         return true;
-
     }
 }
diff --git a/app/Http/ValidationRules/User/AttachableUser.php b/app/Http/ValidationRules/User/AttachableUser.php
index 3fcdf34e2ce3..d3389f81981b 100644
--- a/app/Http/ValidationRules/User/AttachableUser.php
+++ b/app/Http/ValidationRules/User/AttachableUser.php
@@ -25,6 +25,7 @@ class AttachableUser implements Rule
     public function __construct()
     {
     }
+
     /**
      * @param string $attribute
      * @param mixed $value
@@ -55,24 +56,27 @@ class AttachableUser implements Rule
 
         $user = User::where('email', $email)->first();
 
-        if(!$user)
+        if (! $user) {
             return true;
+        }
 
         $user_already_attached = CompanyUser::query()
                                     ->where('user_id', $user->id)
-                                    ->where('account_id',$user->account_id)
+                                    ->where('account_id', $user->account_id)
                                     ->where('company_id', auth()->user()->company()->id)
                                     ->exists();
 
         //If the user is already attached or isn't link to this account - return false
-        if($user_already_attached) {
+        if ($user_already_attached) {
             $this->message = ctrans('texts.user_duplicate_error');
-            return false;
-        } 
 
-        if($user->account_id != auth()->user()->account_id){
+            return false;
+        }
+
+        if ($user->account_id != auth()->user()->account_id) {
             $this->message = ctrans('texts.user_cross_linked_error');
-            return false;            
+
+            return false;
         }
 
         return true;
diff --git a/app/Http/ValidationRules/User/RelatedUserRule.php b/app/Http/ValidationRules/User/RelatedUserRule.php
index 0e09b90781b8..07f0d2cb72f1 100644
--- a/app/Http/ValidationRules/User/RelatedUserRule.php
+++ b/app/Http/ValidationRules/User/RelatedUserRule.php
@@ -25,6 +25,7 @@ class RelatedUserRule implements Rule
     {
         $this->input = $input;
     }
+
     /**
      * @param string $attribute
      * @param mixed $value
diff --git a/app/Http/ValidationRules/ValidAmount.php b/app/Http/ValidationRules/ValidAmount.php
index b4e097c5465e..318b2e1722c2 100644
--- a/app/Http/ValidationRules/ValidAmount.php
+++ b/app/Http/ValidationRules/ValidAmount.php
@@ -26,11 +26,10 @@ class ValidAmount implements Rule
      */
     public function passes($attribute, $value)
     {
-        return is_numeric((string)$value);
+        return is_numeric((string) $value);
         //return filter_var((string)$value, FILTER_VALIDATE_FLOAT);
 //        return preg_match('^(?=.)([+-]?([0-9]*)(\.([0-9]+))?)$^', (string)$value);
         // return trim($value, '-1234567890.,') === '';
-
     }
 
     /**
diff --git a/app/Http/ValidationRules/ValidClientGroupSettingsRule.php b/app/Http/ValidationRules/ValidClientGroupSettingsRule.php
index c9bea00fe136..928f3676d0a9 100644
--- a/app/Http/ValidationRules/ValidClientGroupSettingsRule.php
+++ b/app/Http/ValidationRules/ValidClientGroupSettingsRule.php
@@ -20,6 +20,7 @@ use Illuminate\Contracts\Validation\Rule;
 class ValidClientGroupSettingsRule implements Rule
 {
     use ClientGroupSettingsSaver;
+
     /**
      * @param string $attribute
      * @param mixed $value
diff --git a/app/Http/ValidationRules/ValidSettingsRule.php b/app/Http/ValidationRules/ValidSettingsRule.php
index 10a656ff62bf..d1d942763599 100644
--- a/app/Http/ValidationRules/ValidSettingsRule.php
+++ b/app/Http/ValidationRules/ValidSettingsRule.php
@@ -20,6 +20,7 @@ use Illuminate\Contracts\Validation\Rule;
 class ValidSettingsRule implements Rule
 {
     use SettingsSaver;
+
     /**
      * @param string $attribute
      * @param mixed $value
diff --git a/app/Http/ViewComposers/PortalComposer.php b/app/Http/ViewComposers/PortalComposer.php
index 08aacd0f187b..a9a04f6dbf7e 100644
--- a/app/Http/ViewComposers/PortalComposer.php
+++ b/app/Http/ViewComposers/PortalComposer.php
@@ -23,19 +23,33 @@ use Illuminate\View\View;
 class PortalComposer
 {
     public const MODULE_RECURRING_INVOICES = 1;
+
     public const MODULE_CREDITS = 2;
+
     public const MODULE_QUOTES = 4;
+
     public const MODULE_TASKS = 8;
+
     public const MODULE_EXPENSES = 16;
+
     public const MODULE_PROJECTS = 32;
+
     public const MODULE_VENDORS = 64;
+
     public const MODULE_TICKETS = 128;
+
     public const MODULE_PROPOSALS = 256;
+
     public const MODULE_RECURRING_EXPENSES = 512;
+
     public const MODULE_RECURRING_TASKS = 1024;
+
     public const MODULE_RECURRING_QUOTES = 2048;
+
     public const MODULE_INVOICES = 4096;
+
     public const MODULE_PROFORMAL_INVOICES = 8192;
+
     public const MODULE_PURCHASE_ORDERS = 16384;
 
     public $settings;
@@ -48,7 +62,6 @@ class PortalComposer
      */
     public function compose(View $view) :void
     {
-
         $view->with($this->portalData());
 
         if (auth()->guard('contact')->user()) {
@@ -120,11 +133,11 @@ class PortalComposer
 
         $data[] = ['title' => ctrans('texts.statement'), 'url' => 'client.statement', 'icon' => 'activity'];
 
-        if(Ninja::isHosted() && auth()->guard('contact')->user()->company->id == config('ninja.ninja_default_company_id'))
+        if (Ninja::isHosted() && auth()->guard('contact')->user()->company->id == config('ninja.ninja_default_company_id')) {
             $data[] = ['title' => ctrans('texts.plan'), 'url' => 'client.plan', 'icon' => 'credit-card'];
-        else
+        } else {
             $data[] = ['title' => ctrans('texts.subscriptions'), 'url' => 'client.subscriptions.index', 'icon' => 'calendar'];
-
+        }
 
         return $data;
     }
diff --git a/app/Import/Definitions/InvoiceMap.php b/app/Import/Definitions/InvoiceMap.php
index 08d876144456..49e074012ce7 100644
--- a/app/Import/Definitions/InvoiceMap.php
+++ b/app/Import/Definitions/InvoiceMap.php
@@ -26,7 +26,7 @@ class InvoiceMap
             7 => 'invoice.date',
             8 => 'invoice.due_date',
             9 => 'invoice.terms',
-			10 => 'invoice.status',
+            10 => 'invoice.status',
             11 => 'invoice.public_notes',
             12 => 'invoice.is_sent',
             13 => 'invoice.private_notes',
@@ -87,7 +87,7 @@ class InvoiceMap
             7 => 'texts.date',
             8 => 'texts.due_date',
             9 => 'texts.terms',
-			10 => 'texts.status',
+            10 => 'texts.status',
             11 => 'texts.public_notes',
             12 => 'texts.sent',
             13 => 'texts.private_notes',
diff --git a/app/Import/Definitions/PaymentMap.php b/app/Import/Definitions/PaymentMap.php
index 57f7a55adc35..b63b57fab9bd 100644
--- a/app/Import/Definitions/PaymentMap.php
+++ b/app/Import/Definitions/PaymentMap.php
@@ -51,7 +51,7 @@ class PaymentMap
             11 => 'texts.client',
             12 => 'texts.invoice_number',
             13 => 'texts.date',
-            14 => 'texts.method'
+            14 => 'texts.method',
         ];
     }
 }
diff --git a/app/Import/Definitions/QuoteMap.php b/app/Import/Definitions/QuoteMap.php
index 3099b570edbd..afeedbf4d7ab 100644
--- a/app/Import/Definitions/QuoteMap.php
+++ b/app/Import/Definitions/QuoteMap.php
@@ -26,7 +26,7 @@ class QuoteMap
             7 => 'quote.date',
             8 => 'quote.due_date',
             9 => 'quote.terms',
-			10 => 'quote.status',
+            10 => 'quote.status',
             11 => 'quote.public_notes',
             12 => 'quote.is_sent',
             13 => 'quote.private_notes',
@@ -87,7 +87,7 @@ class QuoteMap
             7 => 'texts.date',
             8 => 'texts.due_date',
             9 => 'texts.terms',
-			10 => 'texts.status',
+            10 => 'texts.status',
             11 => 'texts.public_notes',
             12 => 'texts.sent',
             13 => 'texts.private_notes',
diff --git a/app/Import/Definitions/VendorMap.php b/app/Import/Definitions/VendorMap.php
index 7a0689249f87..ced1809c3737 100644
--- a/app/Import/Definitions/VendorMap.php
+++ b/app/Import/Definitions/VendorMap.php
@@ -13,49 +13,49 @@ namespace App\Import\Definitions;
 
 class VendorMap
 {
-	public static function importable()
-	{
-		return [
-			0 => 'vendor.name',
-			1 => 'vendor.phone',
-			2 => 'vendor.id_number',
-			3 => 'vendor.vat_number',
-			4 => 'vendor.website',
-			5 => 'vendor.first_name',
-			6 => 'vendor.last_name',
-			7 => 'vendor.email',
-			8 => 'vendor.currency_id',
-			9 => 'vendor.public_notes',
-			10 => 'vendor.private_notes',
-			11 => 'vendor.address1',
-			12 => 'vendor.address2',
-			13 => 'vendor.city',
-			14 => 'vendor.state',
-			15 => 'vendor.postal_code',
-			16 => 'vendor.country_id',
-		];
-	}
+    public static function importable()
+    {
+        return [
+            0 => 'vendor.name',
+            1 => 'vendor.phone',
+            2 => 'vendor.id_number',
+            3 => 'vendor.vat_number',
+            4 => 'vendor.website',
+            5 => 'vendor.first_name',
+            6 => 'vendor.last_name',
+            7 => 'vendor.email',
+            8 => 'vendor.currency_id',
+            9 => 'vendor.public_notes',
+            10 => 'vendor.private_notes',
+            11 => 'vendor.address1',
+            12 => 'vendor.address2',
+            13 => 'vendor.city',
+            14 => 'vendor.state',
+            15 => 'vendor.postal_code',
+            16 => 'vendor.country_id',
+        ];
+    }
 
-	public static function import_keys()
-	{
-		return [
-			0 => 'texts.name',
-			1 => 'texts.phone',
-			2 => 'texts.id_number',
-			3 => 'texts.vat_number',
-			4 => 'texts.website',
-			5 => 'texts.first_name',
-			6 => 'texts.last_name',
-			7 => 'texts.email',
-			8 => 'texts.currency',
-			9 => 'texts.public_notes',
-			10 => 'texts.private_notes',
-			11 => 'texts.address1',
-			12 => 'texts.address2',
-			13 => 'texts.city',
-			14 => 'texts.state',
-			15 => 'texts.postal_code',
-			16 => 'texts.country',
-		];
-	}
+    public static function import_keys()
+    {
+        return [
+            0 => 'texts.name',
+            1 => 'texts.phone',
+            2 => 'texts.id_number',
+            3 => 'texts.vat_number',
+            4 => 'texts.website',
+            5 => 'texts.first_name',
+            6 => 'texts.last_name',
+            7 => 'texts.email',
+            8 => 'texts.currency',
+            9 => 'texts.public_notes',
+            10 => 'texts.private_notes',
+            11 => 'texts.address1',
+            12 => 'texts.address2',
+            13 => 'texts.city',
+            14 => 'texts.state',
+            15 => 'texts.postal_code',
+            16 => 'texts.country',
+        ];
+    }
 }
diff --git a/app/Import/ImportException.php b/app/Import/ImportException.php
index 3d9fafdc4420..54f5f7c0548d 100644
--- a/app/Import/ImportException.php
+++ b/app/Import/ImportException.php
@@ -1,6 +1,7 @@
 <?php
+
 namespace App\Import;
 
-class ImportException extends \Exception{
-
+class ImportException extends \Exception
+{
 }
diff --git a/app/Import/Providers/BaseImport.php b/app/Import/Providers/BaseImport.php
index 7af0e1a1b8d3..e63bffe6cbbb 100644
--- a/app/Import/Providers/BaseImport.php
+++ b/app/Import/Providers/BaseImport.php
@@ -8,6 +8,7 @@
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace App\Import\Providers;
 
 use App\Factory\ClientFactory;
@@ -39,582 +40,595 @@ use Symfony\Component\HttpFoundation\ParameterBag;
 
 class BaseImport
 {
-	use CleanLineItems;
-
-	public Company $company;
-
-	public array $request;
-
-	public array $error_array = [];
-
-	public $request_name;
-
-	public $repository_name;
-
-	public $factory_name;
-
-	public $repository;
-
-	public $transformer;
+    use CleanLineItems;
+
+    public Company $company;
+
+    public array $request;
+
+    public array $error_array = [];
+
+    public $request_name;
+
+    public $repository_name;
+
+    public $factory_name;
+
+    public $repository;
+
+    public $transformer;
+
+    public function __construct(array $request, Company $company)
+    {
+        $this->company = $company;
+        $this->request = $request;
+        $this->hash = $request['hash'];
+        $this->import_type = $request['import_type'];
+        $this->skip_header = $request['skip_header'] ?? null;
+        $this->column_map = ! empty($request['column_map'])
+            ? array_combine(
+                array_keys($request['column_map']),
+                array_column($request['column_map'], 'mapping')
+            )
+            : null;
+
+        auth()->login($this->company->owner(), true);
 
-	public function __construct(array $request, Company $company)
-	{
-		$this->company = $company;
-		$this->request = $request;
-		$this->hash = $request['hash'];
-		$this->import_type = $request['import_type'];
-		$this->skip_header = $request['skip_header'] ?? null;
-		$this->column_map = !empty($request['column_map'])
-			? array_combine(
-				array_keys($request['column_map']),
-				array_column($request['column_map'], 'mapping')
-			)
-			: null;
-
-		auth()->login($this->company->owner(), true);
-
-		auth()
-			->user()
-			->setCompany($this->company);
-	}
-
-	public function getCsvData($entity_type)
-	{
-
-		$base64_encoded_csv = Cache::pull($this->hash . '-' . $entity_type);
-		if (empty($base64_encoded_csv)) {
-			return null;
-		}
-
-		$csv = base64_decode($base64_encoded_csv);
-		$csv = Reader::createFromString($csv);
-
-		$stmt = new Statement();
-		$data = iterator_to_array($stmt->process($csv));
-
-		if (count($data) > 0) {
-			$headers = $data[0];
-
-			// Remove Invoice Ninja headers
-			if (
-				count($headers) &&
-				count($data) > 4 &&
-				$this->import_type === 'csv'
-			) {
-				$first_cell = $headers[0];
-				if (strstr($first_cell, config('ninja.app_name'))) {
-					array_shift($data); // Invoice Ninja...
-					array_shift($data); // <blank line>
-					array_shift($data); // Enitty Type Header
-				}
-			}
-		}
+        auth()
+            ->user()
+            ->setCompany($this->company);
+    }
 
-		return $data;
-	}
+    public function getCsvData($entity_type)
+    {
+        $base64_encoded_csv = Cache::pull($this->hash.'-'.$entity_type);
+        if (empty($base64_encoded_csv)) {
+            return null;
+        }
 
-	public function mapCSVHeaderToKeys($csvData)
-	{
-		$keys = array_shift($csvData);
-
-		return array_map(function ($values) use ($keys) {
-			return array_combine($keys, $values);
-		}, $csvData);
-	}
-
-	private function groupInvoices($csvData, $key)
-	{
-		if(!$key)
-			return $csvData;
-
-		// Group by invoice.
-		$grouped = [];
-
-		foreach ($csvData as $line_item) {
-			if (empty($line_item[$key])) {
-				$this->error_array['invoice'][] = [
-					'invoice' => $line_item,
-					'error' => 'No invoice number',
-				];
-			} else {
-				$grouped[$line_item[$key]][] = $line_item;
-			}
-		}
-
-		return $grouped;
-	}
-
-	public function getErrors()
-	{
-		return $this->error_array;
-	}
-
-	public function ingest($data, $entity_type)
-	{
-		$count = 0;
-
-		foreach ($data as $key => $record) {
-
-			try {
-
-				$entity = $this->transformer->transform($record);
-				$validator = $this->request_name::runFormRequest($entity);
-
-				if ($validator->fails()) {
-					$this->error_array[$entity_type][] = [
-						$entity_type => $record,
-						'error' => $validator->errors()->all(),
-					];
-				} else {
-					$entity = $this->repository->save(
-						array_diff_key($entity, ['user_id' => false]),
-						$this->factory_name::create(
-							$this->company->id,
-							$this->getUserIDForRecord($entity)
-						)
-					);
-
-					$entity->saveQuietly();
-					$count++;
-
-				}
-
-			} catch (\Exception $ex) {
-
-				if(\DB::connection(config('database.default'))->transactionLevel() > 0)
-					\DB::connection(config('database.default'))->rollBack();
-
-				if ($ex instanceof ImportException) {
-					$message = $ex->getMessage();
-				} else {
-					report($ex);
-					$message = 'Unknown error';
-				}
-
-				$this->error_array[$entity_type][] = [
-					$entity_type => $record,
-					'error' => $message,
-				];
-			}
-
-		}
-
-		return $count;
-	}
-
-	public function ingestProducts($data, $entity_type)
-	{
-		$count = 0;
-
-		foreach ($data as $key => $record) {
-
-			try {
-
-				$entity = $this->transformer->transform($record);
-				$validator = $this->request_name::runFormRequest($entity);
-
-				if ($validator->fails()) {
-					$this->error_array[$entity_type][] = [
-						$entity_type => $record,
-						'error' => $validator->errors()->all(),
-					];
-				} else {
-
-					if($this->transformer->hasProduct($entity['product_key'])) 
-						$product = $this->transformer->getProduct($entity['product_key']);
-					else
-						$product = $this->factory_name::create($this->company->id,$this->getUserIDForRecord($entity));
-
-					$entity = $this->repository->save(
-						array_diff_key($entity, ['user_id' => false]),
-						$product
-					);
-
-					$entity->saveQuietly();
-					$count++;
-
-				}
-
-			} catch (\Exception $ex) {
-
-				if(\DB::connection(config('database.default'))->transactionLevel() > 0)
-					\DB::connection(config('database.default'))->rollBack();
-				
-				if ($ex instanceof ImportException) {
-					$message = $ex->getMessage();
-				} else {
-					report($ex);
-					$message = 'Unknown error';
-				}
-
-				$this->error_array[$entity_type][] = [
-					$entity_type => $record,
-					'error' => $message,
-				];
-			}
-
-		}
-
-		return $count;
-	}
-
-	public function ingestInvoices($invoices, $invoice_number_key)
-	{
-		$invoice_transformer = $this->transformer;
-
-		/** @var PaymentRepository $payment_repository */
-		$payment_repository = app()->make(PaymentRepository::class);
-		$payment_repository->import_mode = true;
-
-		/** @var ClientRepository $client_repository */
-		$client_repository = app()->make(ClientRepository::class);
-		$client_repository->import_mode = true;
-
-		$invoice_repository = new InvoiceRepository();
-		$invoice_repository->import_mode = true;
-
-		$invoices = $this->groupInvoices($invoices, $invoice_number_key);
-
-		foreach ($invoices as $raw_invoice) {
-
-			try {
-
-				$invoice_data = $invoice_transformer->transform($raw_invoice);
-
-				$invoice_data['line_items'] = $this->cleanItems(
-					$invoice_data['line_items'] ?? []
-				);
-
-				// If we don't have a client ID, but we do have client data, go ahead and create the client.
-				if (
-					empty($invoice_data['client_id']) &&
-					!empty($invoice_data['client'])
-				) {
-					$client_data = $invoice_data['client'];
-					$client_data['user_id'] = $this->getUserIDForRecord(
-						$invoice_data
-					);
-
-					$client_repository->save(
-						$client_data,
-						$client = ClientFactory::create(
-							$this->company->id,
-							$client_data['user_id']
-						)
-					);
-					$invoice_data['client_id'] = $client->id;
-					unset($invoice_data['client']);
-				}
-
-				$validator = $this->request_name::runFormRequest($invoice_data);
-
-				if ($validator->fails()) {
-					$this->error_array['invoice'][] = [
-						'invoice' => $invoice_data,
-						'error' => $validator->errors()->all(),
-					];
-				} else {
-					$invoice = InvoiceFactory::create(
-						$this->company->id,
-						$this->getUserIDForRecord($invoice_data)
-					);
-					if (!empty($invoice_data['status_id'])) {
-						$invoice->status_id = $invoice_data['status_id'];
-					}
-					$invoice_repository->save($invoice_data, $invoice);
-
-					// If we're doing a generic CSV import, only import payment data if we're not importing a payment CSV.
-					// If we're doing a platform-specific import, trust the platform to only return payment info if there's not a separate payment CSV.
-					if (
-						$this->import_type !== 'csv' ||
-						empty($this->column_map['payment'])
-					) {
-						// Check for payment columns
-						if (!empty($invoice_data['payments'])) {
-							foreach (
-								$invoice_data['payments']
-								as $payment_data
-							) {
-								$payment_data['user_id'] = $invoice->user_id;
-								$payment_data['client_id'] =
-									$invoice->client_id;
-								$payment_data['invoices'] = [
-									[
-										'invoice_id' => $invoice->id,
-										'amount' =>
-											$payment_data['amount'] ?? null,
-									],
-								];
-
-								/* Make sure we don't apply any payments to invoices with a Zero Amount*/
-								if ($invoice->amount > 0) {
-									$payment_repository->save(
-										$payment_data,
-										PaymentFactory::create(
-											$this->company->id,
-											$invoice->user_id,
-											$invoice->client_id
-										)
-									);
-								}
-							}
-						}
-					}
-
-					$this->actionInvoiceStatus(
-						$invoice,
-						$invoice_data,
-						$invoice_repository
-					);
-				}
-			} catch (\Exception $ex) {
-				
-				if(\DB::connection(config('database.default'))->transactionLevel() > 0)
-					\DB::connection(config('database.default'))->rollBack();
-
-				if ($ex instanceof ImportException) {
-					$message = $ex->getMessage();
-				} else {
-					report($ex);
-					$message = 'Unknown error';
-				}
-
-				$this->error_array['invoice'][] = [
-					'invoice' => $raw_invoice,
-					'error' => $message,
-				];
-			}
-		}
-	}
-
-	private function actionInvoiceStatus(
-		$invoice,
-		$invoice_data,
-		$invoice_repository
-	) {
-		if (!empty($invoice_data['archived'])) {
-			$invoice_repository->archive($invoice);
-			$invoice->fresh();
-		}
-
-		if (!empty($invoice_data['viewed'])) {
-			$invoice = $invoice
-				->service()
-				->markViewed()
-				->save();
-		}
-
-		if ($invoice->status_id === Invoice::STATUS_DRAFT) {
-		} elseif ($invoice->status_id === Invoice::STATUS_SENT) {
-			$invoice = $invoice
-				->service()
-				->markSent()
-				->save();
-		} elseif (
-			$invoice->status_id <= Invoice::STATUS_SENT &&
-			$invoice->amount > 0
-		) {
-			if ($invoice->balance <= 0) {
-				$invoice->status_id = Invoice::STATUS_PAID;
-				$invoice->save();
-			} elseif ($invoice->balance != $invoice->amount) {
-				$invoice->status_id = Invoice::STATUS_PARTIAL;
-				$invoice->save();
-			}
-		}
-
-		return $invoice;
-	}
-
-	private function actionQuoteStatus(
-		$quote,
-		$quote_data,
-		$quote_repository
-	) {
-		if (!empty($invoice_data['archived'])) {
-			$quote_repository->archive($quote);
-			$quote->fresh();
-		}
-
-		if (!empty($invoice_data['viewed'])) {
-			$quote = $quote
-				->service()
-				->markViewed()
-				->save();
-		}
-
-		if ($quote->status_id === Quote::STATUS_DRAFT) {
-		} elseif ($quote->status_id === Quote::STATUS_SENT) {
-			$quote = $quote
-				->service()
-				->markSent()
-				->save();
-		} 
-
-		return $quote;
-	}
-
-	public function ingestQuotes($quotes, $quote_number_key)
-	{
-		$quote_transformer = $this->transformer;
-
-		/** @var ClientRepository $client_repository */
-		$client_repository = app()->make(ClientRepository::class);
-		$client_repository->import_mode = true;
-
-		$quote_repository = new QuoteRepository();
-		$quote_repository->import_mode = true;
-
-		$quotes = $this->groupInvoices($quotes, $quote_number_key);
-
-		foreach ($quotes as $raw_quote) {
-			try {
-				$quote_data = $quote_transformer->transform($raw_quote);
-				$quote_data['line_items'] = $this->cleanItems(
-					$quote_data['line_items'] ?? []
-				);
-
-				// If we don't have a client ID, but we do have client data, go ahead and create the client.
-				if (
-					empty($quote_data['client_id']) &&
-					!empty($quote_data['client'])
-				) {
-					$client_data = $quote_data['client'];
-					$client_data['user_id'] = $this->getUserIDForRecord(
-						$quote_data
-					);
-
-					$client_repository->save(
-						$client_data,
-						$client = ClientFactory::create(
-							$this->company->id,
-							$client_data['user_id']
-						)
-					);
-					$quote_data['client_id'] = $client->id;
-					unset($quote_data['client']);
-				}
-
-				$validator = Validator::make(
-					$quote_data,
-					(new StoreQuoteRequest())->rules()
-				);
-				if ($validator->fails()) {
-					$this->error_array['invoice'][] = [
-						'quote' => $quote_data,
-						'error' => $validator->errors()->all(),
-					];
-				} else {
-					$quote = QuoteFactory::create(
-						$this->company->id,
-						$this->getUserIDForRecord($quote_data)
-					);
-					if (!empty($quote_data['status_id'])) {
-						$quote->status_id = $quote_data['status_id'];
-					}
-					$quote_repository->save($quote_data, $quote);
-
-					$this->actionQuoteStatus(
-						$quote,
-						$quote_data,
-						$quote_repository
-					);
-				}
-			} catch (\Exception $ex) {
-				if ($ex instanceof ImportException) {
-					$message = $ex->getMessage();
-				} else {
-					report($ex);
-					$message = 'Unknown error';
-				}
-
-				$this->error_array['quote'][] = [
-					'invoice' => $raw_quote,
-					'error' => $message,
-				];
-			}
-		}
-	}
-
-	protected function getUserIDForRecord($record)
-	{
-		if (!empty($record['user_id'])) {
-			return $this->findUser($record['user_id']);
-		} else {
-			return $this->company->owner()->id;
-		}
-	}
-
-	protected function findUser($user_hash)
-	{
-		$user = User::where('account_id', $this->company->account->id)
-			->where(
-				\DB::raw('CONCAT_WS(" ", first_name, last_name)'),
-				'like',
-				'%' . $user_hash . '%'
-			)
-			->first();
-
-		if ($user) {
-			return $user->id;
-		} else {
-			return $this->company->owner()->id;
-		}
-	}
-
-	public function finalizeImport()
-	{
-		$data = [
-			'errors'  => $this->error_array,
-			'company' => $this->company,
-		];
-
-		$nmo = new NinjaMailerObject;
-		$nmo->mailable = new ImportCompleted($this->company, $data);
-		$nmo->company = $this->company;
-		$nmo->settings = $this->company->settings;
-		$nmo->to_user = $this->company->owner();
-
-		NinjaMailerJob::dispatch($nmo);
-	}
+        $csv = base64_decode($base64_encoded_csv);
+        $csv = Reader::createFromString($csv);
+
+        $stmt = new Statement();
+        $data = iterator_to_array($stmt->process($csv));
+
+        if (count($data) > 0) {
+            $headers = $data[0];
+
+            // Remove Invoice Ninja headers
+            if (
+                count($headers) &&
+                count($data) > 4 &&
+                $this->import_type === 'csv'
+            ) {
+                $first_cell = $headers[0];
+                if (strstr($first_cell, config('ninja.app_name'))) {
+                    array_shift($data); // Invoice Ninja...
+                    array_shift($data); // <blank line>
+                    array_shift($data); // Enitty Type Header
+                }
+            }
+        }
+
+        return $data;
+    }
+
+    public function mapCSVHeaderToKeys($csvData)
+    {
+        $keys = array_shift($csvData);
+
+        return array_map(function ($values) use ($keys) {
+            return array_combine($keys, $values);
+        }, $csvData);
+    }
+
+    private function groupInvoices($csvData, $key)
+    {
+        if (! $key) {
+            return $csvData;
+        }
+
+        // Group by invoice.
+        $grouped = [];
+
+        foreach ($csvData as $line_item) {
+            if (empty($line_item[$key])) {
+                $this->error_array['invoice'][] = [
+                    'invoice' => $line_item,
+                    'error' => 'No invoice number',
+                ];
+            } else {
+                $grouped[$line_item[$key]][] = $line_item;
+            }
+        }
+
+        return $grouped;
+    }
+
+    public function getErrors()
+    {
+        return $this->error_array;
+    }
+
+
+    private function runValidation($data)
+    {        
+        $_syn_request_class = new $this->request_name;
+        $_syn_request_class->setContainer(app());
+        $_syn_request_class->initialize($data);
+        $_syn_request_class->prepareForValidation();
+
+        $validator = Validator::make($_syn_request_class->all(), $_syn_request_class->rules());
+
+        $_syn_request_class->setValidator($validator);
+
+        return $validator;
+
+    }
+
+    public function ingest($data, $entity_type)
+    {
+        $count = 0;
+
+        $is_free_hosted_client = $this->company->account->isFreeHostedClient();
+        $hosted_client_count = $this->company->account->hosted_client_count;
+
+        foreach ($data as $key => $record) {
+
+            if($this->factory_name instanceof ClientFactory && $is_free_hosted_client && ($this->company->clients()->count() > $hosted_client_count))
+            {
+                $this->error_array[$entity_type][] = [
+                    $entity_type => $record,
+                    'error' => 'Client limit reached',
+                ];
+
+                return $count;
+            }
+
+            try {
+                $entity = $this->transformer->transform($record);
+                // $validator = $this->request_name::runFormRequest($entity);
+                $validator = $this->runValidation($entity);
+
+                if ($validator->fails()) {
+                    $this->error_array[$entity_type][] = [
+                        $entity_type => $record,
+                        'error' => $validator->errors()->all(),
+                    ];
+                } else {
+                    $entity = $this->repository->save(
+                        array_diff_key($entity, ['user_id' => false]),
+                        $this->factory_name::create(
+                            $this->company->id,
+                            $this->getUserIDForRecord($entity)
+                        )
+                    );
+                    $entity->saveQuietly();
+                    $count++;
+                }
+            } catch (\Exception $ex) {
+                if (\DB::connection(config('database.default'))->transactionLevel() > 0) {
+                    \DB::connection(config('database.default'))->rollBack();
+                }
+
+                if ($ex instanceof ImportException) {
+                    $message = $ex->getMessage();
+                } else {
+                    report($ex);
+                    $message = 'Unknown error';
+                }
+
+                $this->error_array[$entity_type][] = [
+                    $entity_type => $record,
+                    'error' => $message,
+                ];
+             
+             nlog("Ingest {$ex->getMessage()}");   
+            }
+        }
+
+        return $count;
+    }
+
+    public function ingestProducts($data, $entity_type)
+    {
+        $count = 0;
+
+        foreach ($data as $key => $record) {
+            try {
+                $entity = $this->transformer->transform($record);
+                $validator = $this->request_name::runFormRequest($entity);
+
+                if ($validator->fails()) {
+                    $this->error_array[$entity_type][] = [
+                        $entity_type => $record,
+                        'error' => $validator->errors()->all(),
+                    ];
+                } else {
+                    if ($this->transformer->hasProduct($entity['product_key'])) {
+                        $product = $this->transformer->getProduct($entity['product_key']);
+                    } else {
+                        $product = $this->factory_name::create($this->company->id, $this->getUserIDForRecord($entity));
+                    }
+
+                    $entity = $this->repository->save(
+                        array_diff_key($entity, ['user_id' => false]),
+                        $product
+                    );
+
+                    $entity->saveQuietly();
+                    $count++;
+                }
+            } catch (\Exception $ex) {
+                if (\DB::connection(config('database.default'))->transactionLevel() > 0) {
+                    \DB::connection(config('database.default'))->rollBack();
+                }
+
+                if ($ex instanceof ImportException) {
+                    $message = $ex->getMessage();
+                } else {
+                    report($ex);
+                    $message = 'Unknown error';
+                }
+
+                $this->error_array[$entity_type][] = [
+                    $entity_type => $record,
+                    'error' => $message,
+                ];
+            }
+        }
+
+        return $count;
+    }
+
+    public function ingestInvoices($invoices, $invoice_number_key)
+    {
+        $invoice_transformer = $this->transformer;
+
+        /** @var PaymentRepository $payment_repository */
+        $payment_repository = app()->make(PaymentRepository::class);
+        $payment_repository->import_mode = true;
+
+        /** @var ClientRepository $client_repository */
+        $client_repository = app()->make(ClientRepository::class);
+        $client_repository->import_mode = true;
+
+        $invoice_repository = new InvoiceRepository();
+        $invoice_repository->import_mode = true;
+
+        $invoices = $this->groupInvoices($invoices, $invoice_number_key);
+
+        foreach ($invoices as $raw_invoice) {
+            try {
+                $invoice_data = $invoice_transformer->transform($raw_invoice);
+
+                $invoice_data['line_items'] = $this->cleanItems(
+                    $invoice_data['line_items'] ?? []
+                );
+
+                // If we don't have a client ID, but we do have client data, go ahead and create the client.
+                if (
+                    empty($invoice_data['client_id']) &&
+                    ! empty($invoice_data['client'])
+                ) {
+                    $client_data = $invoice_data['client'];
+                    $client_data['user_id'] = $this->getUserIDForRecord(
+                        $invoice_data
+                    );
+
+                    $client_repository->save(
+                        $client_data,
+                        $client = ClientFactory::create(
+                            $this->company->id,
+                            $client_data['user_id']
+                        )
+                    );
+                    $invoice_data['client_id'] = $client->id;
+                    unset($invoice_data['client']);
+                }
+
+                $validator = $this->request_name::runFormRequest($invoice_data);
+
+                if ($validator->fails()) {
+                    $this->error_array['invoice'][] = [
+                        'invoice' => $invoice_data,
+                        'error' => $validator->errors()->all(),
+                    ];
+                } else {
+                    $invoice = InvoiceFactory::create(
+                        $this->company->id,
+                        $this->getUserIDForRecord($invoice_data)
+                    );
+                    if (! empty($invoice_data['status_id'])) {
+                        $invoice->status_id = $invoice_data['status_id'];
+                    }
+                    $invoice_repository->save($invoice_data, $invoice);
+
+                    // If we're doing a generic CSV import, only import payment data if we're not importing a payment CSV.
+                    // If we're doing a platform-specific import, trust the platform to only return payment info if there's not a separate payment CSV.
+                    if (
+                        $this->import_type !== 'csv' ||
+                        empty($this->column_map['payment'])
+                    ) {
+                        // Check for payment columns
+                        if (! empty($invoice_data['payments'])) {
+                            foreach (
+                                $invoice_data['payments']
+                                as $payment_data
+                            ) {
+                                $payment_data['user_id'] = $invoice->user_id;
+                                $payment_data['client_id'] =
+                                    $invoice->client_id;
+                                $payment_data['invoices'] = [
+                                    [
+                                        'invoice_id' => $invoice->id,
+                                        'amount' => $payment_data['amount'] ?? null,
+                                    ],
+                                ];
+
+                                /* Make sure we don't apply any payments to invoices with a Zero Amount*/
+                                if ($invoice->amount > 0) {
+                                    $payment_repository->save(
+                                        $payment_data,
+                                        PaymentFactory::create(
+                                            $this->company->id,
+                                            $invoice->user_id,
+                                            $invoice->client_id
+                                        )
+                                    );
+                                }
+                            }
+                        }
+                    }
+
+                    $this->actionInvoiceStatus(
+                        $invoice,
+                        $invoice_data,
+                        $invoice_repository
+                    );
+                }
+            } catch (\Exception $ex) {
+                if (\DB::connection(config('database.default'))->transactionLevel() > 0) {
+                    \DB::connection(config('database.default'))->rollBack();
+                }
+
+                if ($ex instanceof ImportException) {
+                    $message = $ex->getMessage();
+                } else {
+                    report($ex);
+                    $message = 'Unknown error';
+                }
+
+                $this->error_array['invoice'][] = [
+                    'invoice' => $raw_invoice,
+                    'error' => $message,
+                ];
+            }
+        }
+    }
+
+    private function actionInvoiceStatus(
+        $invoice,
+        $invoice_data,
+        $invoice_repository
+    ) {
+        if (! empty($invoice_data['archived'])) {
+            $invoice_repository->archive($invoice);
+            $invoice->fresh();
+        }
+
+        if (! empty($invoice_data['viewed'])) {
+            $invoice = $invoice
+                ->service()
+                ->markViewed()
+                ->save();
+        }
+
+        if ($invoice->status_id === Invoice::STATUS_DRAFT) {
+        } elseif ($invoice->status_id === Invoice::STATUS_SENT) {
+            $invoice = $invoice
+                ->service()
+                ->markSent()
+                ->save();
+        } elseif (
+            $invoice->status_id <= Invoice::STATUS_SENT &&
+            $invoice->amount > 0
+        ) {
+            if ($invoice->balance <= 0) {
+                $invoice->status_id = Invoice::STATUS_PAID;
+                $invoice->save();
+            } elseif ($invoice->balance != $invoice->amount) {
+                $invoice->status_id = Invoice::STATUS_PARTIAL;
+                $invoice->save();
+            }
+        }
+
+        return $invoice;
+    }
+
+    private function actionQuoteStatus(
+        $quote,
+        $quote_data,
+        $quote_repository
+    ) {
+        if (! empty($invoice_data['archived'])) {
+            $quote_repository->archive($quote);
+            $quote->fresh();
+        }
+
+        if (! empty($invoice_data['viewed'])) {
+            $quote = $quote
+                ->service()
+                ->markViewed()
+                ->save();
+        }
+
+        if ($quote->status_id === Quote::STATUS_DRAFT) {
+        } elseif ($quote->status_id === Quote::STATUS_SENT) {
+            $quote = $quote
+                ->service()
+                ->markSent()
+                ->save();
+        }
+
+        return $quote;
+    }
+
+    public function ingestQuotes($quotes, $quote_number_key)
+    {
+        $quote_transformer = $this->transformer;
+
+        /** @var ClientRepository $client_repository */
+        $client_repository = app()->make(ClientRepository::class);
+        $client_repository->import_mode = true;
+
+        $quote_repository = new QuoteRepository();
+        $quote_repository->import_mode = true;
+
+        $quotes = $this->groupInvoices($quotes, $quote_number_key);
+
+        foreach ($quotes as $raw_quote) {
+            try {
+                $quote_data = $quote_transformer->transform($raw_quote);
+                $quote_data['line_items'] = $this->cleanItems(
+                    $quote_data['line_items'] ?? []
+                );
+
+                // If we don't have a client ID, but we do have client data, go ahead and create the client.
+                if (
+                    empty($quote_data['client_id']) &&
+                    ! empty($quote_data['client'])
+                ) {
+                    $client_data = $quote_data['client'];
+                    $client_data['user_id'] = $this->getUserIDForRecord(
+                        $quote_data
+                    );
+
+                    $client_repository->save(
+                        $client_data,
+                        $client = ClientFactory::create(
+                            $this->company->id,
+                            $client_data['user_id']
+                        )
+                    );
+                    $quote_data['client_id'] = $client->id;
+                    unset($quote_data['client']);
+                }
+
+                $validator = Validator::make(
+                    $quote_data,
+                    (new StoreQuoteRequest())->rules()
+                );
+                if ($validator->fails()) {
+                    $this->error_array['invoice'][] = [
+                        'quote' => $quote_data,
+                        'error' => $validator->errors()->all(),
+                    ];
+                } else {
+                    $quote = QuoteFactory::create(
+                        $this->company->id,
+                        $this->getUserIDForRecord($quote_data)
+                    );
+                    if (! empty($quote_data['status_id'])) {
+                        $quote->status_id = $quote_data['status_id'];
+                    }
+                    $quote_repository->save($quote_data, $quote);
+
+                    $this->actionQuoteStatus(
+                        $quote,
+                        $quote_data,
+                        $quote_repository
+                    );
+                }
+            } catch (\Exception $ex) {
+                if ($ex instanceof ImportException) {
+                    $message = $ex->getMessage();
+                } else {
+                    report($ex);
+                    $message = 'Unknown error';
+                }
+
+                $this->error_array['quote'][] = [
+                    'invoice' => $raw_quote,
+                    'error' => $message,
+                ];
+            }
+        }
+    }
+
+    protected function getUserIDForRecord($record)
+    {
+        if (! empty($record['user_id'])) {
+            return $this->findUser($record['user_id']);
+        } else {
+            return $this->company->owner()->id;
+        }
+    }
+
+    protected function findUser($user_hash)
+    {
+        $user = User::where('account_id', $this->company->account->id)
+            ->where(
+                \DB::raw('CONCAT_WS(" ", first_name, last_name)'),
+                'like',
+                '%'.$user_hash.'%'
+            )
+            ->first();
+
+        if ($user) {
+            return $user->id;
+        } else {
+            return $this->company->owner()->id;
+        }
+    }
+
+    public function finalizeImport()
+    {
+        $data = [
+            'errors'  => $this->error_array,
+            'company' => $this->company,
+        ];
+
+        $nmo = new NinjaMailerObject;
+        $nmo->mailable = new ImportCompleted($this->company, $data);
+        $nmo->company = $this->company;
+        $nmo->settings = $this->company->settings;
+        $nmo->to_user = $this->company->owner();
+
+        NinjaMailerJob::dispatch($nmo, true);
+    }
 
     public function preTransform(array $data, $entity_type)
     {
         //sort the array by key
         // $keys = $this->column_map[$entity_type];
 
-		$keys = array_shift( $data );
+        $keys = array_shift($data);
         ksort($keys);
 
-		return array_map( function ( $values ) use ( $keys ) {
-			return array_combine( $keys, $values );
-		}, $data );
-		
-
+        return array_map(function ($values) use ($keys) {
+            return array_combine($keys, $values);
+        }, $data);
     }
 
-	public function preTransformCsv(array $data, $entity_type)
-	{
+    public function preTransformCsv(array $data, $entity_type)
+    {
+        if (empty($this->column_map[$entity_type])) {
+            return false;
+        }
 
-		if ( empty( $this->column_map[ $entity_type ] ) ) {
-			return false;
-		}
+        if ($this->skip_header) {
+            array_shift($data);
+        }
 
-		if ( $this->skip_header ) {
-			array_shift( $data );
-		}
+        //sort the array by key
+        $keys = $this->column_map[$entity_type];
+        ksort($keys);
 
-		//sort the array by key
-		$keys = $this->column_map[ $entity_type ];
-		ksort( $keys );
-
-		$data = array_map( function ( $row ) use ( $keys ) {
-			return array_combine( $keys, array_intersect_key( $row, $keys ) );
-		}, $data );
-
-
-		return $data;
-
-	}
+        $data = array_map(function ($row) use ($keys) {
+            return array_combine($keys, array_intersect_key($row, $keys));
+        }, $data);
 
+        return $data;
+    }
 }
diff --git a/app/Import/Providers/Csv.php b/app/Import/Providers/Csv.php
index b819550d0d7d..408d6be43b1b 100644
--- a/app/Import/Providers/Csv.php
+++ b/app/Import/Providers/Csv.php
@@ -43,7 +43,6 @@ use Symfony\Component\HttpFoundation\ParameterBag;
 
 class Csv extends BaseImport implements ImportInterface
 {
-
     public array $entity_count = [];
 
     public function import(string $entity)
@@ -60,7 +59,6 @@ class Csv extends BaseImport implements ImportInterface
         ) {
             $this->{$entity}();
         }
-        
     }
 
     public function client()
@@ -69,11 +67,13 @@ class Csv extends BaseImport implements ImportInterface
 
         $data = $this->getCsvData($entity_type);
 
-        if(is_array($data))
+        if (is_array($data)) {
             $data = $this->preTransformCsv($data, $entity_type);
+        }
 
         if (empty($data)) {
             $this->entity_count['clients'] = 0;
+
             return;
         }
 
@@ -97,11 +97,13 @@ class Csv extends BaseImport implements ImportInterface
 
         $data = $this->getCsvData($entity_type);
 
-        if(is_array($data))
+        if (is_array($data)) {
             $data = $this->preTransformCsv($data, $entity_type);
+        }
 
         if (empty($data)) {
             $this->entity_count['products'] = 0;
+
             return;
         }
 
@@ -125,11 +127,13 @@ class Csv extends BaseImport implements ImportInterface
 
         $data = $this->getCsvData($entity_type);
 
-        if(is_array($data))
+        if (is_array($data)) {
             $data = $this->preTransformCsv($data, $entity_type);
+        }
 
         if (empty($data)) {
             $this->entity_count['invoices'] = 0;
+
             return;
         }
 
@@ -153,14 +157,16 @@ class Csv extends BaseImport implements ImportInterface
 
         $data = $this->getCsvData($entity_type);
 
-        if(is_array($data))
+        if (is_array($data)) {
             $data = $this->preTransformCsv($data, $entity_type);
+        }
 
         if (empty($data)) {
             $this->entity_count['payments'] = 0;
+
             return;
         }
-
+        
         $this->request_name = StorePaymentRequest::class;
         $this->repository_name = PaymentRepository::class;
         $this->factory_name = PaymentFactory::class;
@@ -181,11 +187,13 @@ class Csv extends BaseImport implements ImportInterface
 
         $data = $this->getCsvData($entity_type);
 
-        if(is_array($data))
+        if (is_array($data)) {
             $data = $this->preTransformCsv($data, $entity_type);
+        }
 
         if (empty($data)) {
             $this->entity_count['vendors'] = 0;
+
             return;
         }
 
@@ -209,11 +217,13 @@ class Csv extends BaseImport implements ImportInterface
 
         $data = $this->getCsvData($entity_type);
 
-        if(is_array($data))
+        if (is_array($data)) {
             $data = $this->preTransformCsv($data, $entity_type);
+        }
 
         if (empty($data)) {
             $this->entity_count['expenses'] = 0;
+
             return;
         }
 
@@ -228,17 +238,15 @@ class Csv extends BaseImport implements ImportInterface
 
         $expense_count = $this->ingest($data, $entity_type);
 
-        $this->entity_count['expenses'] = $expense_count;        
+        $this->entity_count['expenses'] = $expense_count;
     }
 
     public function quote()
     {
-
     }
 
     public function task()
     {
-        
     }
 
     public function transform(array $data)
diff --git a/app/Import/Providers/Freshbooks.php b/app/Import/Providers/Freshbooks.php
index 458b671de894..f7bfffbb774a 100644
--- a/app/Import/Providers/Freshbooks.php
+++ b/app/Import/Providers/Freshbooks.php
@@ -8,6 +8,7 @@
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace App\Import\Providers;
 
 use App\Factory\ClientFactory;
@@ -21,7 +22,6 @@ use App\Repositories\InvoiceRepository;
 
 class Freshbooks extends BaseImport
 {
-
     public array $entity_count = [];
 
     public function import(string $entity)
@@ -53,6 +53,7 @@ class Freshbooks extends BaseImport
 
         if (empty($data)) {
             $this->entity_count['clients'] = 0;
+
             return;
         }
 
@@ -68,14 +69,13 @@ class Freshbooks extends BaseImport
         $client_count = $this->ingest($data, $entity_type);
 
         $this->entity_count['clients'] = $client_count;
-
     }
 
-
-    public function invoice() {
+    public function invoice()
+    {
 
         //make sure we update and create products with wave
-        $initial_update_products_value = $this->company->update_products; 
+        $initial_update_products_value = $this->company->update_products;
         $this->company->update_products = true;
 
         $this->company->save();
@@ -88,6 +88,7 @@ class Freshbooks extends BaseImport
 
         if (empty($data)) {
             $this->entity_count['invoices'] = 0;
+
             return;
         }
 
@@ -105,9 +106,6 @@ class Freshbooks extends BaseImport
         $this->entity_count['invoices'] = $invoice_count;
 
         $this->company->update_products = $initial_update_products_value;
-        $this->company->save();    
-
+        $this->company->save();
     }
-
-
 }
diff --git a/app/Import/Providers/ImportInterface.php b/app/Import/Providers/ImportInterface.php
index 9f355da111dc..0d95852624b5 100644
--- a/app/Import/Providers/ImportInterface.php
+++ b/app/Import/Providers/ImportInterface.php
@@ -8,11 +8,11 @@
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace App\Import\Providers;
 
 interface ImportInterface
 {
-
     public function import(string $entity);
 
     public function transform(array $data);
@@ -28,5 +28,4 @@ interface ImportInterface
     public function vendor();
 
     public function expense();
-
-}
\ No newline at end of file
+}
diff --git a/app/Import/Providers/Invoice2Go.php b/app/Import/Providers/Invoice2Go.php
index a3d944fa9a69..9b4d1c950d38 100644
--- a/app/Import/Providers/Invoice2Go.php
+++ b/app/Import/Providers/Invoice2Go.php
@@ -8,6 +8,7 @@
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace App\Import\Providers;
 
 use App\Factory\ClientFactory;
@@ -42,11 +43,11 @@ class Invoice2Go extends BaseImport
         // $this->finalizeImport();
     }
 
-
-    public function invoice() {
+    public function invoice()
+    {
 
         //make sure we update and create products with wave
-        $initial_update_products_value = $this->company->update_products; 
+        $initial_update_products_value = $this->company->update_products;
         $this->company->update_products = true;
 
         $this->company->save();
@@ -59,6 +60,7 @@ class Invoice2Go extends BaseImport
 
         if (empty($data)) {
             $this->entity_count['invoices'] = 0;
+
             return;
         }
 
@@ -76,9 +78,6 @@ class Invoice2Go extends BaseImport
         $this->entity_count['invoices'] = $invoice_count;
 
         $this->company->update_products = $initial_update_products_value;
-        $this->company->save();    
-
+        $this->company->save();
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/app/Import/Providers/Invoicely.php b/app/Import/Providers/Invoicely.php
index ff9aeedfc24b..c48d19be46a2 100644
--- a/app/Import/Providers/Invoicely.php
+++ b/app/Import/Providers/Invoicely.php
@@ -8,6 +8,7 @@
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace App\Import\Providers;
 
 use App\Factory\ClientFactory;
@@ -51,6 +52,7 @@ class Invoicely extends BaseImport
 
         if (empty($data)) {
             $this->entity_count['clients'] = 0;
+
             return;
         }
 
@@ -66,14 +68,13 @@ class Invoicely extends BaseImport
         $client_count = $this->ingest($data, $entity_type);
 
         $this->entity_count['clients'] = $client_count;
-
     }
 
-
-    public function invoice() {
+    public function invoice()
+    {
 
         //make sure we update and create products with wave
-        $initial_update_products_value = $this->company->update_products; 
+        $initial_update_products_value = $this->company->update_products;
         $this->company->update_products = true;
 
         $this->company->save();
@@ -86,6 +87,7 @@ class Invoicely extends BaseImport
 
         if (empty($data)) {
             $this->entity_count['invoices'] = 0;
+
             return;
         }
 
@@ -103,8 +105,6 @@ class Invoicely extends BaseImport
         $this->entity_count['invoices'] = $invoice_count;
 
         $this->company->update_products = $initial_update_products_value;
-        $this->company->save();    
-
+        $this->company->save();
     }
- 
-}
\ No newline at end of file
+}
diff --git a/app/Import/Providers/Wave.php b/app/Import/Providers/Wave.php
index d2d889723329..7b31b52e897a 100644
--- a/app/Import/Providers/Wave.php
+++ b/app/Import/Providers/Wave.php
@@ -34,7 +34,6 @@ use Illuminate\Support\Facades\Validator;
 
 class Wave extends BaseImport implements ImportInterface
 {
-
     public array $entity_count = [];
 
     public function import(string $entity)
@@ -67,6 +66,7 @@ class Wave extends BaseImport implements ImportInterface
 
         if (empty($data)) {
             $this->entity_count['clients'] = 0;
+
             return;
         }
 
@@ -82,20 +82,19 @@ class Wave extends BaseImport implements ImportInterface
         $client_count = $this->ingest($data, $entity_type);
 
         $this->entity_count['clients'] = $client_count;
-
     }
 
-
-    public function product() {
+    public function product()
+    {
 
         //done automatically inside the invoice() method as we need to harvest the products from the line items
-
     }
 
-    public function invoice() {
+    public function invoice()
+    {
 
         //make sure we update and create products with wave
-        $initial_update_products_value = $this->company->update_products; 
+        $initial_update_products_value = $this->company->update_products;
         $this->company->update_products = true;
 
         $this->company->save();
@@ -108,6 +107,7 @@ class Wave extends BaseImport implements ImportInterface
 
         if (empty($data)) {
             $this->entity_count['invoices'] = 0;
+
             return;
         }
 
@@ -125,29 +125,29 @@ class Wave extends BaseImport implements ImportInterface
         $this->entity_count['invoices'] = $invoice_count;
 
         $this->company->update_products = $initial_update_products_value;
-        $this->company->save();    
-
+        $this->company->save();
     }
 
-    public function payment() 
+    public function payment()
     {
         //these are pulled in when processing invoices
     }
 
-    public function vendor() 
+    public function vendor()
     {
-
         $entity_type = 'vendor';
 
         $data = $this->getCsvData($entity_type);
 
-        if(!is_array($data))
+        if (! is_array($data)) {
             return;
-        
+        }
+
         $data = $this->preTransform($data, $entity_type);
 
         if (empty($data)) {
             $this->entity_count['vendors'] = 0;
+
             return;
         }
 
@@ -163,10 +163,9 @@ class Wave extends BaseImport implements ImportInterface
         $vendor_count = $this->ingest($data, $entity_type);
 
         $this->entity_count['vendors'] = $vendor_count;
-
     }
 
-    public function expense() 
+    public function expense()
     {
         $entity_type = 'expense';
 
@@ -175,6 +174,7 @@ class Wave extends BaseImport implements ImportInterface
 
         if (empty($data)) {
             $this->entity_count['expense'] = 0;
+
             return;
         }
 
@@ -190,22 +190,21 @@ class Wave extends BaseImport implements ImportInterface
         $expense_count = $this->ingestExpenses($data, $entity_type);
 
         $this->entity_count['expenses'] = $expense_count;
-
     }
 
-    public function transform(array $data){}
-
+    public function transform(array $data)
+    {
+    }
 
     private function groupExpenses($csvData)
     {
-
         $grouped_expense = [];
         $key = 'Transaction ID';
 
-        foreach($csvData as $expense)
-        {
-            if($expense['Account Group'] == 'Expense')
-                $grouped[$expense[$key]][] = $expense; 
+        foreach ($csvData as $expense) {
+            if ($expense['Account Group'] == 'Expense') {
+                $grouped[$expense[$key]][] = $expense;
+            }
         }
 
         return $grouped;
@@ -223,13 +222,11 @@ class Wave extends BaseImport implements ImportInterface
         $expenses = $this->groupExpenses($data);
 
         foreach ($expenses as $raw_expense) {
-
             try {
-
                 $expense_data = $expense_transformer->transform($raw_expense);
 
                 // If we don't have a client ID, but we do have client data, go ahead and create the client.
-                if (empty($expense_data['vendor_id'])                ) {
+                if (empty($expense_data['vendor_id'])) {
                     $vendor_data['user_id'] = $this->getUserIDForRecord($expense_data);
 
                     $vendor_repository->save(
@@ -258,7 +255,6 @@ class Wave extends BaseImport implements ImportInterface
                     );
 
                     $expense_repository->save($expense_data, $expense);
-
                 }
             } catch (\Exception $ex) {
                 if ($ex instanceof ImportException) {
@@ -275,5 +271,4 @@ class Wave extends BaseImport implements ImportInterface
             }
         }
     }
-    
 }
diff --git a/app/Import/Providers/Zoho.php b/app/Import/Providers/Zoho.php
index 668dda234bc8..c5b092fda259 100644
--- a/app/Import/Providers/Zoho.php
+++ b/app/Import/Providers/Zoho.php
@@ -8,6 +8,7 @@
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace App\Import\Providers;
 
 use App\Factory\ClientFactory;
@@ -53,6 +54,7 @@ class Zoho extends BaseImport
 
         if (empty($data)) {
             $this->entity_count['clients'] = 0;
+
             return;
         }
 
@@ -68,13 +70,13 @@ class Zoho extends BaseImport
         $client_count = $this->ingest($data, $entity_type);
 
         $this->entity_count['clients'] = $client_count;
-
     }
 
-    public function invoice() {
+    public function invoice()
+    {
 
         //make sure we update and create products with wave
-        $initial_update_products_value = $this->company->update_products; 
+        $initial_update_products_value = $this->company->update_products;
         $this->company->update_products = true;
 
         $this->company->save();
@@ -87,6 +89,7 @@ class Zoho extends BaseImport
 
         if (empty($data)) {
             $this->entity_count['invoices'] = 0;
+
             return;
         }
 
@@ -104,9 +107,6 @@ class Zoho extends BaseImport
         $this->entity_count['invoices'] = $invoice_count;
 
         $this->company->update_products = $initial_update_products_value;
-        $this->company->save();    
-
+        $this->company->save();
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/app/Import/Transformer/BaseTransformer.php b/app/Import/Transformer/BaseTransformer.php
index 652aee4d9c07..ee9c47b537de 100644
--- a/app/Import/Transformer/BaseTransformer.php
+++ b/app/Import/Transformer/BaseTransformer.php
@@ -43,7 +43,7 @@ class BaseTransformer
 
     public function getValueOrNull($data, $field)
     {
-      return isset($data[$field]) && $data[$field] ? $data[$field] : null;
+        return isset($data[$field]) && $data[$field] ? $data[$field] : null;
     }
 
     public function getCurrencyByCode($data, $key = 'client.currency_id')
@@ -65,10 +65,7 @@ class BaseTransformer
 
     public function getClient($client_name, $client_email)
     {
-
-        if(!empty($client_name))
-        {
-
+        if (! empty($client_name)) {
             $client_id_search = $this->company
                 ->clients()
                 ->where('is_deleted', false)
@@ -87,8 +84,8 @@ class BaseTransformer
                 return $client_name_search->first()->id;
             }
         }
-        if (!empty($client_email)) {
-            $contacts = ClientContact::whereHas('client', function($query){
+        if (! empty($client_email)) {
+            $contacts = ClientContact::whereHas('client', function ($query) {
                 $query->where('is_deleted', false);
             })
             ->where('company_id', $this->company->id)
@@ -234,7 +231,7 @@ class BaseTransformer
             ])
             ->first();
 
-        if (!$contact) {
+        if (! $contact) {
             return null;
         }
 
@@ -445,13 +442,15 @@ class BaseTransformer
 
     public function getVendorIdOrCreate($name)
     {
-        if(empty($name))
+        if (empty($name)) {
             return null;
+        }
 
         $vendor = $this->getVendorId($name);
 
-        if($vendor)
+        if ($vendor) {
             return $vendor;
+        }
 
         $vendor = VendorFactory::create($this->company->id, $this->company->owner()->id);
         $vendor->name = $name;
@@ -480,19 +479,21 @@ class BaseTransformer
 
     public function getOrCreateExpenseCategry($name)
     {
-        if(empty($name))
+        if (empty($name)) {
             return null;
+        }
 
         $ec = $this->getExpenseCategoryId($name);
 
-        if($ec)
+        if ($ec) {
             return $ec;
+        }
 
         $expense_category = ExpenseCategoryFactory::create($this->company->id, $this->company->owner()->id);
         $expense_category->name = $name;
         $expense_category->save();
 
-        return $expense_category->id; 
+        return $expense_category->id;
     }
 
     /**
@@ -518,11 +519,11 @@ class BaseTransformer
         $project = ProjectFactory::create($this->company->id, $this->company->owner()->id);
         $project->name = $name;
 
-        if($clientId)
+        if ($clientId) {
             $project->client_id = $clientId;
-        
-        $project->saveQuietly();
+        }
 
+        $project->saveQuietly();
 
         return $project->id;
     }
@@ -540,6 +541,4 @@ class BaseTransformer
 
         return $pt ? $pt->id : null;
     }
-
-
 }
diff --git a/app/Import/Transformer/Csv/ClientTransformer.php b/app/Import/Transformer/Csv/ClientTransformer.php
index e2eb15dd6d78..f2ea9ec876df 100644
--- a/app/Import/Transformer/Csv/ClientTransformer.php
+++ b/app/Import/Transformer/Csv/ClientTransformer.php
@@ -10,6 +10,7 @@
  */
 
 namespace App\Import\Transformer\Csv;
+
 use App\Import\ImportException;
 use App\Import\Transformer\BaseTransformer;
 use Illuminate\Support\Str;
@@ -19,101 +20,101 @@ use Illuminate\Support\Str;
  */
 class ClientTransformer extends BaseTransformer
 {
-	/**
-	 * @param $data
-	 *
-	 * @return array|bool
-	 */
-	public function transform($data)
-	{
-		if (isset($data->name) && $this->getString($data, 'client.name')) {
-			throw new ImportException('Client already exists');
-		}
+    /**
+     * @param $data
+     *
+     * @return array|bool
+     */
+    public function transform($data)
+    {
+        if (isset($data->name) && $this->getString($data, 'client.name')) {
+            throw new ImportException('Client already exists');
+        }
 
-		$settings = new \stdClass();
-		$settings->currency_id = (string) $this->getCurrencyByCode($data);
+        $settings = new \stdClass();
+        $settings->currency_id = (string) $this->getCurrencyByCode($data);
 
-		return [
-			'company_id' => $this->company->id,
-			'name' => $this->getString($data, 'client.name'),
-			'work_phone' => $this->getString($data, 'client.phone'),
-			'address1' => $this->getString($data, 'client.address1'),
-			'address2' => $this->getString($data, 'client.address2'),
-			'postal_code' => $this->getString($data, 'client.postal_code'),
-			'city' => $this->getString($data, 'client.city'),
-			'state' => $this->getString($data, 'client.state'),
-			'shipping_address1' => $this->getString(
-				$data,
-				'client.shipping_address1'
-			),
-			'shipping_address2' => $this->getString(
-				$data,
-				'client.shipping_address2'
-			),
-			'shipping_city' => $this->getString($data, 'client.shipping_city'),
-			'shipping_state' => $this->getString(
-				$data,
-				'client.shipping_state'
-			),
-			'shipping_postal_code' => $this->getString(
-				$data,
-				'client.shipping_postal_code'
-			),
-			'public_notes' => $this->getString($data, 'client.public_notes'),
-			'private_notes' => $this->getString($data, 'client.private_notes'),
-			'website' => $this->getString($data, 'client.website'),
-			'vat_number' => $this->getString($data, 'client.vat_number'),
-			'id_number' => $this->getString($data, 'client.id_number'),
-			'custom_value1' => $this->getString($data, 'client.custom_value1'),
-			'custom_value2' => $this->getString($data, 'client.custom_value2'),
-			'custom_value3' => $this->getString($data, 'client.custom_value3'),
-			'custom_value4' => $this->getString($data, 'client.custom_value4'),
-			'balance' => preg_replace(
-				'/[^0-9,.]+/',
-				'',
-				$this->getFloat($data, 'client.balance')
-			),
-			'paid_to_date' => preg_replace(
-				'/[^0-9,.]+/',
-				'',
-				$this->getFloat($data, 'client.paid_to_date')
-			),
-			'credit_balance' => 0,
-			'settings' => $settings,
-			'client_hash' => Str::random(40),
-			'contacts' => [
-				[
-					'first_name' => $this->getString(
-						$data,
-						'contact.first_name'
-					),
-					'last_name' => $this->getString($data, 'contact.last_name'),
-					'email' => $this->getString($data, 'contact.email'),
-					'phone' => $this->getString($data, 'contact.phone'),
-					'custom_value1' => $this->getString(
-						$data,
-						'contact.custom_value1'
-					),
-					'custom_value2' => $this->getString(
-						$data,
-						'contact.custom_value2'
-					),
-					'custom_value3' => $this->getString(
-						$data,
-						'contact.custom_value3'
-					),
-					'custom_value4' => $this->getString(
-						$data,
-						'contact.custom_value4'
-					),
-				],
-			],
-			'country_id' => isset($data['client.country'])
-				? $this->getCountryId($data['client.country'])
-				: null,
-			'shipping_country_id' => isset($data['client.shipping_country'])
-				? $this->getCountryId($data['client.shipping_country'])
-				: null,
-		];
-	}
+        return [
+            'company_id' => $this->company->id,
+            'name' => $this->getString($data, 'client.name'),
+            'work_phone' => $this->getString($data, 'client.phone'),
+            'address1' => $this->getString($data, 'client.address1'),
+            'address2' => $this->getString($data, 'client.address2'),
+            'postal_code' => $this->getString($data, 'client.postal_code'),
+            'city' => $this->getString($data, 'client.city'),
+            'state' => $this->getString($data, 'client.state'),
+            'shipping_address1' => $this->getString(
+                $data,
+                'client.shipping_address1'
+            ),
+            'shipping_address2' => $this->getString(
+                $data,
+                'client.shipping_address2'
+            ),
+            'shipping_city' => $this->getString($data, 'client.shipping_city'),
+            'shipping_state' => $this->getString(
+                $data,
+                'client.shipping_state'
+            ),
+            'shipping_postal_code' => $this->getString(
+                $data,
+                'client.shipping_postal_code'
+            ),
+            'public_notes' => $this->getString($data, 'client.public_notes'),
+            'private_notes' => $this->getString($data, 'client.private_notes'),
+            'website' => $this->getString($data, 'client.website'),
+            'vat_number' => $this->getString($data, 'client.vat_number'),
+            'id_number' => $this->getString($data, 'client.id_number'),
+            'custom_value1' => $this->getString($data, 'client.custom_value1'),
+            'custom_value2' => $this->getString($data, 'client.custom_value2'),
+            'custom_value3' => $this->getString($data, 'client.custom_value3'),
+            'custom_value4' => $this->getString($data, 'client.custom_value4'),
+            'balance' => preg_replace(
+                '/[^0-9,.]+/',
+                '',
+                $this->getFloat($data, 'client.balance')
+            ),
+            'paid_to_date' => preg_replace(
+                '/[^0-9,.]+/',
+                '',
+                $this->getFloat($data, 'client.paid_to_date')
+            ),
+            'credit_balance' => 0,
+            'settings' => $settings,
+            'client_hash' => Str::random(40),
+            'contacts' => [
+                [
+                    'first_name' => $this->getString(
+                        $data,
+                        'contact.first_name'
+                    ),
+                    'last_name' => $this->getString($data, 'contact.last_name'),
+                    'email' => $this->getString($data, 'contact.email'),
+                    'phone' => $this->getString($data, 'contact.phone'),
+                    'custom_value1' => $this->getString(
+                        $data,
+                        'contact.custom_value1'
+                    ),
+                    'custom_value2' => $this->getString(
+                        $data,
+                        'contact.custom_value2'
+                    ),
+                    'custom_value3' => $this->getString(
+                        $data,
+                        'contact.custom_value3'
+                    ),
+                    'custom_value4' => $this->getString(
+                        $data,
+                        'contact.custom_value4'
+                    ),
+                ],
+            ],
+            'country_id' => isset($data['client.country'])
+                ? $this->getCountryId($data['client.country'])
+                : null,
+            'shipping_country_id' => isset($data['client.shipping_country'])
+                ? $this->getCountryId($data['client.shipping_country'])
+                : null,
+        ];
+    }
 }
diff --git a/app/Import/Transformer/Csv/ExpenseTransformer.php b/app/Import/Transformer/Csv/ExpenseTransformer.php
index 331d85d8b6c5..2e5cb032dc9a 100644
--- a/app/Import/Transformer/Csv/ExpenseTransformer.php
+++ b/app/Import/Transformer/Csv/ExpenseTransformer.php
@@ -8,6 +8,7 @@
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace App\Import\Transformer\Csv;
 
 use App\Import\Transformer\BaseTransformer;
@@ -17,54 +18,54 @@ use App\Import\Transformer\BaseTransformer;
  */
 class ExpenseTransformer extends BaseTransformer
 {
-	/**
-	 * @param $data
-	 *
-	 * @return bool|array
-	 */
-	public function transform($data)
-	{
-		$clientId = isset($data['expense.client'])
-			? $this->getClientId($data['expense.client'])
-			: null;
+    /**
+     * @param $data
+     *
+     * @return bool|array
+     */
+    public function transform($data)
+    {
+        $clientId = isset($data['expense.client'])
+            ? $this->getClientId($data['expense.client'])
+            : null;
 
-		return [
-			'company_id' => $this->company->id,
-			'amount' => $this->getFloat($data, 'expense.amount'),
-			'currency_id' => $this->getCurrencyByCode(
-				$data,
-				'expense.currency_id'
-			),
-			'vendor_id' => isset($data['expense.vendor'])
-				? $this->getVendorId($data['expense.vendor'])
-				: null,
-			'client_id' => isset($data['expense.client'])
-				? $this->getClientId($data['expense.client'])
-				: null,
-			'date' => $clientId,
-			'public_notes' => $this->getString($data, 'expense.public_notes'),
-			'private_notes' => $this->getString($data, 'expense.private_notes'),
-			'category_id' => isset($data['expense.category'])
-				? $this->getExpenseCategoryId($data['expense.category'])
-				: null,
-			'project_id' => isset($data['expense.project'])
-				? $this->getProjectId($data['expense.project'], $clientId)
-				: null,
-			'payment_type_id' => isset($data['expense.payment_type'])
-				? $this->getPaymentTypeId($data['expense.payment_type'])
-				: null,
-			'payment_date' => isset($data['expense.payment_date'])
-				? date('Y-m-d', strtotime($data['expense.payment_date']))
-				: null,
-			'custom_value1' => $this->getString($data, 'expense.custom_value1'),
-			'custom_value2' => $this->getString($data, 'expense.custom_value2'),
-			'custom_value3' => $this->getString($data, 'expense.custom_value3'),
-			'custom_value4' => $this->getString($data, 'expense.custom_value4'),
-			'transaction_reference' => $this->getString(
-				$data,
-				'expense.transaction_reference'
-			),
-			'should_be_invoiced' => $clientId ? true : false,
-		];
-	}
+        return [
+            'company_id' => $this->company->id,
+            'amount' => $this->getFloat($data, 'expense.amount'),
+            'currency_id' => $this->getCurrencyByCode(
+                $data,
+                'expense.currency_id'
+            ),
+            'vendor_id' => isset($data['expense.vendor'])
+                ? $this->getVendorId($data['expense.vendor'])
+                : null,
+            'client_id' => isset($data['expense.client'])
+                ? $this->getClientId($data['expense.client'])
+                : null,
+            'date' => strlen($this->getString($data, 'expense.date') > 1) ? date('Y-m-d', strtotime($this->getString($data, 'expense.date'))) : now()->format('Y-m-d'),
+            'public_notes' => $this->getString($data, 'expense.public_notes'),
+            'private_notes' => $this->getString($data, 'expense.private_notes'),
+            'category_id' => isset($data['expense.category'])
+                ? $this->getExpenseCategoryId($data['expense.category'])
+                : null,
+            'project_id' => isset($data['expense.project'])
+                ? $this->getProjectId($data['expense.project'], $clientId)
+                : null,
+            'payment_type_id' => isset($data['expense.payment_type'])
+                ? $this->getPaymentTypeId($data['expense.payment_type'])
+                : null,
+            'payment_date' => isset($data['expense.payment_date'])
+                ? date('Y-m-d', strtotime($data['expense.payment_date']))
+                : null,
+            'custom_value1' => $this->getString($data, 'expense.custom_value1'),
+            'custom_value2' => $this->getString($data, 'expense.custom_value2'),
+            'custom_value3' => $this->getString($data, 'expense.custom_value3'),
+            'custom_value4' => $this->getString($data, 'expense.custom_value4'),
+            'transaction_reference' => $this->getString(
+                $data,
+                'expense.transaction_reference'
+            ),
+            'should_be_invoiced' => $clientId ? true : false,
+        ];
+    }
 }
diff --git a/app/Import/Transformer/Csv/InvoiceTransformer.php b/app/Import/Transformer/Csv/InvoiceTransformer.php
index 98d38fcc7c15..643f201437b6 100644
--- a/app/Import/Transformer/Csv/InvoiceTransformer.php
+++ b/app/Import/Transformer/Csv/InvoiceTransformer.php
@@ -21,223 +21,221 @@ use App\Models\Invoice;
  */
 class InvoiceTransformer extends BaseTransformer
 {
-	/**
-	 * @param $data
-	 *
-	 * @return bool|array
-	 */
-	public function transform($line_items_data)
-	{
-		$invoice_data = reset($line_items_data);
+    /**
+     * @param $data
+     *
+     * @return bool|array
+     */
+    public function transform($line_items_data)
+    {
+        $invoice_data = reset($line_items_data);
 
-		if ($this->hasInvoice($invoice_data['invoice.number'])) {
-			throw new ImportException('Invoice number already exists');
-		}
+        if ($this->hasInvoice($invoice_data['invoice.number'])) {
+            throw new ImportException('Invoice number already exists');
+        }
 
-		$invoiceStatusMap = [
-			'sent' => Invoice::STATUS_SENT,
-			'draft' => Invoice::STATUS_DRAFT,
-		];
+        $invoiceStatusMap = [
+            'sent' => Invoice::STATUS_SENT,
+            'draft' => Invoice::STATUS_DRAFT,
+        ];
 
-		$transformed = [
-			'company_id' => $this->company->id,
-			'number' => $this->getString($invoice_data, 'invoice.number'),
-			'user_id' => $this->getString($invoice_data, 'invoice.user_id'),
-			'amount' => ($amount = $this->getFloat(
-				$invoice_data,
-				'invoice.amount'
-			)),
-			'balance' => isset($invoice_data['invoice.balance'])
-				? $this->getFloat($invoice_data, 'invoice.balance')
-				: $amount,
-			'client_id' => $this->getClient(
-				$this->getString($invoice_data, 'client.name'),
-				$this->getString($invoice_data, 'client.email')
-			),
-			'discount' => $this->getFloat($invoice_data, 'invoice.discount'),
-			'po_number' => $this->getString($invoice_data, 'invoice.po_number'),
-			'date' => isset($invoice_data['invoice.date'])
-				? date('Y-m-d', strtotime($invoice_data['invoice.date']))
-				: now()->format('Y-m-d'),
-			'due_date' => isset($invoice_data['invoice.due_date'])
-				? date('Y-m-d', strtotime($invoice_data['invoice.due_date']))
-				: null,
-			'terms' => $this->getString($invoice_data, 'invoice.terms'),
-			'public_notes' => $this->getString(
-				$invoice_data,
-				'invoice.public_notes'
-			),
-			'private_notes' => $this->getString(
-				$invoice_data,
-				'invoice.private_notes'
-			),
-			'tax_name1' => $this->getString($invoice_data, 'invoice.tax_name1'),
-			'tax_rate1' => $this->getFloat($invoice_data, 'invoice.tax_rate1'),
-			'tax_name2' => $this->getString($invoice_data, 'invoice.tax_name2'),
-			'tax_rate2' => $this->getFloat($invoice_data, 'invoice.tax_rate2'),
-			'tax_name3' => $this->getString($invoice_data, 'invoice.tax_name3'),
-			'tax_rate3' => $this->getFloat($invoice_data, 'invoice.tax_rate3'),
-			'custom_value1' => $this->getString(
-				$invoice_data,
-				'invoice.custom_value1'
-			),
-			'custom_value2' => $this->getString(
-				$invoice_data,
-				'invoice.custom_value2'
-			),
-			'custom_value3' => $this->getString(
-				$invoice_data,
-				'invoice.custom_value3'
-			),
-			'custom_value4' => $this->getString(
-				$invoice_data,
-				'invoice.custom_value4'
-			),
-			'footer' => $this->getString($invoice_data, 'invoice.footer'),
-			'partial' => $this->getFloat($invoice_data, 'invoice.partial'),
-			'partial_due_date' => $this->getString(
-				$invoice_data,
-				'invoice.partial_due_date'
-			),
-			'custom_surcharge1' => $this->getString(
-				$invoice_data,
-				'invoice.custom_surcharge1'
-			),
-			'custom_surcharge2' => $this->getString(
-				$invoice_data,
-				'invoice.custom_surcharge2'
-			),
-			'custom_surcharge3' => $this->getString(
-				$invoice_data,
-				'invoice.custom_surcharge3'
-			),
-			'custom_surcharge4' => $this->getString(
-				$invoice_data,
-				'invoice.custom_surcharge4'
-			),
-			'exchange_rate' => $this->getString(
-				$invoice_data,
-				'invoice.exchange_rate'
-			),
-			'status_id' =>
-				$invoiceStatusMap[
-					($status = strtolower(
-						$this->getString($invoice_data, 'invoice.status')
-					))
-				] ?? Invoice::STATUS_SENT,
-			// 'archived' => $status === 'archived',
-		];
+        $transformed = [
+            'company_id' => $this->company->id,
+            'number' => $this->getString($invoice_data, 'invoice.number'),
+            'user_id' => $this->getString($invoice_data, 'invoice.user_id'),
+            'amount' => ($amount = $this->getFloat(
+                $invoice_data,
+                'invoice.amount'
+            )),
+            'balance' => isset($invoice_data['invoice.balance'])
+                ? $this->getFloat($invoice_data, 'invoice.balance')
+                : $amount,
+            'client_id' => $this->getClient(
+                $this->getString($invoice_data, 'client.name'),
+                $this->getString($invoice_data, 'client.email')
+            ),
+            'discount' => $this->getFloat($invoice_data, 'invoice.discount'),
+            'po_number' => $this->getString($invoice_data, 'invoice.po_number'),
+            'date' => isset($invoice_data['invoice.date'])
+                ? date('Y-m-d', strtotime($invoice_data['invoice.date']))
+                : now()->format('Y-m-d'),
+            'due_date' => isset($invoice_data['invoice.due_date'])
+                ? date('Y-m-d', strtotime($invoice_data['invoice.due_date']))
+                : null,
+            'terms' => $this->getString($invoice_data, 'invoice.terms'),
+            'public_notes' => $this->getString(
+                $invoice_data,
+                'invoice.public_notes'
+            ),
+            'private_notes' => $this->getString(
+                $invoice_data,
+                'invoice.private_notes'
+            ),
+            'tax_name1' => $this->getString($invoice_data, 'invoice.tax_name1'),
+            'tax_rate1' => $this->getFloat($invoice_data, 'invoice.tax_rate1'),
+            'tax_name2' => $this->getString($invoice_data, 'invoice.tax_name2'),
+            'tax_rate2' => $this->getFloat($invoice_data, 'invoice.tax_rate2'),
+            'tax_name3' => $this->getString($invoice_data, 'invoice.tax_name3'),
+            'tax_rate3' => $this->getFloat($invoice_data, 'invoice.tax_rate3'),
+            'custom_value1' => $this->getString(
+                $invoice_data,
+                'invoice.custom_value1'
+            ),
+            'custom_value2' => $this->getString(
+                $invoice_data,
+                'invoice.custom_value2'
+            ),
+            'custom_value3' => $this->getString(
+                $invoice_data,
+                'invoice.custom_value3'
+            ),
+            'custom_value4' => $this->getString(
+                $invoice_data,
+                'invoice.custom_value4'
+            ),
+            'footer' => $this->getString($invoice_data, 'invoice.footer'),
+            'partial' => $this->getFloat($invoice_data, 'invoice.partial'),
+            'partial_due_date' => $this->getString(
+                $invoice_data,
+                'invoice.partial_due_date'
+            ),
+            'custom_surcharge1' => $this->getString(
+                $invoice_data,
+                'invoice.custom_surcharge1'
+            ),
+            'custom_surcharge2' => $this->getString(
+                $invoice_data,
+                'invoice.custom_surcharge2'
+            ),
+            'custom_surcharge3' => $this->getString(
+                $invoice_data,
+                'invoice.custom_surcharge3'
+            ),
+            'custom_surcharge4' => $this->getString(
+                $invoice_data,
+                'invoice.custom_surcharge4'
+            ),
+            'exchange_rate' => $this->getString(
+                $invoice_data,
+                'invoice.exchange_rate'
+            ),
+            'status_id' => $invoiceStatusMap[
+                    ($status = strtolower(
+                        $this->getString($invoice_data, 'invoice.status')
+                    ))
+                ] ?? Invoice::STATUS_SENT,
+            // 'archived' => $status === 'archived',
+        ];
 
-		/* If we can't find the client, then lets try and create a client */
-		if (!$transformed['client_id']) {
-			$client_transformer = new ClientTransformer($this->company);
+        /* If we can't find the client, then lets try and create a client */
+        if (! $transformed['client_id']) {
+            $client_transformer = new ClientTransformer($this->company);
 
-			$transformed['client'] = $client_transformer->transform(
-				$invoice_data
-			);
-		}
+            $transformed['client'] = $client_transformer->transform(
+                $invoice_data
+            );
+        }
 
-		if (isset($invoice_data['payment.amount'])) {
-			$transformed['payments'] = [
-				[
-					'date' => isset($invoice_data['payment.date'])
-						? date(
-							'Y-m-d',
-							strtotime($invoice_data['payment.date'])
-						)
-						: date('y-m-d'),
-					'transaction_reference' => $this->getString(
-						$invoice_data,
-						'payment.transaction_reference'
-					),
-					'amount' => $this->getFloat(
-						$invoice_data,
-						'payment.amount'
-					),
-				],
-			];
-		} elseif ($status === 'paid') {
-			$transformed['payments'] = [
-				[
-					'date' => isset($invoice_data['payment.date'])
-						? date(
-							'Y-m-d',
-							strtotime($invoice_data['payment.date'])
-						)
-						: date('y-m-d'),
-					'transaction_reference' => $this->getString(
-						$invoice_data,
-						'payment.transaction_reference'
-					),
-					'amount' => $this->getFloat(
-						$invoice_data,
-						'invoice.amount'
-					),
-				],
-			];
-		} elseif (
-			isset($transformed['amount']) &&
-			isset($transformed['balance']) &&
-			$transformed['amount'] != $transformed['balance']
-		) {
-			$transformed['payments'] = [
-				[
-					'date' => isset($invoice_data['payment.date'])
-						? date(
-							'Y-m-d',
-							strtotime($invoice_data['payment.date'])
-						)
-						: date('y-m-d'),
-					'transaction_reference' => $this->getString(
-						$invoice_data,
-						'payment.transaction_reference'
-					),
-					'amount' =>
-						$transformed['amount'] - $transformed['balance'],
-				],
-			];
-		}
+        if (isset($invoice_data['payment.amount'])) {
+            $transformed['payments'] = [
+                [
+                    'date' => isset($invoice_data['payment.date'])
+                        ? date(
+                            'Y-m-d',
+                            strtotime($invoice_data['payment.date'])
+                        )
+                        : date('y-m-d'),
+                    'transaction_reference' => $this->getString(
+                        $invoice_data,
+                        'payment.transaction_reference'
+                    ),
+                    'amount' => $this->getFloat(
+                        $invoice_data,
+                        'payment.amount'
+                    ),
+                ],
+            ];
+        } elseif ($status === 'paid') {
+            $transformed['payments'] = [
+                [
+                    'date' => isset($invoice_data['payment.date'])
+                        ? date(
+                            'Y-m-d',
+                            strtotime($invoice_data['payment.date'])
+                        )
+                        : date('y-m-d'),
+                    'transaction_reference' => $this->getString(
+                        $invoice_data,
+                        'payment.transaction_reference'
+                    ),
+                    'amount' => $this->getFloat(
+                        $invoice_data,
+                        'invoice.amount'
+                    ),
+                ],
+            ];
+        } elseif (
+            isset($transformed['amount']) &&
+            isset($transformed['balance']) &&
+            $transformed['amount'] != $transformed['balance']
+        ) {
+            $transformed['payments'] = [
+                [
+                    'date' => isset($invoice_data['payment.date'])
+                        ? date(
+                            'Y-m-d',
+                            strtotime($invoice_data['payment.date'])
+                        )
+                        : date('y-m-d'),
+                    'transaction_reference' => $this->getString(
+                        $invoice_data,
+                        'payment.transaction_reference'
+                    ),
+                    'amount' => $transformed['amount'] - $transformed['balance'],
+                ],
+            ];
+        }
 
-		$line_items = [];
-		foreach ($line_items_data as $record) {
-			$line_items[] = [
-				'quantity' => $this->getFloat($record, 'item.quantity'),
-				'cost' => $this->getFloat($record, 'item.cost'),
-				'product_key' => $this->getString($record, 'item.product_key'),
-				'notes' => $this->getString($record, 'item.notes'),
-				'discount' => $this->getFloat($record, 'item.discount'),
-				'is_amount_discount' => filter_var(
-					$this->getString($record, 'item.is_amount_discount'),
-					FILTER_VALIDATE_BOOLEAN,
-					FILTER_NULL_ON_FAILURE
-				),
-				'tax_name1' => $this->getString($record, 'item.tax_name1'),
-				'tax_rate1' => $this->getFloat($record, 'item.tax_rate1'),
-				'tax_name2' => $this->getString($record, 'item.tax_name2'),
-				'tax_rate2' => $this->getFloat($record, 'item.tax_rate2'),
-				'tax_name3' => $this->getString($record, 'item.tax_name3'),
-				'tax_rate3' => $this->getFloat($record, 'item.tax_rate3'),
-				'custom_value1' => $this->getString(
-					$record,
-					'item.custom_value1'
-				),
-				'custom_value2' => $this->getString(
-					$record,
-					'item.custom_value2'
-				),
-				'custom_value3' => $this->getString(
-					$record,
-					'item.custom_value3'
-				),
-				'custom_value4' => $this->getString(
-					$record,
-					'item.custom_value4'
-				),
-				'type_id' => '1', //$this->getInvoiceTypeId( $record, 'item.type_id' ),
-			];
-		}
-		$transformed['line_items'] = $line_items;
+        $line_items = [];
+        foreach ($line_items_data as $record) {
+            $line_items[] = [
+                'quantity' => $this->getFloat($record, 'item.quantity'),
+                'cost' => $this->getFloat($record, 'item.cost'),
+                'product_key' => $this->getString($record, 'item.product_key'),
+                'notes' => $this->getString($record, 'item.notes'),
+                'discount' => $this->getFloat($record, 'item.discount'),
+                'is_amount_discount' => filter_var(
+                    $this->getString($record, 'item.is_amount_discount'),
+                    FILTER_VALIDATE_BOOLEAN,
+                    FILTER_NULL_ON_FAILURE
+                ),
+                'tax_name1' => $this->getString($record, 'item.tax_name1'),
+                'tax_rate1' => $this->getFloat($record, 'item.tax_rate1'),
+                'tax_name2' => $this->getString($record, 'item.tax_name2'),
+                'tax_rate2' => $this->getFloat($record, 'item.tax_rate2'),
+                'tax_name3' => $this->getString($record, 'item.tax_name3'),
+                'tax_rate3' => $this->getFloat($record, 'item.tax_rate3'),
+                'custom_value1' => $this->getString(
+                    $record,
+                    'item.custom_value1'
+                ),
+                'custom_value2' => $this->getString(
+                    $record,
+                    'item.custom_value2'
+                ),
+                'custom_value3' => $this->getString(
+                    $record,
+                    'item.custom_value3'
+                ),
+                'custom_value4' => $this->getString(
+                    $record,
+                    'item.custom_value4'
+                ),
+                'type_id' => '1', //$this->getInvoiceTypeId( $record, 'item.type_id' ),
+            ];
+        }
+        $transformed['line_items'] = $line_items;
 
-		return $transformed;
-	}
+        return $transformed;
+    }
 }
diff --git a/app/Import/Transformer/Csv/PaymentTransformer.php b/app/Import/Transformer/Csv/PaymentTransformer.php
index e12577d57af7..9b8d17e9d6a3 100644
--- a/app/Import/Transformer/Csv/PaymentTransformer.php
+++ b/app/Import/Transformer/Csv/PaymentTransformer.php
@@ -19,54 +19,54 @@ use App\Import\Transformer\BaseTransformer;
  */
 class PaymentTransformer extends BaseTransformer
 {
-	/**
-	 * @param $data
-	 *
-	 * @return array
-	 */
-	public function transform($data)
-	{
-		$client_id = $this->getClient(
-			$this->getString($data, 'payment.client_id'),
-			$this->getString($data, 'payment.client_id')
-		);
+    /**
+     * @param $data
+     *
+     * @return array
+     */
+    public function transform($data)
+    {
+        $client_id = $this->getClient(
+            $this->getString($data, 'payment.client_id'),
+            $this->getString($data, 'payment.client_id')
+        );
 
-		if (empty($client_id)) {
-			throw new ImportException('Could not find client.');
-		}
+        if (empty($client_id)) {
+            throw new ImportException('Could not find client.');
+        }
 
-		$transformed = [
-			'company_id' => $this->company->id,
-			'number' => $this->getString($data, 'payment.number'),
-			'user_id' => $this->getString($data, 'payment.user_id'),
-			'amount' => $this->getFloat($data, 'payment.amount'),
-			'refunded' => $this->getFloat($data, 'payment.refunded'),
-			'applied' => $this->getFloat($data, 'payment.applied'),
-			'transaction_reference' => $this->getString(
-				$data,
-				'payment.transaction_reference '
-			),
-			'date' => $this->getString($data, 'payment.date'),
-			'private_notes' => $this->getString($data, 'payment.private_notes'),
-			'custom_value1' => $this->getString($data, 'payment.custom_value1'),
-			'custom_value2' => $this->getString($data, 'payment.custom_value2'),
-			'custom_value3' => $this->getString($data, 'payment.custom_value3'),
-			'custom_value4' => $this->getString($data, 'payment.custom_value4'),
-			'client_id' => $client_id,
-		];
+        $transformed = [
+            'company_id' => $this->company->id,
+            'number' => $this->getString($data, 'payment.number'),
+            'user_id' => $this->getString($data, 'payment.user_id'),
+            'amount' => $this->getFloat($data, 'payment.amount'),
+            'refunded' => $this->getFloat($data, 'payment.refunded'),
+            'applied' => $this->getFloat($data, 'payment.applied'),
+            'transaction_reference' => $this->getString(
+                $data,
+                'payment.transaction_reference '
+            ),
+            'date' => $this->getString($data, 'payment.date'),
+            'private_notes' => $this->getString($data, 'payment.private_notes'),
+            'custom_value1' => $this->getString($data, 'payment.custom_value1'),
+            'custom_value2' => $this->getString($data, 'payment.custom_value2'),
+            'custom_value3' => $this->getString($data, 'payment.custom_value3'),
+            'custom_value4' => $this->getString($data, 'payment.custom_value4'),
+            'client_id' => $client_id,
+        ];
 
-		if (
-			isset($data['payment.invoice_number']) &&
-			($invoice_id = $this->getInvoiceId($data['payment.invoice_number']))
-		) {
-			$transformed['invoices'] = [
-				[
-					'invoice_id' => $invoice_id,
-					'amount' => $transformed['amount'] ?? null,
-				],
-			];
-		}
+        if (
+            isset($data['payment.invoice_number']) &&
+            ($invoice_id = $this->getInvoiceId($data['payment.invoice_number']))
+        ) {
+            $transformed['invoices'] = [
+                [
+                    'invoice_id' => $invoice_id,
+                    'amount' => $transformed['amount'] ?? null,
+                ],
+            ];
+        }
 
-		return $transformed;
-	}
+        return $transformed;
+    }
 }
diff --git a/app/Import/Transformer/Csv/ProductTransformer.php b/app/Import/Transformer/Csv/ProductTransformer.php
index d0e71d33215c..db6ae8ed301c 100644
--- a/app/Import/Transformer/Csv/ProductTransformer.php
+++ b/app/Import/Transformer/Csv/ProductTransformer.php
@@ -12,6 +12,7 @@
 namespace App\Import\Transformer\Csv;
 
 use App\Import\Transformer\BaseTransformer;
+
 /**
  * Class ProductTransformer.
  */
@@ -25,22 +26,22 @@ class ProductTransformer extends BaseTransformer
     public function transform($data)
     {
         return [
-                'company_id' => $this->company->id,
-                'product_key' => $this->getString($data, 'product.product_key'),
-                'notes' => $this->getString($data, 'product.notes'),
-                'cost' => $this->getFloat($data, 'product.cost'),
-                'price' => $this->getFloat($data, 'product.price'),
-                'quantity' => $this->getFloat($data, 'product.quantity'),
-                'tax_name1' => $this->getString($data, 'product.tax_name1'),
-                'tax_rate1' => $this->getFloat($data, 'product.tax_rate1'),
-                'tax_name2' => $this->getString($data, 'product.tax_name2'),
-                'tax_rate2' => $this->getFloat($data, 'product.tax_rate2'),
-                'tax_name3' => $this->getString($data, 'product.tax_name3'),
-                'tax_rate3' => $this->getFloat($data, 'product.tax_rate3'),
-                'custom_value1' => $this->getString($data, 'product.custom_value1'),
-                'custom_value2' => $this->getString($data, 'product.custom_value2'),
-                'custom_value3' => $this->getString($data, 'product.custom_value3'),
-                'custom_value4' => $this->getString($data, 'product.custom_value4'),
-            ];
+            'company_id' => $this->company->id,
+            'product_key' => $this->getString($data, 'product.product_key'),
+            'notes' => $this->getString($data, 'product.notes'),
+            'cost' => $this->getFloat($data, 'product.cost'),
+            'price' => $this->getFloat($data, 'product.price'),
+            'quantity' => $this->getFloat($data, 'product.quantity'),
+            'tax_name1' => $this->getString($data, 'product.tax_name1'),
+            'tax_rate1' => $this->getFloat($data, 'product.tax_rate1'),
+            'tax_name2' => $this->getString($data, 'product.tax_name2'),
+            'tax_rate2' => $this->getFloat($data, 'product.tax_rate2'),
+            'tax_name3' => $this->getString($data, 'product.tax_name3'),
+            'tax_rate3' => $this->getFloat($data, 'product.tax_rate3'),
+            'custom_value1' => $this->getString($data, 'product.custom_value1'),
+            'custom_value2' => $this->getString($data, 'product.custom_value2'),
+            'custom_value3' => $this->getString($data, 'product.custom_value3'),
+            'custom_value4' => $this->getString($data, 'product.custom_value4'),
+        ];
     }
 }
diff --git a/app/Import/Transformer/Csv/QuoteTransformer.php b/app/Import/Transformer/Csv/QuoteTransformer.php
index c15fd365c359..59d3bcb85dc7 100644
--- a/app/Import/Transformer/Csv/QuoteTransformer.php
+++ b/app/Import/Transformer/Csv/QuoteTransformer.php
@@ -21,223 +21,221 @@ use App\Models\Quote;
  */
 class QuoteTransformer extends BaseTransformer
 {
-	/**
-	 * @param $data
-	 *
-	 * @return bool|array
-	 */
-	public function transform($line_items_data)
-	{
-		$quote_data = reset($line_items_data);
+    /**
+     * @param $data
+     *
+     * @return bool|array
+     */
+    public function transform($line_items_data)
+    {
+        $quote_data = reset($line_items_data);
 
-		if ($this->hasQuote($quote_data['quote.number'])) {
-			throw new ImportException('Quote number already exists');
-		}
+        if ($this->hasQuote($quote_data['quote.number'])) {
+            throw new ImportException('Quote number already exists');
+        }
 
-		$quoteStatusMap = [
-			'sent' => Quote::STATUS_SENT,
-			'draft' => Quote::STATUS_DRAFT,
-		];
+        $quoteStatusMap = [
+            'sent' => Quote::STATUS_SENT,
+            'draft' => Quote::STATUS_DRAFT,
+        ];
 
-		$transformed = [
-			'company_id' => $this->company->id,
-			'number' => $this->getString($quote_data, 'quote.number'),
-			'user_id' => $this->getString($quote_data, 'quote.user_id'),
-			'amount' => ($amount = $this->getFloat(
-				$quote_data,
-				'quote.amount'
-			)),
-			'balance' => isset($quote_data['quote.balance'])
-				? $this->getFloat($quote_data, 'quote.balance')
-				: $amount,
-			'client_id' => $this->getClient(
-				$this->getString($quote_data, 'client.name'),
-				$this->getString($quote_data, 'client.email')
-			),
-			'discount' => $this->getFloat($quote_data, 'quote.discount'),
-			'po_number' => $this->getString($quote_data, 'quote.po_number'),
-			'date' => isset($quote_data['quote.date'])
-				? date('Y-m-d', strtotime($quote_data['quote.date']))
-				: now()->format('Y-m-d'),
-			'due_date' => isset($quote_data['quote.due_date'])
-				? date('Y-m-d', strtotime($quote_data['quote.due_date']))
-				: null,
-			'terms' => $this->getString($quote_data, 'quote.terms'),
-			'public_notes' => $this->getString(
-				$quote_data,
-				'quote.public_notes'
-			),
-			'private_notes' => $this->getString(
-				$quote_data,
-				'quote.private_notes'
-			),
-			'tax_name1' => $this->getString($quote_data, 'quote.tax_name1'),
-			'tax_rate1' => $this->getFloat($quote_data, 'quote.tax_rate1'),
-			'tax_name2' => $this->getString($quote_data, 'quote.tax_name2'),
-			'tax_rate2' => $this->getFloat($quote_data, 'quote.tax_rate2'),
-			'tax_name3' => $this->getString($quote_data, 'quote.tax_name3'),
-			'tax_rate3' => $this->getFloat($quote_data, 'quote.tax_rate3'),
-			'custom_value1' => $this->getString(
-				$quote_data,
-				'quote.custom_value1'
-			),
-			'custom_value2' => $this->getString(
-				$quote_data,
-				'quote.custom_value2'
-			),
-			'custom_value3' => $this->getString(
-				$quote_data,
-				'quote.custom_value3'
-			),
-			'custom_value4' => $this->getString(
-				$quote_data,
-				'quote.custom_value4'
-			),
-			'footer' => $this->getString($quote_data, 'quote.footer'),
-			'partial' => $this->getFloat($quote_data, 'quote.partial'),
-			'partial_due_date' => $this->getString(
-				$quote_data,
-				'quote.partial_due_date'
-			),
-			'custom_surcharge1' => $this->getString(
-				$quote_data,
-				'quote.custom_surcharge1'
-			),
-			'custom_surcharge2' => $this->getString(
-				$quote_data,
-				'quote.custom_surcharge2'
-			),
-			'custom_surcharge3' => $this->getString(
-				$quote_data,
-				'quote.custom_surcharge3'
-			),
-			'custom_surcharge4' => $this->getString(
-				$quote_data,
-				'quote.custom_surcharge4'
-			),
-			'exchange_rate' => $this->getString(
-				$quote_data,
-				'quote.exchange_rate'
-			),
-			'status_id' =>
-				$quoteStatusMap[
-					($status = strtolower(
-						$this->getString($quote_data, 'quote.status')
-					))
-				] ?? Quote::STATUS_SENT,
-			'archived' => $status === 'archived',
-		];
+        $transformed = [
+            'company_id' => $this->company->id,
+            'number' => $this->getString($quote_data, 'quote.number'),
+            'user_id' => $this->getString($quote_data, 'quote.user_id'),
+            'amount' => ($amount = $this->getFloat(
+                $quote_data,
+                'quote.amount'
+            )),
+            'balance' => isset($quote_data['quote.balance'])
+                ? $this->getFloat($quote_data, 'quote.balance')
+                : $amount,
+            'client_id' => $this->getClient(
+                $this->getString($quote_data, 'client.name'),
+                $this->getString($quote_data, 'client.email')
+            ),
+            'discount' => $this->getFloat($quote_data, 'quote.discount'),
+            'po_number' => $this->getString($quote_data, 'quote.po_number'),
+            'date' => isset($quote_data['quote.date'])
+                ? date('Y-m-d', strtotime($quote_data['quote.date']))
+                : now()->format('Y-m-d'),
+            'due_date' => isset($quote_data['quote.due_date'])
+                ? date('Y-m-d', strtotime($quote_data['quote.due_date']))
+                : null,
+            'terms' => $this->getString($quote_data, 'quote.terms'),
+            'public_notes' => $this->getString(
+                $quote_data,
+                'quote.public_notes'
+            ),
+            'private_notes' => $this->getString(
+                $quote_data,
+                'quote.private_notes'
+            ),
+            'tax_name1' => $this->getString($quote_data, 'quote.tax_name1'),
+            'tax_rate1' => $this->getFloat($quote_data, 'quote.tax_rate1'),
+            'tax_name2' => $this->getString($quote_data, 'quote.tax_name2'),
+            'tax_rate2' => $this->getFloat($quote_data, 'quote.tax_rate2'),
+            'tax_name3' => $this->getString($quote_data, 'quote.tax_name3'),
+            'tax_rate3' => $this->getFloat($quote_data, 'quote.tax_rate3'),
+            'custom_value1' => $this->getString(
+                $quote_data,
+                'quote.custom_value1'
+            ),
+            'custom_value2' => $this->getString(
+                $quote_data,
+                'quote.custom_value2'
+            ),
+            'custom_value3' => $this->getString(
+                $quote_data,
+                'quote.custom_value3'
+            ),
+            'custom_value4' => $this->getString(
+                $quote_data,
+                'quote.custom_value4'
+            ),
+            'footer' => $this->getString($quote_data, 'quote.footer'),
+            'partial' => $this->getFloat($quote_data, 'quote.partial'),
+            'partial_due_date' => $this->getString(
+                $quote_data,
+                'quote.partial_due_date'
+            ),
+            'custom_surcharge1' => $this->getString(
+                $quote_data,
+                'quote.custom_surcharge1'
+            ),
+            'custom_surcharge2' => $this->getString(
+                $quote_data,
+                'quote.custom_surcharge2'
+            ),
+            'custom_surcharge3' => $this->getString(
+                $quote_data,
+                'quote.custom_surcharge3'
+            ),
+            'custom_surcharge4' => $this->getString(
+                $quote_data,
+                'quote.custom_surcharge4'
+            ),
+            'exchange_rate' => $this->getString(
+                $quote_data,
+                'quote.exchange_rate'
+            ),
+            'status_id' => $quoteStatusMap[
+                    ($status = strtolower(
+                        $this->getString($quote_data, 'quote.status')
+                    ))
+                ] ?? Quote::STATUS_SENT,
+            'archived' => $status === 'archived',
+        ];
 
-		/* If we can't find the client, then lets try and create a client */
-		if (!$transformed['client_id']) {
-			$client_transformer = new ClientTransformer($this->company);
+        /* If we can't find the client, then lets try and create a client */
+        if (! $transformed['client_id']) {
+            $client_transformer = new ClientTransformer($this->company);
 
-			$transformed['client'] = $client_transformer->transform(
-				$quote_data
-			);
-		}
+            $transformed['client'] = $client_transformer->transform(
+                $quote_data
+            );
+        }
 
-		if (isset($quote_data['payment.amount'])) {
-			$transformed['payments'] = [
-				[
-					'date' => isset($quote_data['payment.date'])
-						? date(
-							'Y-m-d',
-							strtotime($quote_data['payment.date'])
-						)
-						: date('y-m-d'),
-					'transaction_reference' => $this->getString(
-						$quote_data,
-						'payment.transaction_reference'
-					),
-					'amount' => $this->getFloat(
-						$quote_data,
-						'payment.amount'
-					),
-				],
-			];
-		} elseif ($status === 'paid') {
-			$transformed['payments'] = [
-				[
-					'date' => isset($quote_data['payment.date'])
-						? date(
-							'Y-m-d',
-							strtotime($quote_data['payment.date'])
-						)
-						: date('y-m-d'),
-					'transaction_reference' => $this->getString(
-						$quote_data,
-						'payment.transaction_reference'
-					),
-					'amount' => $this->getFloat(
-						$quote_data,
-						'quote.amount'
-					),
-				],
-			];
-		} elseif (
-			isset($transformed['amount']) &&
-			isset($transformed['balance']) &&
-			$transformed['amount'] != $transformed['balance']
-		) {
-			$transformed['payments'] = [
-				[
-					'date' => isset($quote_data['payment.date'])
-						? date(
-							'Y-m-d',
-							strtotime($quote_data['payment.date'])
-						)
-						: date('y-m-d'),
-					'transaction_reference' => $this->getString(
-						$quote_data,
-						'payment.transaction_reference'
-					),
-					'amount' =>
-						$transformed['amount'] - $transformed['balance'],
-				],
-			];
-		}
+        if (isset($quote_data['payment.amount'])) {
+            $transformed['payments'] = [
+                [
+                    'date' => isset($quote_data['payment.date'])
+                        ? date(
+                            'Y-m-d',
+                            strtotime($quote_data['payment.date'])
+                        )
+                        : date('y-m-d'),
+                    'transaction_reference' => $this->getString(
+                        $quote_data,
+                        'payment.transaction_reference'
+                    ),
+                    'amount' => $this->getFloat(
+                        $quote_data,
+                        'payment.amount'
+                    ),
+                ],
+            ];
+        } elseif ($status === 'paid') {
+            $transformed['payments'] = [
+                [
+                    'date' => isset($quote_data['payment.date'])
+                        ? date(
+                            'Y-m-d',
+                            strtotime($quote_data['payment.date'])
+                        )
+                        : date('y-m-d'),
+                    'transaction_reference' => $this->getString(
+                        $quote_data,
+                        'payment.transaction_reference'
+                    ),
+                    'amount' => $this->getFloat(
+                        $quote_data,
+                        'quote.amount'
+                    ),
+                ],
+            ];
+        } elseif (
+            isset($transformed['amount']) &&
+            isset($transformed['balance']) &&
+            $transformed['amount'] != $transformed['balance']
+        ) {
+            $transformed['payments'] = [
+                [
+                    'date' => isset($quote_data['payment.date'])
+                        ? date(
+                            'Y-m-d',
+                            strtotime($quote_data['payment.date'])
+                        )
+                        : date('y-m-d'),
+                    'transaction_reference' => $this->getString(
+                        $quote_data,
+                        'payment.transaction_reference'
+                    ),
+                    'amount' => $transformed['amount'] - $transformed['balance'],
+                ],
+            ];
+        }
 
-		$line_items = [];
-		foreach ($line_items_data as $record) {
-			$line_items[] = [
-				'quantity' => $this->getFloat($record, 'item.quantity'),
-				'cost' => $this->getFloat($record, 'item.cost'),
-				'product_key' => $this->getString($record, 'item.product_key'),
-				'notes' => $this->getString($record, 'item.notes'),
-				'discount' => $this->getFloat($record, 'item.discount'),
-				'is_amount_discount' => filter_var(
-					$this->getString($record, 'item.is_amount_discount'),
-					FILTER_VALIDATE_BOOLEAN,
-					FILTER_NULL_ON_FAILURE
-				),
-				'tax_name1' => $this->getString($record, 'item.tax_name1'),
-				'tax_rate1' => $this->getFloat($record, 'item.tax_rate1'),
-				'tax_name2' => $this->getString($record, 'item.tax_name2'),
-				'tax_rate2' => $this->getFloat($record, 'item.tax_rate2'),
-				'tax_name3' => $this->getString($record, 'item.tax_name3'),
-				'tax_rate3' => $this->getFloat($record, 'item.tax_rate3'),
-				'custom_value1' => $this->getString(
-					$record,
-					'item.custom_value1'
-				),
-				'custom_value2' => $this->getString(
-					$record,
-					'item.custom_value2'
-				),
-				'custom_value3' => $this->getString(
-					$record,
-					'item.custom_value3'
-				),
-				'custom_value4' => $this->getString(
-					$record,
-					'item.custom_value4'
-				),
-				'type_id' => '1', //$this->getQuoteTypeId( $record, 'item.type_id' ),
-			];
-		}
-		$transformed['line_items'] = $line_items;
+        $line_items = [];
+        foreach ($line_items_data as $record) {
+            $line_items[] = [
+                'quantity' => $this->getFloat($record, 'item.quantity'),
+                'cost' => $this->getFloat($record, 'item.cost'),
+                'product_key' => $this->getString($record, 'item.product_key'),
+                'notes' => $this->getString($record, 'item.notes'),
+                'discount' => $this->getFloat($record, 'item.discount'),
+                'is_amount_discount' => filter_var(
+                    $this->getString($record, 'item.is_amount_discount'),
+                    FILTER_VALIDATE_BOOLEAN,
+                    FILTER_NULL_ON_FAILURE
+                ),
+                'tax_name1' => $this->getString($record, 'item.tax_name1'),
+                'tax_rate1' => $this->getFloat($record, 'item.tax_rate1'),
+                'tax_name2' => $this->getString($record, 'item.tax_name2'),
+                'tax_rate2' => $this->getFloat($record, 'item.tax_rate2'),
+                'tax_name3' => $this->getString($record, 'item.tax_name3'),
+                'tax_rate3' => $this->getFloat($record, 'item.tax_rate3'),
+                'custom_value1' => $this->getString(
+                    $record,
+                    'item.custom_value1'
+                ),
+                'custom_value2' => $this->getString(
+                    $record,
+                    'item.custom_value2'
+                ),
+                'custom_value3' => $this->getString(
+                    $record,
+                    'item.custom_value3'
+                ),
+                'custom_value4' => $this->getString(
+                    $record,
+                    'item.custom_value4'
+                ),
+                'type_id' => '1', //$this->getQuoteTypeId( $record, 'item.type_id' ),
+            ];
+        }
+        $transformed['line_items'] = $line_items;
 
-		return $transformed;
-	}
+        return $transformed;
+    }
 }
diff --git a/app/Import/Transformer/Csv/VendorTransformer.php b/app/Import/Transformer/Csv/VendorTransformer.php
index 4ae92e17bdc0..dcdec1f308a6 100644
--- a/app/Import/Transformer/Csv/VendorTransformer.php
+++ b/app/Import/Transformer/Csv/VendorTransformer.php
@@ -8,6 +8,7 @@
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace App\Import\Transformer\Csv;
 
 use App\Import\ImportException;
@@ -18,53 +19,53 @@ use App\Import\Transformer\BaseTransformer;
  */
 class VendorTransformer extends BaseTransformer
 {
-	/**
-	 * @param $data
-	 *
-	 * @return array|bool
-	 */
-	public function transform($data)
-	{
-		if (isset($data->name) && $this->hasVendor($data->name)) {
-			throw new ImportException('Vendor already exists');
-		}
+    /**
+     * @param $data
+     *
+     * @return array|bool
+     */
+    public function transform($data)
+    {
+        if (isset($data->name) && $this->hasVendor($data->name)) {
+            throw new ImportException('Vendor already exists');
+        }
 
-		return [
-			'company_id' => $this->company->id,
-			'name' => $this->getString($data, 'vendor.name'),
-			'phone' => $this->getString($data, 'vendor.phone'),
-			'id_number' => $this->getString($data, 'vendor.id_number'),
-			'vat_number' => $this->getString($data, 'vendor.vat_number'),
-			'website' => $this->getString($data, 'vendor.website'),
-			'currency_id' => $this->getCurrencyByCode(
-				$data,
-				'vendor.currency_id'
-			),
-			'public_notes' => $this->getString($data, 'vendor.public_notes'),
-			'private_notes' => $this->getString($data, 'vendor.private_notes'),
-			'address1' => $this->getString($data, 'vendor.address1'),
-			'address2' => $this->getString($data, 'vendor.address2'),
-			'city' => $this->getString($data, 'vendor.city'),
-			'state' => $this->getString($data, 'vendor.state'),
-			'postal_code' => $this->getString($data, 'vendor.postal_code'),
-			'custom_value1' => $this->getString($data, 'vendor.custom_value1'),
-			'custom_value2' => $this->getString($data, 'vendor.custom_value2'),
-			'custom_value3' => $this->getString($data, 'vendor.custom_value3'),
-			'custom_value4' => $this->getString($data, 'vendor.custom_value4'),
-			'vendor_contacts' => [
-				[
-					'first_name' => $this->getString(
-						$data,
-						'vendor.first_name'
-					),
-					'last_name' => $this->getString($data, 'vendor.last_name'),
-					'email' => $this->getString($data, 'vendor.email'),
-					'phone' => $this->getString($data, 'vendor.phone'),
-				],
-			],
-			'country_id' => isset($data['vendor.country_id'])
-				? $this->getCountryId($data['vendor.country_id'])
-				: null,
-		];
-	}
+        return [
+            'company_id' => $this->company->id,
+            'name' => $this->getString($data, 'vendor.name'),
+            'phone' => $this->getString($data, 'vendor.phone'),
+            'id_number' => $this->getString($data, 'vendor.id_number'),
+            'vat_number' => $this->getString($data, 'vendor.vat_number'),
+            'website' => $this->getString($data, 'vendor.website'),
+            'currency_id' => $this->getCurrencyByCode(
+                $data,
+                'vendor.currency_id'
+            ),
+            'public_notes' => $this->getString($data, 'vendor.public_notes'),
+            'private_notes' => $this->getString($data, 'vendor.private_notes'),
+            'address1' => $this->getString($data, 'vendor.address1'),
+            'address2' => $this->getString($data, 'vendor.address2'),
+            'city' => $this->getString($data, 'vendor.city'),
+            'state' => $this->getString($data, 'vendor.state'),
+            'postal_code' => $this->getString($data, 'vendor.postal_code'),
+            'custom_value1' => $this->getString($data, 'vendor.custom_value1'),
+            'custom_value2' => $this->getString($data, 'vendor.custom_value2'),
+            'custom_value3' => $this->getString($data, 'vendor.custom_value3'),
+            'custom_value4' => $this->getString($data, 'vendor.custom_value4'),
+            'vendor_contacts' => [
+                [
+                    'first_name' => $this->getString(
+                        $data,
+                        'vendor.first_name'
+                    ),
+                    'last_name' => $this->getString($data, 'vendor.last_name'),
+                    'email' => $this->getString($data, 'vendor.email'),
+                    'phone' => $this->getString($data, 'vendor.phone'),
+                ],
+            ],
+            'country_id' => isset($data['vendor.country_id'])
+                ? $this->getCountryId($data['vendor.country_id'])
+                : null,
+        ];
+    }
 }
diff --git a/app/Import/Transformer/Freshbooks/ClientTransformer.php b/app/Import/Transformer/Freshbooks/ClientTransformer.php
index 4738563c47dc..ff02b3bc8903 100644
--- a/app/Import/Transformer/Freshbooks/ClientTransformer.php
+++ b/app/Import/Transformer/Freshbooks/ClientTransformer.php
@@ -18,38 +18,40 @@ use Illuminate\Support\Str;
 /**
  * Class ClientTransformer.
  */
-class ClientTransformer extends BaseTransformer {
-	/**
-	 * @param $data
-	 *
-	 * @return array|bool
-	 */
-	public function transform( $data ) {
-		if ( isset( $data['Organization'] ) && $this->hasClient( $data['Organization'] ) ) {
-			throw new ImportException('Client already exists');
-		}
+class ClientTransformer extends BaseTransformer
+{
+    /**
+     * @param $data
+     *
+     * @return array|bool
+     */
+    public function transform($data)
+    {
+        if (isset($data['Organization']) && $this->hasClient($data['Organization'])) {
+            throw new ImportException('Client already exists');
+        }
 
-		return [
-			'company_id'     => $this->company->id,
-			'name'           => $this->getString( $data, 'Organization' ),
-			'phone'     => $this->getString( $data, 'Phone' ),
-			'address1'       => $this->getString( $data, 'Street' ),
-			'city'           => $this->getString( $data, 'City' ),
-			'state'          => $this->getString( $data, 'Province/State' ),
-			'postal_code'    => $this->getString( $data, 'Postal Code' ),
-			'country_id'     => isset( $data['Country'] ) ? $this->getCountryId( $data['Country'] ) : null,
-			'private_notes'   => $this->getString( $data, 'Notes' ),
-			'credit_balance' => 0,
-			'settings'       => new \stdClass,
-			'client_hash'    => Str::random( 40 ),
-			'contacts'       => [
-				[
-					'first_name'    => $this->getString( $data, 'First Name' ),
-					'last_name'     => $this->getString( $data, 'Last Name' ),
-					'email'         => $this->getString( $data, 'Email' ),
-					'phone'         => $this->getString( $data, 'Phone' ),
-				],
-			],
-		];
-	}
+        return [
+            'company_id'     => $this->company->id,
+            'name'           => $this->getString($data, 'Organization'),
+            'phone'     => $this->getString($data, 'Phone'),
+            'address1'       => $this->getString($data, 'Street'),
+            'city'           => $this->getString($data, 'City'),
+            'state'          => $this->getString($data, 'Province/State'),
+            'postal_code'    => $this->getString($data, 'Postal Code'),
+            'country_id'     => isset($data['Country']) ? $this->getCountryId($data['Country']) : null,
+            'private_notes'   => $this->getString($data, 'Notes'),
+            'credit_balance' => 0,
+            'settings'       => new \stdClass,
+            'client_hash'    => Str::random(40),
+            'contacts'       => [
+                [
+                    'first_name'    => $this->getString($data, 'First Name'),
+                    'last_name'     => $this->getString($data, 'Last Name'),
+                    'email'         => $this->getString($data, 'Email'),
+                    'phone'         => $this->getString($data, 'Phone'),
+                ],
+            ],
+        ];
+    }
 }
diff --git a/app/Import/Transformer/Freshbooks/InvoiceTransformer.php b/app/Import/Transformer/Freshbooks/InvoiceTransformer.php
index 8870680c32f8..d974e91626ac 100644
--- a/app/Import/Transformer/Freshbooks/InvoiceTransformer.php
+++ b/app/Import/Transformer/Freshbooks/InvoiceTransformer.php
@@ -19,68 +19,69 @@ use App\Utils\Number;
 /**
  * Class InvoiceTransformer.
  */
-class InvoiceTransformer extends BaseTransformer {
-	/**
-	 * @param $line_items_data
-	 *
-	 * @return bool|array
-	 */
-	public function transform( $line_items_data ) {
-		$invoice_data = reset( $line_items_data );
+class InvoiceTransformer extends BaseTransformer
+{
+    /**
+     * @param $line_items_data
+     *
+     * @return bool|array
+     */
+    public function transform($line_items_data)
+    {
+        $invoice_data = reset($line_items_data);
 
-		if ( $this->hasInvoice( $invoice_data['Invoice #'] ) ) {
-			throw new ImportException( 'Invoice number already exists' );
-		}
+        if ($this->hasInvoice($invoice_data['Invoice #'])) {
+            throw new ImportException('Invoice number already exists');
+        }
 
-		$invoiceStatusMap = [
-			'sent'  => Invoice::STATUS_SENT,
-			'draft' => Invoice::STATUS_DRAFT,
-		];
+        $invoiceStatusMap = [
+            'sent'  => Invoice::STATUS_SENT,
+            'draft' => Invoice::STATUS_DRAFT,
+        ];
 
-		$transformed = [
-			'company_id'  => $this->company->id,
-			'client_id'   => $this->getClient( $this->getString( $invoice_data, 'Client Name' ), null ),
-			'number'      => $this->getString( $invoice_data, 'Invoice #' ),
-			'date'        => isset( $invoice_data['Date Issued'] ) ? date( 'Y-m-d', strtotime( $invoice_data['Date Issued'] ) ) : null,
-			// 'currency_id' => $this->getCurrencyByCode( $invoice_data, 'Currency' ),
-			'amount'      => 0,
-			'status_id'   => $invoiceStatusMap[ $status =
-					strtolower( $this->getString( $invoice_data, 'Invoice Status' ) ) ] ?? Invoice::STATUS_SENT,
-			// 'viewed'      => $status === 'viewed',
-		];
+        $transformed = [
+            'company_id'  => $this->company->id,
+            'client_id'   => $this->getClient($this->getString($invoice_data, 'Client Name'), null),
+            'number'      => $this->getString($invoice_data, 'Invoice #'),
+            'date'        => isset($invoice_data['Date Issued']) ? date('Y-m-d', strtotime($invoice_data['Date Issued'])) : null,
+            // 'currency_id' => $this->getCurrencyByCode( $invoice_data, 'Currency' ),
+            'amount'      => 0,
+            'status_id'   => $invoiceStatusMap[$status =
+                    strtolower($this->getString($invoice_data, 'Invoice Status'))] ?? Invoice::STATUS_SENT,
+            // 'viewed'      => $status === 'viewed',
+        ];
 
-		$line_items = [];
-		foreach ( $line_items_data as $record ) {
-			$line_items[]          = [
-				'product_key'        => $this->getString( $record, 'Item Name' ),
-				'notes'              => $this->getString( $record, 'Item Description' ),
-				'cost'               => $this->getFreshbookQuantityFloat( $record, 'Rate' ),
-				'quantity'           => $this->getFreshbookQuantityFloat( $record, 'Quantity' ),
-				'discount'           => $this->getFreshbookQuantityFloat( $record, 'Discount Percentage' ),
-				'is_amount_discount' => false,
-				'tax_name1'          => $this->getString( $record, 'Tax 1 Type' ),
-				'tax_rate1'          => $this->getFreshbookQuantityFloat( $record, 'Tax 1 Amount' ),
-				'tax_name2'          => $this->getString( $record, 'Tax 2 Type' ),
-				'tax_rate2'          => $this->getFreshbookQuantityFloat( $record, 'Tax 2 Amount' ),
-			];
-			$transformed['amount'] += $this->getFreshbookQuantityFloat( $record, 'Line Total' );
-		}
-		$transformed['line_items'] = $line_items;
+        $line_items = [];
+        foreach ($line_items_data as $record) {
+            $line_items[] = [
+                'product_key'        => $this->getString($record, 'Item Name'),
+                'notes'              => $this->getString($record, 'Item Description'),
+                'cost'               => $this->getFreshbookQuantityFloat($record, 'Rate'),
+                'quantity'           => $this->getFreshbookQuantityFloat($record, 'Quantity'),
+                'discount'           => $this->getFreshbookQuantityFloat($record, 'Discount Percentage'),
+                'is_amount_discount' => false,
+                'tax_name1'          => $this->getString($record, 'Tax 1 Type'),
+                'tax_rate1'          => $this->getFreshbookQuantityFloat($record, 'Tax 1 Amount'),
+                'tax_name2'          => $this->getString($record, 'Tax 2 Type'),
+                'tax_rate2'          => $this->getFreshbookQuantityFloat($record, 'Tax 2 Amount'),
+            ];
+            $transformed['amount'] += $this->getFreshbookQuantityFloat($record, 'Line Total');
+        }
+        $transformed['line_items'] = $line_items;
 
-		if ( ! empty( $invoice_data['Date Paid'] ) ) {
-			$transformed['payments'] = [[
-				'date'   => date( 'Y-m-d', strtotime( $invoice_data['Date Paid'] ) ),
-				'amount' => $transformed['amount'],
-			]];
-		}
+        if (! empty($invoice_data['Date Paid'])) {
+            $transformed['payments'] = [[
+                'date'   => date('Y-m-d', strtotime($invoice_data['Date Paid'])),
+                'amount' => $transformed['amount'],
+            ]];
+        }
 
-		return $transformed;
-	}
-
-	/** @return float  */
-	public function getFreshbookQuantityFloat($data, $field)
-	{
-		return $data[$field];
-	}
+        return $transformed;
+    }
 
+    /** @return float  */
+    public function getFreshbookQuantityFloat($data, $field)
+    {
+        return $data[$field];
+    }
 }
diff --git a/app/Import/Transformer/Invoice2Go/InvoiceTransformer.php b/app/Import/Transformer/Invoice2Go/InvoiceTransformer.php
index a0b765a0f097..6d52257d6a6c 100644
--- a/app/Import/Transformer/Invoice2Go/InvoiceTransformer.php
+++ b/app/Import/Transformer/Invoice2Go/InvoiceTransformer.php
@@ -19,76 +19,76 @@ use Illuminate\Support\Str;
 /**
  * Class InvoiceTransformer.
  */
-class InvoiceTransformer extends BaseTransformer {
-	/**
-	 * @param $line_items_data
-	 *
-	 * @return bool|array
-	 */
-	public function transform( $invoice_data ) {
+class InvoiceTransformer extends BaseTransformer
+{
+    /**
+     * @param $line_items_data
+     *
+     * @return bool|array
+     */
+    public function transform($invoice_data)
+    {
+        if ($this->hasInvoice($invoice_data['DocumentNumber'])) {
+            throw new ImportException('Invoice number already exists');
+        }
 
-		if ( $this->hasInvoice( $invoice_data['DocumentNumber'] ) ) {
-			throw new ImportException( 'Invoice number already exists' );
-		}
+        $invoiceStatusMap = [
+            'unsent' => Invoice::STATUS_DRAFT,
+            'sent'   => Invoice::STATUS_SENT,
+        ];
 
-		$invoiceStatusMap = [
-			'unsent' => Invoice::STATUS_DRAFT,
-			'sent'   => Invoice::STATUS_SENT,
-		];
+        $transformed = [
+            'company_id'  => $this->company->id,
+            'number'      => $this->getString($invoice_data, 'DocumentNumber'),
+            'notes'       => $this->getString($invoice_data, 'Comment'),
+            'date'        => isset($invoice_data['DocumentDate']) ? date('Y-m-d', strtotime($invoice_data['DocumentDate'])) : null,
+            // 'currency_id' => $this->getCurrencyByCode( $invoice_data, 'Currency' ),
+            'amount'      => $this->getFloat($invoice_data, 'TotalAmount'),
+            'status_id'   => $invoiceStatusMap[$status =
+                    strtolower($this->getString($invoice_data, 'DocumentStatus'))] ?? Invoice::STATUS_SENT,
+            // 'viewed'      => $status === 'viewed',
+            'line_items'  => [
+                [
+                    'cost'             	  => $this->getFloat($invoice_data, 'TotalAmount'),
+                    'quantity'           => 1,
+                    'discount'           => $this->getFloat($invoice_data, 'DiscountValue'),
+                    'is_amount_discount' => false,
+                ],
+            ],
+        ];
 
-		$transformed = [
-			'company_id'  => $this->company->id,
-			'number'      => $this->getString( $invoice_data, 'DocumentNumber' ),
-			'notes'       => $this->getString( $invoice_data, 'Comment' ),
-			'date'        => isset( $invoice_data['DocumentDate'] ) ? date( 'Y-m-d', strtotime( $invoice_data['DocumentDate'] ) ) : null,
-			// 'currency_id' => $this->getCurrencyByCode( $invoice_data, 'Currency' ),
-			'amount'      => $this->getFloat( $invoice_data, 'TotalAmount' ),
-			'status_id'   => $invoiceStatusMap[ $status =
-					strtolower( $this->getString( $invoice_data, 'DocumentStatus' ) ) ] ?? Invoice::STATUS_SENT,
-			// 'viewed'      => $status === 'viewed',
-			'line_items'  => [
-				[
-					'cost'             	  => $this->getFloat( $invoice_data, 'TotalAmount' ),
-					'quantity'           => 1,
-					'discount'           => $this->getFloat( $invoice_data, 'DiscountValue' ),
-					'is_amount_discount' => false,
-				],
-			],
-		];
+        $client_id =
+            $this->getClient($this->getString($invoice_data, 'Name'), $this->getString($invoice_data, 'EmailRecipient'));
 
-		$client_id =
-			$this->getClient( $this->getString( $invoice_data, 'Name' ), $this->getString( $invoice_data, 'EmailRecipient' ) );
+        if ($client_id) {
+            $transformed['client_id'] = $client_id;
+        } else {
+            $settings = new \stdClass;
+            $settings->currency_id = $this->getCurrencyByCode($invoice_data, 'Currency');
 
-		if ( $client_id ) {
-			$transformed['client_id'] = $client_id;
-		} else {
+            $transformed['client'] = [
+                'name'              => $this->getString($invoice_data, 'Name'),
+                'address1'          => $this->getString($invoice_data, 'DocumentRecipientAddress'),
+                'shipping_address1' => $this->getString($invoice_data, 'ShipAddress'),
+                'credit_balance'    => 0,
+                'settings'          => $settings,
+                'client_hash'       => Str::random(40),
+                'contacts'          => [
+                    [
+                        'email' => $this->getString($invoice_data, 'EmailRecipient'),
+                    ],
+                ],
+            ];
+        }
+        if (! empty($invoice_data['Date Paid'])) {
+            $transformed['payments'] = [
+                [
+                    'date'   => date('Y-m-d', strtotime($invoice_data['DatePaid'])),
+                    'amount' => $this->getFloat($invoice_data, 'Payments'),
+                ],
+            ];
+        }
 
-			$settings = new \stdClass;
-			$settings->currency_id = $this->getCurrencyByCode( $invoice_data, 'Currency' );
-
-			$transformed['client'] = [
-				'name'              => $this->getString( $invoice_data, 'Name' ),
-				'address1'          => $this->getString( $invoice_data, 'DocumentRecipientAddress' ),
-				'shipping_address1' => $this->getString( $invoice_data, 'ShipAddress' ),
-				'credit_balance'    => 0,
-				'settings'          => $settings,
-				'client_hash'       => Str::random( 40 ),
-				'contacts'          => [
-					[
-						'email' => $this->getString( $invoice_data, 'EmailRecipient' ),
-					],
-				],
-			];
-		}
-		if ( ! empty( $invoice_data['Date Paid'] ) ) {
-			$transformed['payments'] = [
-				[
-					'date'   => date( 'Y-m-d', strtotime( $invoice_data['DatePaid'] ) ),
-					'amount' => $this->getFloat( $invoice_data, 'Payments' ),
-				],
-			];
-		}
-
-		return $transformed;
-	}
+        return $transformed;
+    }
 }
diff --git a/app/Import/Transformer/Invoicely/ClientTransformer.php b/app/Import/Transformer/Invoicely/ClientTransformer.php
index 386dc670a882..4ec5b711f0e7 100644
--- a/app/Import/Transformer/Invoicely/ClientTransformer.php
+++ b/app/Import/Transformer/Invoicely/ClientTransformer.php
@@ -18,33 +18,35 @@ use Illuminate\Support\Str;
 /**
  * Class ClientTransformer.
  */
-class ClientTransformer extends BaseTransformer {
-	/**
-	 * @param $data
-	 *
-	 * @return array|bool
-	 */
-	public function transform( $data ) {
-		if ( isset( $data['Client Name'] ) && $this->hasClient( $data['Client Name'] ) ) {
-			throw new ImportException('Client already exists');
-		}
+class ClientTransformer extends BaseTransformer
+{
+    /**
+     * @param $data
+     *
+     * @return array|bool
+     */
+    public function transform($data)
+    {
+        if (isset($data['Client Name']) && $this->hasClient($data['Client Name'])) {
+            throw new ImportException('Client already exists');
+        }
 
-		$transformed = [
-			'company_id'     => $this->company->id,
-			'name'           => $this->getString( $data, 'Client Name' ),
-			'phone'     => $this->getString( $data, 'Phone' ),
-			'country_id'     => isset( $data['Country'] ) ? $this->getCountryIdBy2( $data['Country'] ) : null,
-			'credit_balance' => 0,
-			'settings'       => new \stdClass,
-			'client_hash'    => Str::random( 40 ),
-			'contacts'       => [
-				[
-					'email'         => $this->getString( $data, 'Email' ),
-					'phone'         => $this->getString( $data, 'Phone' ),
-				],
-			],
-		];
+        $transformed = [
+            'company_id'     => $this->company->id,
+            'name'           => $this->getString($data, 'Client Name'),
+            'phone'     => $this->getString($data, 'Phone'),
+            'country_id'     => isset($data['Country']) ? $this->getCountryIdBy2($data['Country']) : null,
+            'credit_balance' => 0,
+            'settings'       => new \stdClass,
+            'client_hash'    => Str::random(40),
+            'contacts'       => [
+                [
+                    'email'         => $this->getString($data, 'Email'),
+                    'phone'         => $this->getString($data, 'Phone'),
+                ],
+            ],
+        ];
 
-		return $transformed;
-	}
+        return $transformed;
+    }
 }
diff --git a/app/Import/Transformer/Invoicely/InvoiceTransformer.php b/app/Import/Transformer/Invoicely/InvoiceTransformer.php
index 6a936968b6b7..857a349e1f68 100644
--- a/app/Import/Transformer/Invoicely/InvoiceTransformer.php
+++ b/app/Import/Transformer/Invoicely/InvoiceTransformer.php
@@ -18,41 +18,43 @@ use App\Models\Invoice;
 /**
  * Class InvoiceTransformer.
  */
-class InvoiceTransformer extends BaseTransformer {
-	/**
-	 * @param $data
-	 *
-	 * @return bool|array
-	 */
-	public function transform( $data ) {
-		if ( $this->hasInvoice( $data['Details'] ) ) {
-			throw new ImportException( 'Invoice number already exists' );
-		}
+class InvoiceTransformer extends BaseTransformer
+{
+    /**
+     * @param $data
+     *
+     * @return bool|array
+     */
+    public function transform($data)
+    {
+        if ($this->hasInvoice($data['Details'])) {
+            throw new ImportException('Invoice number already exists');
+        }
 
-		$transformed = [
-			'company_id' => $this->company->id,
-			'client_id'  => $this->getClient( $this->getString( $data, 'Client' ), null ),
-			'number'     => $this->getString( $data, 'Details' ),
-			'date'       => isset( $data['Date'] ) ? date( 'Y-m-d', strtotime( $data['Date'] ) ) : null,
-			'due_date'   => isset( $data['Due'] ) ? date( 'Y-m-d', strtotime( $data['Due'] ) ) : null,
-			'status_id'  => Invoice::STATUS_SENT,
-			'line_items' => [
-				[
-					'cost'     => $amount = $this->getFloat( $data, 'Total' ),
-					'quantity' => 1,
-				],
-			],
-		];
+        $transformed = [
+            'company_id' => $this->company->id,
+            'client_id'  => $this->getClient($this->getString($data, 'Client'), null),
+            'number'     => $this->getString($data, 'Details'),
+            'date'       => isset($data['Date']) ? date('Y-m-d', strtotime($data['Date'])) : null,
+            'due_date'   => isset($data['Due']) ? date('Y-m-d', strtotime($data['Due'])) : null,
+            'status_id'  => Invoice::STATUS_SENT,
+            'line_items' => [
+                [
+                    'cost'     => $amount = $this->getFloat($data, 'Total'),
+                    'quantity' => 1,
+                ],
+            ],
+        ];
 
-		if ( strtolower( $data['Status'] ) === 'paid' ) {
-			$transformed['payments'] = [
-				[
-					'date'   => date( 'Y-m-d' ),
-					'amount' => $amount,
-				],
-			];
-		}
+        if (strtolower($data['Status']) === 'paid') {
+            $transformed['payments'] = [
+                [
+                    'date'   => date('Y-m-d'),
+                    'amount' => $amount,
+                ],
+            ];
+        }
 
-		return $transformed;
-	}
+        return $transformed;
+    }
 }
diff --git a/app/Import/Transformer/Wave/ClientTransformer.php b/app/Import/Transformer/Wave/ClientTransformer.php
index 436f758d5708..c5681e411152 100644
--- a/app/Import/Transformer/Wave/ClientTransformer.php
+++ b/app/Import/Transformer/Wave/ClientTransformer.php
@@ -18,57 +18,58 @@ use Illuminate\Support\Str;
 /**
  * Class ClientTransformer.
  */
-class ClientTransformer extends BaseTransformer {
-	/**
-	 * @param $data
-	 *
-	 * @return array|bool
-	 */
-	public function transform( $data ) {
-		if ( isset( $data['customer_name'] ) && $this->hasClient( $data['customer_name'] ) ) {
-			throw new ImportException('Client already exists');
-		}
+class ClientTransformer extends BaseTransformer
+{
+    /**
+     * @param $data
+     *
+     * @return array|bool
+     */
+    public function transform($data)
+    {
+        if (isset($data['customer_name']) && $this->hasClient($data['customer_name'])) {
+            throw new ImportException('Client already exists');
+        }
 
-		$settings              = new \stdClass;
-		$settings->currency_id = (string) $this->getCurrencyByCode( $data, 'customer_currency' );
+        $settings = new \stdClass;
+        $settings->currency_id = (string) $this->getCurrencyByCode($data, 'customer_currency');
 
-		if ( strval( $data['Payment Terms'] ?? '' ) > 0 ) {
-			$settings->payment_terms = $data['Payment Terms'];
-		}
+        if (strval($data['Payment Terms'] ?? '') > 0) {
+            $settings->payment_terms = $data['Payment Terms'];
+        }
 
-		return [
-			'company_id'     => $this->company->id,
-			'name'           => $this->getString( $data, 'customer_name' ),
-			'number'         => $this->getValueOrNull( $data, 'account_number' ),
-			'work_phone'     => $this->getString( $data, 'phone' ),
-			'website'     	 => $this->getString( $data, 'website' ),
-			'country_id'     => !empty( $data['country'] ) ? $this->getCountryId( $data['country'] ) : null,
-			'state'          => $this->getString( $data, 'province/state' ),
-			'address1'       => $this->getString( $data, 'address_line_1' ),
-			'address2'       => $this->getString( $data, 'address_line_2' ),
-			'city'           => $this->getString( $data, 'city' ),
-			'postal_code'    => $this->getString( $data, 'postal_code/zip_code' ),
+        return [
+            'company_id'     => $this->company->id,
+            'name'           => $this->getString($data, 'customer_name'),
+            'number'         => $this->getValueOrNull($data, 'account_number'),
+            'work_phone'     => $this->getString($data, 'phone'),
+            'website'     	 => $this->getString($data, 'website'),
+            'country_id'     => ! empty($data['country']) ? $this->getCountryId($data['country']) : null,
+            'state'          => $this->getString($data, 'province/state'),
+            'address1'       => $this->getString($data, 'address_line_1'),
+            'address2'       => $this->getString($data, 'address_line_2'),
+            'city'           => $this->getString($data, 'city'),
+            'postal_code'    => $this->getString($data, 'postal_code/zip_code'),
 
+            'shipping_country_id'     => ! empty($data['ship-to_country']) ? $this->getCountryId($data['country']) : null,
+            'shipping_state'          => $this->getString($data, 'ship-to_province/state'),
+            'shipping_address1'       => $this->getString($data, 'ship-to_address_line_1'),
+            'shipping_address2'       => $this->getString($data, 'ship-to_address_line_2'),
+            'shipping_city'           => $this->getString($data, 'ship-to_city'),
+            'shipping_postal_code'    => $this->getString($data, 'ship-to_postal_code/zip_code'),
+            'public_notes'    		  => $this->getString($data, 'delivery_instructions'),
 
-			'shipping_country_id'     => !empty( $data['ship-to_country'] ) ? $this->getCountryId( $data['country'] ) : null,
-			'shipping_state'          => $this->getString( $data, 'ship-to_province/state' ),
-			'shipping_address1'       => $this->getString( $data, 'ship-to_address_line_1' ),
-			'shipping_address2'       => $this->getString( $data, 'ship-to_address_line_2' ),
-			'shipping_city'           => $this->getString( $data, 'ship-to_city' ),
-			'shipping_postal_code'    => $this->getString( $data, 'ship-to_postal_code/zip_code' ),
-			'public_notes'    		  => $this->getString( $data, 'delivery_instructions' ),
-
-			'credit_balance' => 0,
-			'settings'       =>$settings,
-			'client_hash'    => Str::random( 40 ),
-			'contacts'       => [
-				[
-					'first_name'    => $this->getString( $data, 'contact_first_name' ),
-					'last_name'     => $this->getString( $data, 'contact_last_name' ),
-					'email'         => $this->getString( $data, 'email' ),
-					'phone'         => $this->getString( $data, 'phone' ),
-				],
-			],
-		];
-	}
-}
\ No newline at end of file
+            'credit_balance' => 0,
+            'settings'       =>$settings,
+            'client_hash'    => Str::random(40),
+            'contacts'       => [
+                [
+                    'first_name'    => $this->getString($data, 'contact_first_name'),
+                    'last_name'     => $this->getString($data, 'contact_last_name'),
+                    'email'         => $this->getString($data, 'email'),
+                    'phone'         => $this->getString($data, 'phone'),
+                ],
+            ],
+        ];
+    }
+}
diff --git a/app/Import/Transformer/Wave/ExpenseTransformer.php b/app/Import/Transformer/Wave/ExpenseTransformer.php
index afaa693d0acc..db7a3e2671fc 100644
--- a/app/Import/Transformer/Wave/ExpenseTransformer.php
+++ b/app/Import/Transformer/Wave/ExpenseTransformer.php
@@ -14,53 +14,44 @@ namespace App\Import\Transformer\Wave;
 use App\Import\ImportException;
 use App\Import\Transformer\BaseTransformer;
 
-
 /**
  * Class ExpenseTransformer.
  */
-class ExpenseTransformer extends BaseTransformer {
-	/**
-	 * @param $line_items_data
-	 *
-	 * @return bool|array
-	 */
-	public function transform( $line_items_data ) 
-	{
+class ExpenseTransformer extends BaseTransformer
+{
+    /**
+     * @param $line_items_data
+     *
+     * @return bool|array
+     */
+    public function transform($line_items_data)
+    {
+        $data = $line_items_data[0];
 
-		$data = $line_items_data[0];
+        $amount = 0;
+        $total_tax = 0;
+        $tax_rate = 0;
 
-		$amount = 0;
-		$total_tax = 0;
-		$tax_rate = 0;
+        foreach ($line_items_data as $record) {
+            $amount += floatval($record['Amount (One column)']);
+            $total_tax += floatval($record['Sales Tax Amount']);
+        }
 
+        $tax_rate = round(($total_tax / $amount) * 100, 3);
 
-			foreach ( $line_items_data as $record ) 
-			{
+        $transformed = [
+            'company_id'  => $this->company->id,
+            'vendor_id'   => $this->getVendorIdOrCreate($this->getString($data, 'Vendor')),
+            'number' 	  => $this->getString($data, 'Bill Number'),
+            'public_notes'=> $this->getString($data, 'Notes / Memo'),
+            'date'        => date('Y-m-d', strtotime($data['Transaction Date Added'])) ?: now()->format('Y-m-d'), //27-01-2022
+            'currency_id' => $this->company->settings->currency_id,
+            'category_id' => $this->getOrCreateExpenseCategry($data['Account Name']),
+            'amount'	  => $amount,
+            'tax_name1'   => $data['Sales Tax Name'],
+            'tax_rate1'	  => $tax_rate,
+        ];
 
-				$amount += floatval($record['Amount (One column)']);
-				$total_tax += floatval($record['Sales Tax Amount']);
-
-			}
-
-		
-
-		$tax_rate = round(($total_tax/$amount)*100,3);
-
-		$transformed = [
-			'company_id'  => $this->company->id,
-			'vendor_id'   => $this->getVendorIdOrCreate($this->getString($data, 'Vendor')),
-			'number' 	  => $this->getString($data, 'Bill Number'),
-			'public_notes'=> $this->getString($data, 'Notes / Memo'),
-			'date'        => date( 'Y-m-d', strtotime( $data['Transaction Date Added'] ) ) ?: now()->format('Y-m-d'), //27-01-2022
-			'currency_id' => $this->company->settings->currency_id,
-			'category_id' => $this->getOrCreateExpenseCategry($data['Account Name']),
-			'amount'	  => $amount,
-			'tax_name1'   => $data['Sales Tax Name'],
-			'tax_rate1'	  => $tax_rate,
-		];
-
-		return $transformed;
-	}
+        return $transformed;
+    }
 }
-
-
diff --git a/app/Import/Transformer/Wave/InvoiceTransformer.php b/app/Import/Transformer/Wave/InvoiceTransformer.php
index cad4014c2a1d..f91265f8511d 100644
--- a/app/Import/Transformer/Wave/InvoiceTransformer.php
+++ b/app/Import/Transformer/Wave/InvoiceTransformer.php
@@ -18,98 +18,101 @@ use App\Models\Invoice;
 /**
  * Class InvoiceTransformer.
  */
-class InvoiceTransformer extends BaseTransformer {
-	/**
-	 * @param $line_items_data
-	 *
-	 * @return bool|array
-	 */
-	public function transform( $line_items_data ) {
-		$invoice_data = reset( $line_items_data );
+class InvoiceTransformer extends BaseTransformer
+{
+    /**
+     * @param $line_items_data
+     *
+     * @return bool|array
+     */
+    public function transform($line_items_data)
+    {
+        $invoice_data = reset($line_items_data);
 
-		if ( $this->hasInvoice( $invoice_data['Invoice Number'] ) ) {
-			throw new ImportException( 'Invoice number already exists' );
-		}
+        if ($this->hasInvoice($invoice_data['Invoice Number'])) {
+            throw new ImportException('Invoice number already exists');
+        }
 
-		if(array_key_exists('Invoice Date', $invoice_data))
-			$date_key = 'Invoice Date';
-		else
-			$date_key = 'Transaction Date';
+        if (array_key_exists('Invoice Date', $invoice_data)) {
+            $date_key = 'Invoice Date';
+        } else {
+            $date_key = 'Transaction Date';
+        }
 
-		if(array_key_exists('Customer Name', $invoice_data))
-			$customer_key = 'Customer Name';
-		else
-			$customer_key = 'Customer';
+        if (array_key_exists('Customer Name', $invoice_data)) {
+            $customer_key = 'Customer Name';
+        } else {
+            $customer_key = 'Customer';
+        }
 
-		$transformed = [
-			'company_id'  => $this->company->id,
-			'client_id'   => $this->getClient( $customer_name = $this->getString( $invoice_data, $customer_key ), null ),
-			'number'      => $invoice_number = $this->getString( $invoice_data, 'Invoice Number' ),
-			'date'        => date( 'Y-m-d', strtotime( $invoice_data[$date_key] ) ) ?: now()->format('Y-m-d'), //27-01-2022
-			'currency_id' => $this->getCurrencyByCode( $invoice_data, 'Currency' ),
-			'status_id'   => Invoice::STATUS_SENT,
-			'due_date'	  => array_key_exists('Due Date', $invoice_data) ? date( 'Y-m-d', strtotime( $invoice_data['Due Date'] ) ) : null,
-		];
+        $transformed = [
+            'company_id'  => $this->company->id,
+            'client_id'   => $this->getClient($customer_name = $this->getString($invoice_data, $customer_key), null),
+            'number'      => $invoice_number = $this->getString($invoice_data, 'Invoice Number'),
+            'date'        => date('Y-m-d', strtotime($invoice_data[$date_key])) ?: now()->format('Y-m-d'), //27-01-2022
+            'currency_id' => $this->getCurrencyByCode($invoice_data, 'Currency'),
+            'status_id'   => Invoice::STATUS_SENT,
+            'due_date'	  => array_key_exists('Due Date', $invoice_data) ? date('Y-m-d', strtotime($invoice_data['Due Date'])) : null,
+        ];
 
-		$line_items = [];
-		$payments   = [];
-		foreach ( $line_items_data as $record ) {
-			if (array_key_exists('Account Type', $record) && $record['Account Type'] === 'Income' ) {
-				$description = $this->getString( $record, 'Transaction Line Description' );
+        $line_items = [];
+        $payments = [];
+        foreach ($line_items_data as $record) {
+            if (array_key_exists('Account Type', $record) && $record['Account Type'] === 'Income') {
+                $description = $this->getString($record, 'Transaction Line Description');
 
-				// Remove duplicate data from description
-				if ( substr( $description, 0, strlen( $customer_name ) + 3 ) === $customer_name . ' - ' ) {
-					$description = substr( $description, strlen( $customer_name ) + 3 );
-				}
+                // Remove duplicate data from description
+                if (substr($description, 0, strlen($customer_name) + 3) === $customer_name.' - ') {
+                    $description = substr($description, strlen($customer_name) + 3);
+                }
 
-				if ( substr( $description, 0, strlen( $invoice_number ) + 3 ) === $invoice_number . ' - ' ) {
-					$description = substr( $description, strlen( $invoice_number ) + 3 );
-				}
+                if (substr($description, 0, strlen($invoice_number) + 3) === $invoice_number.' - ') {
+                    $description = substr($description, strlen($invoice_number) + 3);
+                }
 
-				$line_items[] = [
-					'notes'     => $description,
-					'cost'      => $this->getFloat( $record, 'Amount Before Sales Tax' ),
-					'tax_name1' => $this->getString( $record, 'Sales Tax Name' ),
-					'tax_rate1' => $this->getFloat( $record, 'Sales Tax Amount' ),
+                $line_items[] = [
+                    'notes'     => $description,
+                    'cost'      => $this->getFloat($record, 'Amount Before Sales Tax'),
+                    'tax_name1' => $this->getString($record, 'Sales Tax Name'),
+                    'tax_rate1' => $this->getFloat($record, 'Sales Tax Amount'),
 
-					'quantity' => 1,
-				];
-			} elseif (array_key_exists('Account Type', $record) && $record['Account Type'] === 'System Receivable Invoice' ) {
-				// This is a payment
-				$payments[] = [
-					'date'   => date( 'Y-m-d', strtotime( $invoice_data[$date_key] ) ),
-					'amount' => $this->getFloat( $record, 'Amount (One column)' ),
-				];
-			}
-			else {
-				//could be a generate invoices.csv file
+                    'quantity' => 1,
+                ];
+            } elseif (array_key_exists('Account Type', $record) && $record['Account Type'] === 'System Receivable Invoice') {
+                // This is a payment
+                $payments[] = [
+                    'date'   => date('Y-m-d', strtotime($invoice_data[$date_key])),
+                    'amount' => $this->getFloat($record, 'Amount (One column)'),
+                ];
+            } else {
+                //could be a generate invoices.csv file
 
-				$calculated_tax_rate = 0;
-				
-				if($this->getFloat( $record, 'Invoice Tax Total' ) != 0 && $this->getFloat( $record, 'Invoice Total' ) != 0)
-					$calculated_tax_rate = round($this->getFloat( $record, 'Invoice Tax Total' ) / $this->getFloat( $record, 'Invoice Total' ) * 100,2);
+                $calculated_tax_rate = 0;
 
-				$line_items[] = [
-					'notes'     => 'Imported Invoice',
-					'cost'      => $this->getFloat( $record, 'Invoice Total' ),
-					'tax_name1' => 'Tax',
-					'tax_rate1' => $calculated_tax_rate,
-					'quantity' => 1,
-				];
+                if ($this->getFloat($record, 'Invoice Tax Total') != 0 && $this->getFloat($record, 'Invoice Total') != 0) {
+                    $calculated_tax_rate = round($this->getFloat($record, 'Invoice Tax Total') / $this->getFloat($record, 'Invoice Total') * 100, 2);
+                }
 
-				if(array_key_exists('Invoice Paid', $record) && $record['Invoice Paid'] > 0){
-					$payments[] = [
-						'date'   => date( 'Y-m-d', strtotime( $record['Last Payment Date'] ) ),
-						'amount' => $this->getFloat( $record, 'Invoice Paid' ),
-					];
-				} 
+                $line_items[] = [
+                    'notes'     => 'Imported Invoice',
+                    'cost'      => $this->getFloat($record, 'Invoice Total'),
+                    'tax_name1' => 'Tax',
+                    'tax_rate1' => $calculated_tax_rate,
+                    'quantity' => 1,
+                ];
 
-			}
-		}
+                if (array_key_exists('Invoice Paid', $record) && $record['Invoice Paid'] > 0) {
+                    $payments[] = [
+                        'date'   => date('Y-m-d', strtotime($record['Last Payment Date'])),
+                        'amount' => $this->getFloat($record, 'Invoice Paid'),
+                    ];
+                }
+            }
+        }
 
-		$transformed['line_items'] = $line_items;
-		$transformed['payments']   = $payments;
+        $transformed['line_items'] = $line_items;
+        $transformed['payments'] = $payments;
 
-		return $transformed;
-	}
-}
\ No newline at end of file
+        return $transformed;
+    }
+}
diff --git a/app/Import/Transformer/Wave/VendorTransformer.php b/app/Import/Transformer/Wave/VendorTransformer.php
index 724485c21b21..8f9d07013400 100644
--- a/app/Import/Transformer/Wave/VendorTransformer.php
+++ b/app/Import/Transformer/Wave/VendorTransformer.php
@@ -18,39 +18,41 @@ use Illuminate\Support\Str;
 /**
  * Class VendorTransformer.
  */
-class VendorTransformer extends BaseTransformer {
-	/**
-	 * @param $data
-	 *
-	 * @return array|bool
-	 */
-	public function transform( $data ) {
-		if ( isset( $data['vendor_name'] ) && $this->hasVendor( $data['vendor_name'] ) ) {
-			throw new ImportException('Vendor already exists');
-		}
+class VendorTransformer extends BaseTransformer
+{
+    /**
+     * @param $data
+     *
+     * @return array|bool
+     */
+    public function transform($data)
+    {
+        if (isset($data['vendor_name']) && $this->hasVendor($data['vendor_name'])) {
+            throw new ImportException('Vendor already exists');
+        }
 
-		return [
-			'company_id'     => $this->company->id,
-			'name'           => $this->getString( $data, 'vendor_name' ),
-			'number'         => $this->getValueOrNull( $data, 'account_number' ),
-			'phone'     => $this->getString( $data, 'phone' ),
-			'website'     	 => $this->getString( $data, 'website' ),
-			'country_id'     => !empty( $data['country'] ) ? $this->getCountryId( $data['country'] ) : null,
-			'state'          => $this->getString( $data, 'province/state' ),
-			'address1'       => $this->getString( $data, 'address_line_1' ),
-			'address2'       => $this->getString( $data, 'address_line_2' ),
-			'city'           => $this->getString( $data, 'city' ),
-			'postal_code'    => $this->getString( $data, 'postal_code/zip_code' ),
-			'currency_id' 	 => $this->getCurrencyByCode( $data, 'vendor_currency' ),
-			'client_hash'    => Str::random( 40 ),
-			'contacts'       => [
-				[
-					'first_name'    => $this->getString( $data, 'contact_first_name' ),
-					'last_name'     => $this->getString( $data, 'contact_last_name' ),
-					'email'         => $this->getString( $data, 'email' ),
-					'phone'         => $this->getString( $data, 'phone' ),
-				],
-			],
-		];
-	}
-}
\ No newline at end of file
+        return [
+            'company_id'     => $this->company->id,
+            'name'           => $this->getString($data, 'vendor_name'),
+            'number'         => $this->getValueOrNull($data, 'account_number'),
+            'phone'     => $this->getString($data, 'phone'),
+            'website'     	 => $this->getString($data, 'website'),
+            'country_id'     => ! empty($data['country']) ? $this->getCountryId($data['country']) : null,
+            'state'          => $this->getString($data, 'province/state'),
+            'address1'       => $this->getString($data, 'address_line_1'),
+            'address2'       => $this->getString($data, 'address_line_2'),
+            'city'           => $this->getString($data, 'city'),
+            'postal_code'    => $this->getString($data, 'postal_code/zip_code'),
+            'currency_id' 	 => $this->getCurrencyByCode($data, 'vendor_currency'),
+            'client_hash'    => Str::random(40),
+            'contacts'       => [
+                [
+                    'first_name'    => $this->getString($data, 'contact_first_name'),
+                    'last_name'     => $this->getString($data, 'contact_last_name'),
+                    'email'         => $this->getString($data, 'email'),
+                    'phone'         => $this->getString($data, 'phone'),
+                ],
+            ],
+        ];
+    }
+}
diff --git a/app/Import/Transformer/Zoho/ClientTransformer.php b/app/Import/Transformer/Zoho/ClientTransformer.php
index 8a03385b35d7..617048ef8712 100644
--- a/app/Import/Transformer/Zoho/ClientTransformer.php
+++ b/app/Import/Transformer/Zoho/ClientTransformer.php
@@ -18,55 +18,57 @@ use Illuminate\Support\Str;
 /**
  * Class ClientTransformer.
  */
-class ClientTransformer extends BaseTransformer {
-	/**
-	 * @param $data
-	 *
-	 * @return array|bool
-	 */
-	public function transform( $data ) {
-		if ( isset( $data['Company Name'] ) && $this->hasClient( $data['Company Name'] ) ) {
-			throw new ImportException( 'Client already exists' );
-		}
+class ClientTransformer extends BaseTransformer
+{
+    /**
+     * @param $data
+     *
+     * @return array|bool
+     */
+    public function transform($data)
+    {
+        if (isset($data['Company Name']) && $this->hasClient($data['Company Name'])) {
+            throw new ImportException('Client already exists');
+        }
 
-		$settings              = new \stdClass;
-		$settings->currency_id = (string) $this->getCurrencyByCode( $data, 'Currency' );
+        $settings = new \stdClass;
+        $settings->currency_id = (string) $this->getCurrencyByCode($data, 'Currency');
 
-		if ( strval( $data['Payment Terms'] ?? '' ) > 0 ) {
-			$settings->payment_terms = $data['Payment Terms'];
-		}
+        if (strval($data['Payment Terms'] ?? '') > 0) {
+            $settings->payment_terms = $data['Payment Terms'];
+        }
 
-		return [
-			'company_id'    => $this->company->id,
-			'name'          => $this->getString( $data, 'Company Name' ),
-			'phone'    		=> $this->getString( $data, 'Phone' ),
-			'private_notes' => $this->getString( $data, 'Notes' ),
-			'website'       => $this->getString( $data, 'Website' ),
-			'id_number'		=> $this->getString( $data, 'Customer ID'),
-			'address1'    => $this->getString( $data, 'Billing Address' ),
-			'address2'    => $this->getString( $data, 'Billing Street2' ),
-			'city'        => $this->getString( $data, 'Billing City' ),
-			'state'       => $this->getString( $data, 'Billing State' ),
-			'postal_code' => $this->getString( $data, 'Billing Code' ),
-			'country_id'  => isset( $data['Billing Country'] ) ? $this->getCountryId( $data['Billing Country'] ) : null,
+        return [
+            'company_id'    => $this->company->id,
+            'name'          => $this->getString($data, 'Company Name'),
+            'phone'    		=> $this->getString($data, 'Phone'),
+            'private_notes' => $this->getString($data, 'Notes'),
+            'website'       => $this->getString($data, 'Website'),
+            'id_number'		=> $this->getString($data, 'Customer ID'),
+            'address1'    => $this->getString($data, 'Billing Address'),
+            'address2'    => $this->getString($data, 'Billing Street2'),
+            'city'        => $this->getString($data, 'Billing City'),
+            'state'       => $this->getString($data, 'Billing State'),
+            'postal_code' => $this->getString($data, 'Billing Code'),
+            'country_id'  => isset($data['Billing Country']) ? $this->getCountryId($data['Billing Country']) : null,
 
-			'shipping_address1'    => $this->getString( $data, 'Shipping Address' ),
-			'shipping_address2'    => $this->getString( $data, 'Shipping Street2' ),
-			'shipping_city'        => $this->getString( $data, 'Shipping City' ),
-			'shipping_state'       => $this->getString( $data, 'Shipping State' ),
-			'shipping_postal_code' => $this->getString( $data, 'Shipping Code' ),
-			'shipping_country_id'  => isset( $data['Shipping Country'] ) ? $this->getCountryId( $data['Shipping Country'] ) : null,
-			'credit_balance' => 0,
-			'settings'       => $settings,
-			'client_hash'    => Str::random( 40 ),
-			'contacts'       => [
-				[
-					'first_name' => $this->getString( $data, 'First Name' ),
-					'last_name'  => $this->getString( $data, 'Last Name' ),
-					'email'      => $this->getString( $data, 'EmailID' ),
-					'phone'      => $this->getString( $data, 'Phone' ),
-				],
-			],
-		];
-	}
-}
\ No newline at end of file
+            'shipping_address1'    => $this->getString($data, 'Shipping Address'),
+            'shipping_address2'    => $this->getString($data, 'Shipping Street2'),
+            'shipping_city'        => $this->getString($data, 'Shipping City'),
+            'shipping_state'       => $this->getString($data, 'Shipping State'),
+            'shipping_postal_code' => $this->getString($data, 'Shipping Code'),
+            'shipping_country_id'  => isset($data['Shipping Country']) ? $this->getCountryId($data['Shipping Country']) : null,
+            'credit_balance' => 0,
+            'settings'       => $settings,
+            'client_hash'    => Str::random(40),
+            'contacts'       => [
+                [
+                    'first_name' => $this->getString($data, 'First Name'),
+                    'last_name'  => $this->getString($data, 'Last Name'),
+                    'email'      => $this->getString($data, 'EmailID'),
+                    'phone'      => $this->getString($data, 'Phone'),
+                ],
+            ],
+        ];
+    }
+}
diff --git a/app/Import/Transformer/Zoho/InvoiceTransformer.php b/app/Import/Transformer/Zoho/InvoiceTransformer.php
index 8b556f08b1ca..ea29d6c825c4 100644
--- a/app/Import/Transformer/Zoho/InvoiceTransformer.php
+++ b/app/Import/Transformer/Zoho/InvoiceTransformer.php
@@ -18,61 +18,62 @@ use App\Models\Invoice;
 /**
  * Class InvoiceTransformer.
  */
-class InvoiceTransformer extends BaseTransformer {
-	/**
-	 * @param $line_items_data
-	 *
-	 * @return bool|array
-	 */
-	public function transform( $line_items_data ) {
-		$invoice_data = reset( $line_items_data );
+class InvoiceTransformer extends BaseTransformer
+{
+    /**
+     * @param $line_items_data
+     *
+     * @return bool|array
+     */
+    public function transform($line_items_data)
+    {
+        $invoice_data = reset($line_items_data);
 
-		if ( $this->hasInvoice( $invoice_data['Invoice Number'] ) ) {
-			throw new ImportException( 'Invoice number already exists' );
-		}
+        if ($this->hasInvoice($invoice_data['Invoice Number'])) {
+            throw new ImportException('Invoice number already exists');
+        }
 
-		$invoiceStatusMap = [
-			'sent'  => Invoice::STATUS_SENT,
-			'draft' => Invoice::STATUS_DRAFT,
-		];
+        $invoiceStatusMap = [
+            'sent'  => Invoice::STATUS_SENT,
+            'draft' => Invoice::STATUS_DRAFT,
+        ];
 
-		$transformed = [
-			'company_id'   => $this->company->id,
-			'client_id'    => $this->getClient( $this->getString( $invoice_data, 'Customer ID' ), null ),
-			'number'       => $this->getString( $invoice_data, 'Invoice Number' ),
-			'date'         => isset( $invoice_data['Invoice Date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['Invoice Date'] ) ) : null,
-			'due_date'     => isset( $invoice_data['Due Date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['Due Date'] ) ) : null,
-			'po_number'    => $this->getString( $invoice_data, 'PurchaseOrder' ),
-			'public_notes' => $this->getString( $invoice_data, 'Notes' ),
-			'currency_id'  => $this->getCurrencyByCode( $invoice_data, 'Currency' ),
-			'amount'       => $this->getFloat( $invoice_data, 'Total' ),
-			'balance'      => $this->getFloat( $invoice_data, 'Balance' ),
-			'status_id'    => $invoiceStatusMap[ $status =
-					strtolower( $this->getString( $invoice_data, 'Invoice Status' ) ) ] ?? Invoice::STATUS_SENT,
-			// 'viewed'       => $status === 'viewed',
-		];
+        $transformed = [
+            'company_id'   => $this->company->id,
+            'client_id'    => $this->getClient($this->getString($invoice_data, 'Customer ID'), null),
+            'number'       => $this->getString($invoice_data, 'Invoice Number'),
+            'date'         => isset($invoice_data['Invoice Date']) ? date('Y-m-d', strtotime($invoice_data['Invoice Date'])) : null,
+            'due_date'     => isset($invoice_data['Due Date']) ? date('Y-m-d', strtotime($invoice_data['Due Date'])) : null,
+            'po_number'    => $this->getString($invoice_data, 'PurchaseOrder'),
+            'public_notes' => $this->getString($invoice_data, 'Notes'),
+            'currency_id'  => $this->getCurrencyByCode($invoice_data, 'Currency'),
+            'amount'       => $this->getFloat($invoice_data, 'Total'),
+            'balance'      => $this->getFloat($invoice_data, 'Balance'),
+            'status_id'    => $invoiceStatusMap[$status =
+                    strtolower($this->getString($invoice_data, 'Invoice Status'))] ?? Invoice::STATUS_SENT,
+            // 'viewed'       => $status === 'viewed',
+        ];
 
-		$line_items = [];
-		foreach ( $line_items_data as $record ) {
-			$line_items[] = [
-				'product_key'        => $this->getString( $record, 'Item Name' ),
-				'notes'              => $this->getString( $record, 'Item Description' ),
-				'cost'               => round($this->getFloat( $record, 'Item Price' ),2),
-				'quantity'           => $this->getFloat( $record, 'Quantity' ),
-				'discount'           => $this->getString( $record, 'Discount Amount' ),
-				'is_amount_discount' => true,
-			];
-		}
-		$transformed['line_items'] = $line_items;
+        $line_items = [];
+        foreach ($line_items_data as $record) {
+            $line_items[] = [
+                'product_key'        => $this->getString($record, 'Item Name'),
+                'notes'              => $this->getString($record, 'Item Description'),
+                'cost'               => round($this->getFloat($record, 'Item Price'), 2),
+                'quantity'           => $this->getFloat($record, 'Quantity'),
+                'discount'           => $this->getString($record, 'Discount Amount'),
+                'is_amount_discount' => true,
+            ];
+        }
+        $transformed['line_items'] = $line_items;
 
-		if ( $transformed['balance'] < $transformed['amount'] ) {
-			$transformed['payments'] = [[
-				'date'   => isset( $invoice_data['Last Payment Date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['Invoice Date'] ) ) : date( 'Y-m-d' ),
-				'amount' => $transformed['amount'] - $transformed['balance'],
-			]];
-		}
+        if ($transformed['balance'] < $transformed['amount']) {
+            $transformed['payments'] = [[
+                'date'   => isset($invoice_data['Last Payment Date']) ? date('Y-m-d', strtotime($invoice_data['Invoice Date'])) : date('Y-m-d'),
+                'amount' => $transformed['amount'] - $transformed['balance'],
+            ]];
+        }
 
-		return $transformed;
-	}
+        return $transformed;
+    }
 }
-
diff --git a/app/Import/Transformers/BaseTransformer.php b/app/Import/Transformers/BaseTransformer.php
index bbf9142944ad..f805010abadc 100644
--- a/app/Import/Transformers/BaseTransformer.php
+++ b/app/Import/Transformers/BaseTransformer.php
@@ -36,7 +36,6 @@ class BaseTransformer
         $this->maps = $maps;
     }
 
-
     /**
      * @param $data
      * @param $field
@@ -53,40 +52,40 @@ class BaseTransformer
         return (isset($data[$field]) && $data[$field]) ? $data[$field] : '1';
     }
 
-    public function getCurrencyByCode( $data, $key = 'client.currency_id' ) {
-		$code = array_key_exists( $key, $data ) ? $data[ $key ] : false;
+    public function getCurrencyByCode($data, $key = 'client.currency_id')
+    {
+        $code = array_key_exists($key, $data) ? $data[$key] : false;
 
-		return $this->maps['currencies'][ $code ] ?? $this->maps['company']->settings->currency_id;
-	}
+        return $this->maps['currencies'][$code] ?? $this->maps['company']->settings->currency_id;
+    }
 
-    public function getClient($client_name, $client_email) {
-		$clients = $this->maps['company']->clients;
+    public function getClient($client_name, $client_email)
+    {
+        $clients = $this->maps['company']->clients;
 
-		$client_id_search = $clients->where( 'id_number', $client_name );
+        $client_id_search = $clients->where('id_number', $client_name);
 
-		if ( $client_id_search->count() >= 1 ) {
-			return $client_id_search->first()->id;
-		}
+        if ($client_id_search->count() >= 1) {
+            return $client_id_search->first()->id;
+        }
 
-        $client_name_search = $clients->where( 'name', $client_name );
+        $client_name_search = $clients->where('name', $client_name);
 
-        if ( $client_name_search->count() >= 1 ) {
+        if ($client_name_search->count() >= 1) {
             return $client_name_search->first()->id;
         }
 
-		if ( ! empty( $client_email ) ) {
-			$contacts = ClientContact::where( 'company_id', $this->maps['company']->id )
-									 ->where( 'email', $client_email );
-
-			if ( $contacts->count() >= 1 ) {
-				return $contacts->first()->client_id;
-			}
-		}
-
-		return null;
-	}
+        if (! empty($client_email)) {
+            $contacts = ClientContact::where('company_id', $this->maps['company']->id)
+                                     ->where('email', $client_email);
 
+            if ($contacts->count() >= 1) {
+                return $contacts->first()->client_id;
+            }
+        }
 
+        return null;
+    }
 
     ///////////////////////////////////////////////////////////////////////////////////
     /**
@@ -98,7 +97,7 @@ class BaseTransformer
     {
         $name = trim(strtolower($name));
 
-		return isset( $this->maps['client'][ $name ] );
+        return isset($this->maps['client'][$name]);
     }
 
     /**
@@ -110,10 +109,9 @@ class BaseTransformer
     {
         $name = trim(strtolower($name));
 
-		return isset( $this->maps['vendor'][ $name ] );
+        return isset($this->maps['vendor'][$name]);
     }
 
-
     /**
      * @param $key
      *
@@ -123,10 +121,9 @@ class BaseTransformer
     {
         $key = trim(strtolower($key));
 
-		return isset( $this->maps['product'][ $key ] );
+        return isset($this->maps['product'][$key]);
     }
 
-
     /**
      * @param $data
      * @param $field
@@ -164,7 +161,7 @@ class BaseTransformer
     {
         $name = strtolower(trim($name));
 
-		return isset( $this->maps['client'][ $name ] ) ? $this->maps['client'][ $name ] : null;
+        return isset($this->maps['client'][$name]) ? $this->maps['client'][$name] : null;
     }
 
     /**
@@ -201,7 +198,6 @@ class BaseTransformer
         return $this->maps['contact'][$email];
     }
 
-
     /**
      * @param $name
      *
@@ -227,9 +223,10 @@ class BaseTransformer
     {
         $name = strtolower(trim($name));
 
-        if(strlen($name) == 2)
+        if (strlen($name) == 2) {
             return $this->getCountryIdBy2($name);
-        
+        }
+
         return isset($this->maps['countries'][$name]) ? $this->maps['countries'][$name] : null;
     }
 
@@ -322,7 +319,7 @@ class BaseTransformer
      */
     public function getInvoiceNumber($number)
     {
-		return $number ? ltrim( trim( $number ), '0' ) : null;
+        return $number ? ltrim(trim($number), '0') : null;
     }
 
     /**
@@ -335,7 +332,7 @@ class BaseTransformer
         $invoiceNumber = $this->getInvoiceNumber($invoiceNumber);
         $invoiceNumber = strtolower($invoiceNumber);
 
-		return isset( $this->maps['invoice'][ $invoiceNumber ] ) ? $this->maps['invoice'][ $invoiceNumber ] : null;
+        return isset($this->maps['invoice'][$invoiceNumber]) ? $this->maps['invoice'][$invoiceNumber] : null;
     }
 
     /**
@@ -348,7 +345,7 @@ class BaseTransformer
         $invoiceNumber = $this->getInvoiceNumber($invoiceNumber);
         $invoiceNumber = strtolower($invoiceNumber);
 
-		return isset( $this->maps['invoice'][ $invoiceNumber ] ) ? $this->maps['invoices'][ $invoiceNumber ]->public_id : null;
+        return isset($this->maps['invoice'][$invoiceNumber]) ? $this->maps['invoices'][$invoiceNumber]->public_id : null;
     }
 
     /**
@@ -361,7 +358,7 @@ class BaseTransformer
         $invoiceNumber = $this->getInvoiceNumber($invoiceNumber);
         $invoiceNumber = strtolower($invoiceNumber);
 
-		return $this->maps['invoice'][ $invoiceNumber ] ?? null;
+        return $this->maps['invoice'][$invoiceNumber] ?? null;
     }
 
     /**
@@ -374,7 +371,7 @@ class BaseTransformer
         $invoiceNumber = $this->getInvoiceNumber($invoiceNumber);
         $invoiceNumber = strtolower($invoiceNumber);
 
-		return $this->maps['invoice_client'][ $invoiceNumber ] ?? null;
+        return $this->maps['invoice_client'][$invoiceNumber] ?? null;
     }
 
     /**
@@ -386,39 +383,42 @@ class BaseTransformer
     {
         $name = strtolower(trim($name));
 
-		return $this->maps['vendor'][ $name ] ?? null;
+        return $this->maps['vendor'][$name] ?? null;
     }
 
-	/**
-	 * @param $name
-	 *
-	 * @return null
-	 */
-	public function getExpenseCategoryId( $name ) {
-		$name = strtolower( trim( $name ) );
+    /**
+     * @param $name
+     *
+     * @return null
+     */
+    public function getExpenseCategoryId($name)
+    {
+        $name = strtolower(trim($name));
 
-		return $this->maps['expense_category'][ $name ] ?? null;
-	}
+        return $this->maps['expense_category'][$name] ?? null;
+    }
 
-	/**
-	 * @param $name
-	 *
-	 * @return null
-	 */
-	public function getProjectId( $name ) {
-		$name = strtolower( trim( $name ) );
+    /**
+     * @param $name
+     *
+     * @return null
+     */
+    public function getProjectId($name)
+    {
+        $name = strtolower(trim($name));
 
-		return $this->maps['project'][ $name ] ?? null;
-	}
+        return $this->maps['project'][$name] ?? null;
+    }
 
-	/**
-	 * @param $name
-	 *
-	 * @return null
-	 */
-	public function getPaymentTypeId( $name ) {
-		$name = strtolower( trim( $name ) );
+    /**
+     * @param $name
+     *
+     * @return null
+     */
+    public function getPaymentTypeId($name)
+    {
+        $name = strtolower(trim($name));
 
-		return $this->maps['payment_type'][ $name ] ?? null;
-	}
+        return $this->maps['payment_type'][$name] ?? null;
+    }
 }
diff --git a/app/Import/Transformers/ClientTransformer.php b/app/Import/Transformers/ClientTransformer.php
index eaa38b3138f5..1e7ed43ae226 100644
--- a/app/Import/Transformers/ClientTransformer.php
+++ b/app/Import/Transformers/ClientTransformer.php
@@ -30,49 +30,49 @@ class ClientTransformer extends BaseTransformer
         }
 
         $settings = new \stdClass;
-        $settings->currency_id = (string)$this->getCurrencyByCode($data);
+        $settings->currency_id = (string) $this->getCurrencyByCode($data);
 
         return [
-                'company_id' => $this->maps['company']->id,
-                'name' => $this->getString($data, 'client.name'),
-                'work_phone' => $this->getString($data, 'client.phone'),
-                'address1' => $this->getString($data, 'client.address1'),
-                'address2' => $this->getString($data, 'client.address2'),
-                'city' => $this->getString($data, 'client.city'),
-                'state' => $this->getString($data, 'client.state'),
-                'shipping_address1' => $this->getString($data, 'client.shipping_address1'),
-                'shipping_address2' => $this->getString($data, 'client.shipping_address2'),
-                'shipping_city' => $this->getString($data, 'client.shipping_city'),
-                'shipping_state' => $this->getString($data, 'client.shipping_state'),
-                'shipping_postal_code' => $this->getString($data, 'client.shipping_postal_code'),
-                'public_notes' => $this->getString($data, 'client.public_notes'),
-                'private_notes' => $this->getString($data, 'client.private_notes'),
-                'website' => $this->getString($data, 'client.website'),
-                'vat_number' => $this->getString($data, 'client.vat_number'),
-                'id_number' => $this->getString($data, 'client.id_number'),
-                'custom_value1' => $this->getString($data, 'client.custom1'),
-                'custom_value2' => $this->getString($data, 'client.custom2'),
-                'custom_value3' => $this->getString($data, 'client.custom3'),
-                'custom_value4' => $this->getString($data, 'client.custom4'),
-                'balance' => $this->getFloat($data, 'client.balance'),
-                'paid_to_date' => $this->getFloat($data, 'client.paid_to_date'),
-                'credit_balance' => 0,
-                'settings' => $settings,
-                'client_hash' => Str::random(40),
-                'contacts' => [
-                    [
-                        'first_name' => $this->getString($data, 'contact.first_name'),
-                        'last_name' => $this->getString($data, 'contact.last_name'),
-                        'email' => $this->getString($data, 'contact.email'),
-                        'phone' => $this->getString($data, 'contact.phone'),
-                        'custom_value1' => $this->getString($data, 'contact.custom1'),
-                        'custom_value2' => $this->getString($data, 'contact.custom2'),
-                        'custom_value3' => $this->getString($data, 'contact.custom3'),
-                        'custom_value4' => $this->getString($data, 'contact.custom4'),
-                    ],
+            'company_id' => $this->maps['company']->id,
+            'name' => $this->getString($data, 'client.name'),
+            'work_phone' => $this->getString($data, 'client.phone'),
+            'address1' => $this->getString($data, 'client.address1'),
+            'address2' => $this->getString($data, 'client.address2'),
+            'city' => $this->getString($data, 'client.city'),
+            'state' => $this->getString($data, 'client.state'),
+            'shipping_address1' => $this->getString($data, 'client.shipping_address1'),
+            'shipping_address2' => $this->getString($data, 'client.shipping_address2'),
+            'shipping_city' => $this->getString($data, 'client.shipping_city'),
+            'shipping_state' => $this->getString($data, 'client.shipping_state'),
+            'shipping_postal_code' => $this->getString($data, 'client.shipping_postal_code'),
+            'public_notes' => $this->getString($data, 'client.public_notes'),
+            'private_notes' => $this->getString($data, 'client.private_notes'),
+            'website' => $this->getString($data, 'client.website'),
+            'vat_number' => $this->getString($data, 'client.vat_number'),
+            'id_number' => $this->getString($data, 'client.id_number'),
+            'custom_value1' => $this->getString($data, 'client.custom1'),
+            'custom_value2' => $this->getString($data, 'client.custom2'),
+            'custom_value3' => $this->getString($data, 'client.custom3'),
+            'custom_value4' => $this->getString($data, 'client.custom4'),
+            'balance' => $this->getFloat($data, 'client.balance'),
+            'paid_to_date' => $this->getFloat($data, 'client.paid_to_date'),
+            'credit_balance' => 0,
+            'settings' => $settings,
+            'client_hash' => Str::random(40),
+            'contacts' => [
+                [
+                    'first_name' => $this->getString($data, 'contact.first_name'),
+                    'last_name' => $this->getString($data, 'contact.last_name'),
+                    'email' => $this->getString($data, 'contact.email'),
+                    'phone' => $this->getString($data, 'contact.phone'),
+                    'custom_value1' => $this->getString($data, 'contact.custom1'),
+                    'custom_value2' => $this->getString($data, 'contact.custom2'),
+                    'custom_value3' => $this->getString($data, 'contact.custom3'),
+                    'custom_value4' => $this->getString($data, 'contact.custom4'),
                 ],
-                'country_id' => isset($data->country_id) ? $this->getCountryId($data->country_id) : null,
-                'shipping_country_id' => isset($data->shipping_country_id) ? $this->getCountryId($data->shipping_country_id) : null,
-            ];
+            ],
+            'country_id' => isset($data->country_id) ? $this->getCountryId($data->country_id) : null,
+            'shipping_country_id' => isset($data->shipping_country_id) ? $this->getCountryId($data->shipping_country_id) : null,
+        ];
     }
 }
diff --git a/app/Import/Transformers/Csv/ClientTransformer.php b/app/Import/Transformers/Csv/ClientTransformer.php
index 7498512c3c0b..55d0baa8a1fa 100644
--- a/app/Import/Transformers/Csv/ClientTransformer.php
+++ b/app/Import/Transformers/Csv/ClientTransformer.php
@@ -10,6 +10,7 @@
  */
 
 namespace App\Import\Transformers\Csv;
+
 use App\Import\ImportException;
 use App\Import\Transformers\BaseTransformer;
 use Illuminate\Support\Str;
@@ -19,101 +20,101 @@ use Illuminate\Support\Str;
  */
 class ClientTransformer extends BaseTransformer
 {
-	/**
-	 * @param $data
-	 *
-	 * @return array|bool
-	 */
-	public function transform($data)
-	{
-		if (isset($data->name) && $this->hasClient($data->name)) {
-			throw new ImportException('Client already exists');
-		}
+    /**
+     * @param $data
+     *
+     * @return array|bool
+     */
+    public function transform($data)
+    {
+        if (isset($data->name) && $this->hasClient($data->name)) {
+            throw new ImportException('Client already exists');
+        }
 
-		$settings = new \stdClass();
-		$settings->currency_id = (string) $this->getCurrencyByCode($data);
+        $settings = new \stdClass();
+        $settings->currency_id = (string) $this->getCurrencyByCode($data);
 
-		return [
-			'company_id' => $this->maps['company']->id,
-			'name' => $this->getString($data, 'client.name'),
-			'work_phone' => $this->getString($data, 'client.phone'),
-			'address1' => $this->getString($data, 'client.address1'),
-			'address2' => $this->getString($data, 'client.address2'),
-			'postal_code' => $this->getString($data, 'client.postal_code'),
-			'city' => $this->getString($data, 'client.city'),
-			'state' => $this->getString($data, 'client.state'),
-			'shipping_address1' => $this->getString(
-				$data,
-				'client.shipping_address1'
-			),
-			'shipping_address2' => $this->getString(
-				$data,
-				'client.shipping_address2'
-			),
-			'shipping_city' => $this->getString($data, 'client.shipping_city'),
-			'shipping_state' => $this->getString(
-				$data,
-				'client.shipping_state'
-			),
-			'shipping_postal_code' => $this->getString(
-				$data,
-				'client.shipping_postal_code'
-			),
-			'public_notes' => $this->getString($data, 'client.public_notes'),
-			'private_notes' => $this->getString($data, 'client.private_notes'),
-			'website' => $this->getString($data, 'client.website'),
-			'vat_number' => $this->getString($data, 'client.vat_number'),
-			'id_number' => $this->getString($data, 'client.id_number'),
-			'custom_value1' => $this->getString($data, 'client.custom_value1'),
-			'custom_value2' => $this->getString($data, 'client.custom_value2'),
-			'custom_value3' => $this->getString($data, 'client.custom_value3'),
-			'custom_value4' => $this->getString($data, 'client.custom_value4'),
-			'balance' => preg_replace(
-				'/[^0-9,.]+/',
-				'',
-				$this->getFloat($data, 'client.balance')
-			),
-			'paid_to_date' => preg_replace(
-				'/[^0-9,.]+/',
-				'',
-				$this->getFloat($data, 'client.paid_to_date')
-			),
-			'credit_balance' => 0,
-			'settings' => $settings,
-			'client_hash' => Str::random(40),
-			'contacts' => [
-				[
-					'first_name' => $this->getString(
-						$data,
-						'contact.first_name'
-					),
-					'last_name' => $this->getString($data, 'contact.last_name'),
-					'email' => $this->getString($data, 'contact.email'),
-					'phone' => $this->getString($data, 'contact.phone'),
-					'custom_value1' => $this->getString(
-						$data,
-						'contact.custom_value1'
-					),
-					'custom_value2' => $this->getString(
-						$data,
-						'contact.custom_value2'
-					),
-					'custom_value3' => $this->getString(
-						$data,
-						'contact.custom_value3'
-					),
-					'custom_value4' => $this->getString(
-						$data,
-						'contact.custom_value4'
-					),
-				],
-			],
-			'country_id' => isset($data['client.country'])
-				? $this->getCountryId($data['client.country'])
-				: null,
-			'shipping_country_id' => isset($data['client.shipping_country'])
-				? $this->getCountryId($data['client.shipping_country'])
-				: null,
-		];
-	}
+        return [
+            'company_id' => $this->maps['company']->id,
+            'name' => $this->getString($data, 'client.name'),
+            'work_phone' => $this->getString($data, 'client.phone'),
+            'address1' => $this->getString($data, 'client.address1'),
+            'address2' => $this->getString($data, 'client.address2'),
+            'postal_code' => $this->getString($data, 'client.postal_code'),
+            'city' => $this->getString($data, 'client.city'),
+            'state' => $this->getString($data, 'client.state'),
+            'shipping_address1' => $this->getString(
+                $data,
+                'client.shipping_address1'
+            ),
+            'shipping_address2' => $this->getString(
+                $data,
+                'client.shipping_address2'
+            ),
+            'shipping_city' => $this->getString($data, 'client.shipping_city'),
+            'shipping_state' => $this->getString(
+                $data,
+                'client.shipping_state'
+            ),
+            'shipping_postal_code' => $this->getString(
+                $data,
+                'client.shipping_postal_code'
+            ),
+            'public_notes' => $this->getString($data, 'client.public_notes'),
+            'private_notes' => $this->getString($data, 'client.private_notes'),
+            'website' => $this->getString($data, 'client.website'),
+            'vat_number' => $this->getString($data, 'client.vat_number'),
+            'id_number' => $this->getString($data, 'client.id_number'),
+            'custom_value1' => $this->getString($data, 'client.custom_value1'),
+            'custom_value2' => $this->getString($data, 'client.custom_value2'),
+            'custom_value3' => $this->getString($data, 'client.custom_value3'),
+            'custom_value4' => $this->getString($data, 'client.custom_value4'),
+            'balance' => preg_replace(
+                '/[^0-9,.]+/',
+                '',
+                $this->getFloat($data, 'client.balance')
+            ),
+            'paid_to_date' => preg_replace(
+                '/[^0-9,.]+/',
+                '',
+                $this->getFloat($data, 'client.paid_to_date')
+            ),
+            'credit_balance' => 0,
+            'settings' => $settings,
+            'client_hash' => Str::random(40),
+            'contacts' => [
+                [
+                    'first_name' => $this->getString(
+                        $data,
+                        'contact.first_name'
+                    ),
+                    'last_name' => $this->getString($data, 'contact.last_name'),
+                    'email' => $this->getString($data, 'contact.email'),
+                    'phone' => $this->getString($data, 'contact.phone'),
+                    'custom_value1' => $this->getString(
+                        $data,
+                        'contact.custom_value1'
+                    ),
+                    'custom_value2' => $this->getString(
+                        $data,
+                        'contact.custom_value2'
+                    ),
+                    'custom_value3' => $this->getString(
+                        $data,
+                        'contact.custom_value3'
+                    ),
+                    'custom_value4' => $this->getString(
+                        $data,
+                        'contact.custom_value4'
+                    ),
+                ],
+            ],
+            'country_id' => isset($data['client.country'])
+                ? $this->getCountryId($data['client.country'])
+                : null,
+            'shipping_country_id' => isset($data['client.shipping_country'])
+                ? $this->getCountryId($data['client.shipping_country'])
+                : null,
+        ];
+    }
 }
diff --git a/app/Import/Transformers/Csv/ExpenseTransformer.php b/app/Import/Transformers/Csv/ExpenseTransformer.php
index 519210686a75..d954e1a21d25 100644
--- a/app/Import/Transformers/Csv/ExpenseTransformer.php
+++ b/app/Import/Transformers/Csv/ExpenseTransformer.php
@@ -7,34 +7,36 @@ use App\Import\Transformers\BaseTransformer;
 /**
  * Class InvoiceTransformer.
  */
-class ExpenseTransformer extends BaseTransformer {
-	/**
-	 * @param $data
-	 *
-	 * @return bool|array
-	 */
-	public function transform( $data ) {
-		$clientId = isset( $data['expense.client'] ) ? $this->getClientId( $data['expense.client'] ) : null;
+class ExpenseTransformer extends BaseTransformer
+{
+    /**
+     * @param $data
+     *
+     * @return bool|array
+     */
+    public function transform($data)
+    {
+        $clientId = isset($data['expense.client']) ? $this->getClientId($data['expense.client']) : null;
 
-		return [
-			'company_id'            => $this->maps['company']->id,
-			'amount'                => $this->getFloat( $data, 'expense.amount' ),
-			'currency_id'           => $this->getCurrencyByCode( $data, 'expense.currency_id' ),
-			'vendor_id'             => isset( $data['expense.vendor'] ) ? $this->getVendorId( $data['expense.vendor'] ) : null,
-			'client_id'             => isset( $data['expense.client'] ) ? $this->getClientId( $data['expense.client'] ) : null,
-			'date'		            => isset( $data['expense.date'] ) ? date( 'Y-m-d', strtotime( $data['expense.date'] ) ) : null,
-			'public_notes'          => $this->getString( $data, 'expense.public_notes' ),
-			'private_notes'         => $this->getString( $data, 'expense.private_notes' ),
-			'category_id'   		=> isset( $data['expense.category'] ) ? $this->getExpenseCategoryId( $data['expense.category'] ) : null,
-			'project_id'            => isset( $data['expense.project'] ) ? $this->getProjectId( $data['expense.project'] ) : null,
-			'payment_type_id'       => isset( $data['expense.payment_type'] ) ? $this->getPaymentTypeId( $data['expense.payment_type'] ) : null,
-			'payment_date'          => isset( $data['expense.payment_date'] ) ? date( 'Y-m-d', strtotime( $data['expense.payment_date'] ) ) : null,
-			'custom_value1'        => $this->getString( $data, 'expense.custom_value1' ),
-			'custom_value2'        => $this->getString( $data, 'expense.custom_value2' ),
-			'custom_value3'        => $this->getString( $data, 'expense.custom_value3' ),
-			'custom_value4'        => $this->getString( $data, 'expense.custom_value4' ),
-			'transaction_reference' => $this->getString( $data, 'expense.transaction_reference' ),
-			'should_be_invoiced'    => $clientId ? true : false,
-		];
-	}
+        return [
+            'company_id'            => $this->maps['company']->id,
+            'amount'                => $this->getFloat($data, 'expense.amount'),
+            'currency_id'           => $this->getCurrencyByCode($data, 'expense.currency_id'),
+            'vendor_id'             => isset($data['expense.vendor']) ? $this->getVendorId($data['expense.vendor']) : null,
+            'client_id'             => isset($data['expense.client']) ? $this->getClientId($data['expense.client']) : null,
+            'date'		            => isset($data['expense.date']) ? date('Y-m-d', strtotime($data['expense.date'])) : null,
+            'public_notes'          => $this->getString($data, 'expense.public_notes'),
+            'private_notes'         => $this->getString($data, 'expense.private_notes'),
+            'category_id'   		=> isset($data['expense.category']) ? $this->getExpenseCategoryId($data['expense.category']) : null,
+            'project_id'            => isset($data['expense.project']) ? $this->getProjectId($data['expense.project']) : null,
+            'payment_type_id'       => isset($data['expense.payment_type']) ? $this->getPaymentTypeId($data['expense.payment_type']) : null,
+            'payment_date'          => isset($data['expense.payment_date']) ? date('Y-m-d', strtotime($data['expense.payment_date'])) : null,
+            'custom_value1'        => $this->getString($data, 'expense.custom_value1'),
+            'custom_value2'        => $this->getString($data, 'expense.custom_value2'),
+            'custom_value3'        => $this->getString($data, 'expense.custom_value3'),
+            'custom_value4'        => $this->getString($data, 'expense.custom_value4'),
+            'transaction_reference' => $this->getString($data, 'expense.transaction_reference'),
+            'should_be_invoiced'    => $clientId ? true : false,
+        ];
+    }
 }
diff --git a/app/Import/Transformers/Csv/InvoiceTransformer.php b/app/Import/Transformers/Csv/InvoiceTransformer.php
index 7c2e6eb92ad7..b345eccc3b6f 100644
--- a/app/Import/Transformers/Csv/InvoiceTransformer.php
+++ b/app/Import/Transformers/Csv/InvoiceTransformer.php
@@ -18,114 +18,116 @@ use App\Models\Invoice;
 /**
  * Class InvoiceTransformer.
  */
-class InvoiceTransformer extends BaseTransformer {
-	/**
-	 * @param $data
-	 *
-	 * @return bool|array
-	 */
-	public function transform( $line_items_data ) {
-		$invoice_data = reset( $line_items_data );
+class InvoiceTransformer extends BaseTransformer
+{
+    /**
+     * @param $data
+     *
+     * @return bool|array
+     */
+    public function transform($line_items_data)
+    {
+        $invoice_data = reset($line_items_data);
 
-		if ( $this->hasInvoice( $invoice_data['invoice.number'] ) ) {
-			throw new ImportException( 'Invoice number already exists' );
-		}
+        if ($this->hasInvoice($invoice_data['invoice.number'])) {
+            throw new ImportException('Invoice number already exists');
+        }
 
-		$invoiceStatusMap = [
-			'sent'  => Invoice::STATUS_SENT,
-			'draft' => Invoice::STATUS_DRAFT,
-		];
+        $invoiceStatusMap = [
+            'sent'  => Invoice::STATUS_SENT,
+            'draft' => Invoice::STATUS_DRAFT,
+        ];
 
-		$transformed = [
-			'company_id'        => $this->maps['company']->id,
-			'number'            => $this->getString( $invoice_data, 'invoice.number' ),
-			'user_id'           => $this->getString( $invoice_data, 'invoice.user_id' ),
-			'amount'            => $amount = $this->getFloat( $invoice_data, 'invoice.amount' ),
-			'balance'           => isset( $invoice_data['invoice.balance'] ) ? $this->getFloat( $invoice_data, 'invoice.balance' ) : $amount,
-			'client_id'         => $this->getClient( $this->getString( $invoice_data, 'client.name' ), $this->getString( $invoice_data, 'client.email' ) ),
-			'discount'          => $this->getFloat( $invoice_data, 'invoice.discount' ),
-			'po_number'         => $this->getString( $invoice_data, 'invoice.po_number' ),
-			'date'              => isset( $invoice_data['invoice.date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['invoice.date'] ) ) : now()->format('Y-m-d'),
-			'due_date'          => isset( $invoice_data['invoice.due_date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['invoice.due_date'] ) ) : null,
-			'terms'             => $this->getString( $invoice_data, 'invoice.terms' ),
-			'public_notes'      => $this->getString( $invoice_data, 'invoice.public_notes' ),
-			// 'is_sent'           => $this->getString( $invoice_data, 'invoice.is_sent' ),
-			'private_notes'     => $this->getString( $invoice_data, 'invoice.private_notes' ),
-			'tax_name1'         => $this->getString( $invoice_data, 'invoice.tax_name1' ),
-			'tax_rate1'         => $this->getFloat( $invoice_data, 'invoice.tax_rate1' ),
-			'tax_name2'         => $this->getString( $invoice_data, 'invoice.tax_name2' ),
-			'tax_rate2'         => $this->getFloat( $invoice_data, 'invoice.tax_rate2' ),
-			'tax_name3'         => $this->getString( $invoice_data, 'invoice.tax_name3' ),
-			'tax_rate3'         => $this->getFloat( $invoice_data, 'invoice.tax_rate3' ),
-			'custom_value1'     => $this->getString( $invoice_data, 'invoice.custom_value1' ),
-			'custom_value2'     => $this->getString( $invoice_data, 'invoice.custom_value2' ),
-			'custom_value3'     => $this->getString( $invoice_data, 'invoice.custom_value3' ),
-			'custom_value4'     => $this->getString( $invoice_data, 'invoice.custom_value4' ),
-			'footer'            => $this->getString( $invoice_data, 'invoice.footer' ),
-			'partial'           => $this->getFloat( $invoice_data, 'invoice.partial' ),
-			'partial_due_date'  => $this->getString( $invoice_data, 'invoice.partial_due_date' ),
-			'custom_surcharge1' => $this->getString( $invoice_data, 'invoice.custom_surcharge1' ),
-			'custom_surcharge2' => $this->getString( $invoice_data, 'invoice.custom_surcharge2' ),
-			'custom_surcharge3' => $this->getString( $invoice_data, 'invoice.custom_surcharge3' ),
-			'custom_surcharge4' => $this->getString( $invoice_data, 'invoice.custom_surcharge4' ),
-			'exchange_rate'     => $this->getString( $invoice_data, 'invoice.exchange_rate' ),
-			'status_id'         => $invoiceStatusMap[ $status =
-					strtolower( $this->getString( $invoice_data, 'invoice.status' ) ) ] ??
-				Invoice::STATUS_SENT,
-			// 'viewed'            => $status === 'viewed',
-			'archived'          => $status === 'archived',
-		];
+        $transformed = [
+            'company_id'        => $this->maps['company']->id,
+            'number'            => $this->getString($invoice_data, 'invoice.number'),
+            'user_id'           => $this->getString($invoice_data, 'invoice.user_id'),
+            'amount'            => $amount = $this->getFloat($invoice_data, 'invoice.amount'),
+            'balance'           => isset($invoice_data['invoice.balance']) ? $this->getFloat($invoice_data, 'invoice.balance') : $amount,
+            'client_id'         => $this->getClient($this->getString($invoice_data, 'client.name'), $this->getString($invoice_data, 'client.email')),
+            'discount'          => $this->getFloat($invoice_data, 'invoice.discount'),
+            'po_number'         => $this->getString($invoice_data, 'invoice.po_number'),
+            'date'              => isset($invoice_data['invoice.date']) ? date('Y-m-d', strtotime($invoice_data['invoice.date'])) : now()->format('Y-m-d'),
+            'due_date'          => isset($invoice_data['invoice.due_date']) ? date('Y-m-d', strtotime($invoice_data['invoice.due_date'])) : null,
+            'terms'             => $this->getString($invoice_data, 'invoice.terms'),
+            'public_notes'      => $this->getString($invoice_data, 'invoice.public_notes'),
+            // 'is_sent'           => $this->getString( $invoice_data, 'invoice.is_sent' ),
+            'private_notes'     => $this->getString($invoice_data, 'invoice.private_notes'),
+            'tax_name1'         => $this->getString($invoice_data, 'invoice.tax_name1'),
+            'tax_rate1'         => $this->getFloat($invoice_data, 'invoice.tax_rate1'),
+            'tax_name2'         => $this->getString($invoice_data, 'invoice.tax_name2'),
+            'tax_rate2'         => $this->getFloat($invoice_data, 'invoice.tax_rate2'),
+            'tax_name3'         => $this->getString($invoice_data, 'invoice.tax_name3'),
+            'tax_rate3'         => $this->getFloat($invoice_data, 'invoice.tax_rate3'),
+            'custom_value1'     => $this->getString($invoice_data, 'invoice.custom_value1'),
+            'custom_value2'     => $this->getString($invoice_data, 'invoice.custom_value2'),
+            'custom_value3'     => $this->getString($invoice_data, 'invoice.custom_value3'),
+            'custom_value4'     => $this->getString($invoice_data, 'invoice.custom_value4'),
+            'footer'            => $this->getString($invoice_data, 'invoice.footer'),
+            'partial'           => $this->getFloat($invoice_data, 'invoice.partial'),
+            'partial_due_date'  => $this->getString($invoice_data, 'invoice.partial_due_date'),
+            'custom_surcharge1' => $this->getString($invoice_data, 'invoice.custom_surcharge1'),
+            'custom_surcharge2' => $this->getString($invoice_data, 'invoice.custom_surcharge2'),
+            'custom_surcharge3' => $this->getString($invoice_data, 'invoice.custom_surcharge3'),
+            'custom_surcharge4' => $this->getString($invoice_data, 'invoice.custom_surcharge4'),
+            'exchange_rate'     => $this->getString($invoice_data, 'invoice.exchange_rate'),
+            'status_id'         => $invoiceStatusMap[$status =
+                    strtolower($this->getString($invoice_data, 'invoice.status'))] ??
+                Invoice::STATUS_SENT,
+            // 'viewed'            => $status === 'viewed',
+            'archived'          => $status === 'archived',
+        ];
 
-		if ( isset( $invoice_data['payment.amount'] ) ) {
-			$transformed['payments'] = [
-				[
-					'date'                  => isset( $invoice_data['payment.date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['payment.date'] ) ) : date( 'y-m-d' ),
-					'transaction_reference' => $this->getString( $invoice_data, 'payment.transaction_reference' ),
-					'amount'                => $this->getFloat( $invoice_data, 'payment.amount' ),
-				],
-			];
-		} elseif ( $status === 'paid' ) {
-			$transformed['payments'] = [
-				[
-					'date'                  => isset( $invoice_data['payment.date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['payment.date'] ) ) : date( 'y-m-d' ),
-					'transaction_reference' => $this->getString( $invoice_data, 'payment.transaction_reference' ),
-					'amount'                => $this->getFloat( $invoice_data, 'invoice.amount' ),
-				],
-			];
-		} elseif ( isset( $transformed['amount'] ) && isset( $transformed['balance'] ) && ($transformed['amount'] != $transformed['balance'])) {
-			$transformed['payments'] = [
-				[
-					'date'                  => isset( $invoice_data['payment.date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['payment.date'] ) ) : date( 'y-m-d' ),
-					'transaction_reference' => $this->getString( $invoice_data, 'payment.transaction_reference' ),
-					'amount'                => $transformed['amount'] - $transformed['balance'],
-				],
-			];
-		}
+        if (isset($invoice_data['payment.amount'])) {
+            $transformed['payments'] = [
+                [
+                    'date'                  => isset($invoice_data['payment.date']) ? date('Y-m-d', strtotime($invoice_data['payment.date'])) : date('y-m-d'),
+                    'transaction_reference' => $this->getString($invoice_data, 'payment.transaction_reference'),
+                    'amount'                => $this->getFloat($invoice_data, 'payment.amount'),
+                ],
+            ];
+        } elseif ($status === 'paid') {
+            $transformed['payments'] = [
+                [
+                    'date'                  => isset($invoice_data['payment.date']) ? date('Y-m-d', strtotime($invoice_data['payment.date'])) : date('y-m-d'),
+                    'transaction_reference' => $this->getString($invoice_data, 'payment.transaction_reference'),
+                    'amount'                => $this->getFloat($invoice_data, 'invoice.amount'),
+                ],
+            ];
+        } elseif (isset($transformed['amount']) && isset($transformed['balance']) && ($transformed['amount'] != $transformed['balance'])) {
+            $transformed['payments'] = [
+                [
+                    'date'                  => isset($invoice_data['payment.date']) ? date('Y-m-d', strtotime($invoice_data['payment.date'])) : date('y-m-d'),
+                    'transaction_reference' => $this->getString($invoice_data, 'payment.transaction_reference'),
+                    'amount'                => $transformed['amount'] - $transformed['balance'],
+                ],
+            ];
+        }
 
-		$line_items = [];
-		foreach ( $line_items_data as $record ) {
-			$line_items[] = [
-				'quantity'           => $this->getFloat( $record, 'item.quantity' ),
-				'cost'               => $this->getFloat( $record, 'item.cost' ),
-				'product_key'        => $this->getString( $record, 'item.product_key' ),
-				'notes'              => $this->getString( $record, 'item.notes' ),
-				'discount'           => $this->getFloat( $record, 'item.discount' ),
-				'is_amount_discount' => filter_var( $this->getString( $record, 'item.is_amount_discount' ), FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE ),
-				'tax_name1'          => $this->getString( $record, 'item.tax_name1' ),
-				'tax_rate1'          => $this->getFloat( $record, 'item.tax_rate1' ),
-				'tax_name2'          => $this->getString( $record, 'item.tax_name2' ),
-				'tax_rate2'          => $this->getFloat( $record, 'item.tax_rate2' ),
-				'tax_name3'          => $this->getString( $record, 'item.tax_name3' ),
-				'tax_rate3'          => $this->getFloat( $record, 'item.tax_rate3' ),
-				'custom_value1'      => $this->getString( $record, 'item.custom_value1' ),
-				'custom_value2'      => $this->getString( $record, 'item.custom_value2' ),
-				'custom_value3'      => $this->getString( $record, 'item.custom_value3' ),
-				'custom_value4'      => $this->getString( $record, 'item.custom_value4' ),
-				'type_id'            => $this->getInvoiceTypeId( $record, 'item.type_id' ),
-			];
-		}
-		$transformed['line_items'] = $line_items;
+        $line_items = [];
+        foreach ($line_items_data as $record) {
+            $line_items[] = [
+                'quantity'           => $this->getFloat($record, 'item.quantity'),
+                'cost'               => $this->getFloat($record, 'item.cost'),
+                'product_key'        => $this->getString($record, 'item.product_key'),
+                'notes'              => $this->getString($record, 'item.notes'),
+                'discount'           => $this->getFloat($record, 'item.discount'),
+                'is_amount_discount' => filter_var($this->getString($record, 'item.is_amount_discount'), FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE),
+                'tax_name1'          => $this->getString($record, 'item.tax_name1'),
+                'tax_rate1'          => $this->getFloat($record, 'item.tax_rate1'),
+                'tax_name2'          => $this->getString($record, 'item.tax_name2'),
+                'tax_rate2'          => $this->getFloat($record, 'item.tax_rate2'),
+                'tax_name3'          => $this->getString($record, 'item.tax_name3'),
+                'tax_rate3'          => $this->getFloat($record, 'item.tax_rate3'),
+                'custom_value1'      => $this->getString($record, 'item.custom_value1'),
+                'custom_value2'      => $this->getString($record, 'item.custom_value2'),
+                'custom_value3'      => $this->getString($record, 'item.custom_value3'),
+                'custom_value4'      => $this->getString($record, 'item.custom_value4'),
+                'type_id'            => $this->getInvoiceTypeId($record, 'item.type_id'),
+            ];
+        }
+        $transformed['line_items'] = $line_items;
 
-		return $transformed;
-	}
+        return $transformed;
+    }
 }
diff --git a/app/Import/Transformers/Csv/PaymentTransformer.php b/app/Import/Transformers/Csv/PaymentTransformer.php
index 7262179534b4..fa0e391d1526 100644
--- a/app/Import/Transformers/Csv/PaymentTransformer.php
+++ b/app/Import/Transformers/Csv/PaymentTransformer.php
@@ -17,48 +17,49 @@ use App\Import\Transformers\BaseTransformer;
 /**
  * Class PaymentTransformer.
  */
-class PaymentTransformer extends BaseTransformer {
-	/**
-	 * @param $data
-	 *
-	 * @return array
-	 */
-	public function transform( $data ) {
-		$client_id =
-			$this->getClient( $this->getString( $data, 'payment.client_id' ), $this->getString( $data, 'payment.client_id' ) );
+class PaymentTransformer extends BaseTransformer
+{
+    /**
+     * @param $data
+     *
+     * @return array
+     */
+    public function transform($data)
+    {
+        $client_id =
+            $this->getClient($this->getString($data, 'payment.client_id'), $this->getString($data, 'payment.client_id'));
 
-		if ( empty( $client_id ) ) {
-			throw new ImportException( 'Could not find client.' );
-		}
+        if (empty($client_id)) {
+            throw new ImportException('Could not find client.');
+        }
 
-		$transformed = [
-			'company_id'            => $this->maps['company']->id,
-			'number'                => $this->getString( $data, 'payment.number' ),
-			'user_id'               => $this->getString( $data, 'payment.user_id' ),
-			'amount'                => $this->getFloat( $data, 'payment.amount' ),
-			'refunded'              => $this->getFloat( $data, 'payment.refunded' ),
-			'applied'               => $this->getFloat( $data, 'payment.applied' ),
-			'transaction_reference' => $this->getString( $data, 'payment.transaction_reference ' ),
-			'date'                  => $this->getString( $data, 'payment.date' ),
-			'private_notes'         => $this->getString( $data, 'payment.private_notes' ),
-			'custom_value1'         => $this->getString( $data, 'payment.custom_value1' ),
-			'custom_value2'         => $this->getString( $data, 'payment.custom_value2' ),
-			'custom_value3'         => $this->getString( $data, 'payment.custom_value3' ),
-			'custom_value4'         => $this->getString( $data, 'payment.custom_value4' ),
-			'client_id'             => $client_id,
-		];
+        $transformed = [
+            'company_id'            => $this->maps['company']->id,
+            'number'                => $this->getString($data, 'payment.number'),
+            'user_id'               => $this->getString($data, 'payment.user_id'),
+            'amount'                => $this->getFloat($data, 'payment.amount'),
+            'refunded'              => $this->getFloat($data, 'payment.refunded'),
+            'applied'               => $this->getFloat($data, 'payment.applied'),
+            'transaction_reference' => $this->getString($data, 'payment.transaction_reference '),
+            'date'                  => $this->getString($data, 'payment.date'),
+            'private_notes'         => $this->getString($data, 'payment.private_notes'),
+            'custom_value1'         => $this->getString($data, 'payment.custom_value1'),
+            'custom_value2'         => $this->getString($data, 'payment.custom_value2'),
+            'custom_value3'         => $this->getString($data, 'payment.custom_value3'),
+            'custom_value4'         => $this->getString($data, 'payment.custom_value4'),
+            'client_id'             => $client_id,
+        ];
 
+        if (isset($data['payment.invoice_number']) &&
+            $invoice_id = $this->getInvoiceId($data['payment.invoice_number'])) {
+            $transformed['invoices'] = [
+                [
+                    'invoice_id' => $invoice_id,
+                    'amount'     => $transformed['amount'] ?? null,
+                ],
+            ];
+        }
 
-		if ( isset( $data['payment.invoice_number'] ) &&
-			$invoice_id = $this->getInvoiceId( $data['payment.invoice_number'] ) ) {
-			$transformed['invoices'] = [
-				[
-					'invoice_id' => $invoice_id,
-					'amount'     => $transformed['amount'] ?? null,
-				],
-			];
-		}
-
-		return $transformed;
-	}
+        return $transformed;
+    }
 }
diff --git a/app/Import/Transformers/Csv/ProductTransformer.php b/app/Import/Transformers/Csv/ProductTransformer.php
index afa623489174..581259d131bc 100644
--- a/app/Import/Transformers/Csv/ProductTransformer.php
+++ b/app/Import/Transformers/Csv/ProductTransformer.php
@@ -10,7 +10,9 @@
  */
 
 namespace App\Import\Transformers\Csv;
+
 use App\Import\Transformers\BaseTransformer;
+
 /**
  * Class ProductTransformer.
  */
@@ -24,22 +26,22 @@ class ProductTransformer extends BaseTransformer
     public function transform($data)
     {
         return [
-                'company_id' => $this->maps['company']->id,
-                'product_key' => $this->getString($data, 'product.product_key'),
-                'notes' => $this->getString($data, 'product.notes'),
-                'cost' => $this->getFloat($data, 'product.cost'),
-                'price' => $this->getFloat($data, 'product.price'),
-                'quantity' => $this->getFloat($data, 'product.quantity'),
-                'tax_name1' => $this->getString($data, 'product.tax_name1'),
-                'tax_rate1' => $this->getFloat($data, 'product.tax_rate1'),
-                'tax_name2' => $this->getString($data, 'product.tax_name2'),
-                'tax_rate2' => $this->getFloat($data, 'product.tax_rate2'),
-                'tax_name3' => $this->getString($data, 'product.tax_name3'),
-                'tax_rate3' => $this->getFloat($data, 'product.tax_rate3'),
-                'custom_value1' => $this->getString($data, 'product.custom_value1'),
-                'custom_value2' => $this->getString($data, 'product.custom_value2'),
-                'custom_value3' => $this->getString($data, 'product.custom_value3'),
-                'custom_value4' => $this->getString($data, 'product.custom_value4'),
-            ];
+            'company_id' => $this->maps['company']->id,
+            'product_key' => $this->getString($data, 'product.product_key'),
+            'notes' => $this->getString($data, 'product.notes'),
+            'cost' => $this->getFloat($data, 'product.cost'),
+            'price' => $this->getFloat($data, 'product.price'),
+            'quantity' => $this->getFloat($data, 'product.quantity'),
+            'tax_name1' => $this->getString($data, 'product.tax_name1'),
+            'tax_rate1' => $this->getFloat($data, 'product.tax_rate1'),
+            'tax_name2' => $this->getString($data, 'product.tax_name2'),
+            'tax_rate2' => $this->getFloat($data, 'product.tax_rate2'),
+            'tax_name3' => $this->getString($data, 'product.tax_name3'),
+            'tax_rate3' => $this->getFloat($data, 'product.tax_rate3'),
+            'custom_value1' => $this->getString($data, 'product.custom_value1'),
+            'custom_value2' => $this->getString($data, 'product.custom_value2'),
+            'custom_value3' => $this->getString($data, 'product.custom_value3'),
+            'custom_value4' => $this->getString($data, 'product.custom_value4'),
+        ];
     }
 }
diff --git a/app/Import/Transformers/Csv/VendorTransformer.php b/app/Import/Transformers/Csv/VendorTransformer.php
index 73624a43fa7c..6d94f3e9daa3 100644
--- a/app/Import/Transformers/Csv/VendorTransformer.php
+++ b/app/Import/Transformers/Csv/VendorTransformer.php
@@ -1,51 +1,54 @@
 <?php
 
 namespace App\Import\Transformers\Csv;
+
 use App\Import\ImportException;
 use App\Import\Transformers\BaseTransformer;
 
 /**
  * Class VendorTransformer.
  */
-class VendorTransformer extends BaseTransformer {
-	/**
-	 * @param $data
-	 *
-	 * @return array|bool
-	 */
-	public function transform( $data ) {
-		if ( isset( $data->name ) && $this->hasVendor( $data->name ) ) {
-			throw new ImportException('Vendor already exists');
-		}
+class VendorTransformer extends BaseTransformer
+{
+    /**
+     * @param $data
+     *
+     * @return array|bool
+     */
+    public function transform($data)
+    {
+        if (isset($data->name) && $this->hasVendor($data->name)) {
+            throw new ImportException('Vendor already exists');
+        }
 
-		return [
-			'company_id' => $this->maps['company']->id,
-			'name'            => $this->getString( $data, 'vendor.name' ),
-			'phone'           => $this->getString( $data, 'vendor.phone' ),
-			'id_number'       => $this->getString( $data, 'vendor.id_number' ),
-			'vat_number'      => $this->getString( $data, 'vendor.vat_number' ),
-			'website'         => $this->getString( $data, 'vendor.website' ),
-			'currency_id'     => $this->getCurrencyByCode( $data, 'vendor.currency_id' ),
-			'public_notes'    => $this->getString( $data, 'vendor.public_notes' ),
-			'private_notes'   => $this->getString( $data, 'vendor.private_notes' ),
-			'address1'        => $this->getString( $data, 'vendor.address1' ),
-			'address2'        => $this->getString( $data, 'vendor.address2' ),
-			'city'            => $this->getString( $data, 'vendor.city' ),
-			'state'           => $this->getString( $data, 'vendor.state' ),
-			'postal_code'     => $this->getString( $data, 'vendor.postal_code' ),
-			'custom_value1'        => $this->getString( $data, 'vendor.custom_value1' ),
-			'custom_value2'        => $this->getString( $data, 'vendor.custom_value2' ),
-			'custom_value3'        => $this->getString( $data, 'vendor.custom_value3' ),
-			'custom_value4'        => $this->getString( $data, 'vendor.custom_value4' ),
-			'vendor_contacts' => [
-				[
-					'first_name' => $this->getString( $data, 'vendor.first_name' ),
-					'last_name'  => $this->getString( $data, 'vendor.last_name' ),
-					'email'      => $this->getString( $data, 'vendor.email' ),
-					'phone'      => $this->getString( $data, 'vendor.phone' ),
-				],
-			],
-			'country_id'      => isset( $data['vendor.country_id'] ) ? $this->getCountryId( $data['vendor.country_id'] ) : null,
-		];
-	}
+        return [
+            'company_id' => $this->maps['company']->id,
+            'name'            => $this->getString($data, 'vendor.name'),
+            'phone'           => $this->getString($data, 'vendor.phone'),
+            'id_number'       => $this->getString($data, 'vendor.id_number'),
+            'vat_number'      => $this->getString($data, 'vendor.vat_number'),
+            'website'         => $this->getString($data, 'vendor.website'),
+            'currency_id'     => $this->getCurrencyByCode($data, 'vendor.currency_id'),
+            'public_notes'    => $this->getString($data, 'vendor.public_notes'),
+            'private_notes'   => $this->getString($data, 'vendor.private_notes'),
+            'address1'        => $this->getString($data, 'vendor.address1'),
+            'address2'        => $this->getString($data, 'vendor.address2'),
+            'city'            => $this->getString($data, 'vendor.city'),
+            'state'           => $this->getString($data, 'vendor.state'),
+            'postal_code'     => $this->getString($data, 'vendor.postal_code'),
+            'custom_value1'        => $this->getString($data, 'vendor.custom_value1'),
+            'custom_value2'        => $this->getString($data, 'vendor.custom_value2'),
+            'custom_value3'        => $this->getString($data, 'vendor.custom_value3'),
+            'custom_value4'        => $this->getString($data, 'vendor.custom_value4'),
+            'vendor_contacts' => [
+                [
+                    'first_name' => $this->getString($data, 'vendor.first_name'),
+                    'last_name'  => $this->getString($data, 'vendor.last_name'),
+                    'email'      => $this->getString($data, 'vendor.email'),
+                    'phone'      => $this->getString($data, 'vendor.phone'),
+                ],
+            ],
+            'country_id'      => isset($data['vendor.country_id']) ? $this->getCountryId($data['vendor.country_id']) : null,
+        ];
+    }
 }
diff --git a/app/Import/Transformers/Freshbooks/ClientTransformer.php b/app/Import/Transformers/Freshbooks/ClientTransformer.php
index 24936b9d7fef..bfa8743ed62d 100644
--- a/app/Import/Transformers/Freshbooks/ClientTransformer.php
+++ b/app/Import/Transformers/Freshbooks/ClientTransformer.php
@@ -18,38 +18,40 @@ use Illuminate\Support\Str;
 /**
  * Class ClientTransformer.
  */
-class ClientTransformer extends BaseTransformer {
-	/**
-	 * @param $data
-	 *
-	 * @return array|bool
-	 */
-	public function transform( $data ) {
-		if ( isset( $data['Organization'] ) && $this->hasClient( $data['Organization'] ) ) {
-			throw new ImportException('Client already exists');
-		}
+class ClientTransformer extends BaseTransformer
+{
+    /**
+     * @param $data
+     *
+     * @return array|bool
+     */
+    public function transform($data)
+    {
+        if (isset($data['Organization']) && $this->hasClient($data['Organization'])) {
+            throw new ImportException('Client already exists');
+        }
 
-		return [
-			'company_id'     => $this->maps['company']->id,
-			'name'           => $this->getString( $data, 'Organization' ),
-			'work_phone'     => $this->getString( $data, 'Phone' ),
-			'address1'       => $this->getString( $data, 'Street' ),
-			'city'           => $this->getString( $data, 'City' ),
-			'state'          => $this->getString( $data, 'Province/State' ),
-			'postal_code'    => $this->getString( $data, 'Postal Code' ),
-			'country_id'     => isset( $data['Country'] ) ? $this->getCountryId( $data['Country'] ) : null,
-			'private_notes'   => $this->getString( $data, 'Notes' ),
-			'credit_balance' => 0,
-			'settings'       => new \stdClass,
-			'client_hash'    => Str::random( 40 ),
-			'contacts'       => [
-				[
-					'first_name'    => $this->getString( $data, 'First Name' ),
-					'last_name'     => $this->getString( $data, 'Last Name' ),
-					'email'         => $this->getString( $data, 'Email' ),
-					'phone'         => $this->getString( $data, 'Phone' ),
-				],
-			],
-		];
-	}
+        return [
+            'company_id'     => $this->maps['company']->id,
+            'name'           => $this->getString($data, 'Organization'),
+            'work_phone'     => $this->getString($data, 'Phone'),
+            'address1'       => $this->getString($data, 'Street'),
+            'city'           => $this->getString($data, 'City'),
+            'state'          => $this->getString($data, 'Province/State'),
+            'postal_code'    => $this->getString($data, 'Postal Code'),
+            'country_id'     => isset($data['Country']) ? $this->getCountryId($data['Country']) : null,
+            'private_notes'   => $this->getString($data, 'Notes'),
+            'credit_balance' => 0,
+            'settings'       => new \stdClass,
+            'client_hash'    => Str::random(40),
+            'contacts'       => [
+                [
+                    'first_name'    => $this->getString($data, 'First Name'),
+                    'last_name'     => $this->getString($data, 'Last Name'),
+                    'email'         => $this->getString($data, 'Email'),
+                    'phone'         => $this->getString($data, 'Phone'),
+                ],
+            ],
+        ];
+    }
 }
diff --git a/app/Import/Transformers/Freshbooks/InvoiceTransformer.php b/app/Import/Transformers/Freshbooks/InvoiceTransformer.php
index 4170798fcf08..8a53262b4cf8 100644
--- a/app/Import/Transformers/Freshbooks/InvoiceTransformer.php
+++ b/app/Import/Transformers/Freshbooks/InvoiceTransformer.php
@@ -19,68 +19,69 @@ use App\Utils\Number;
 /**
  * Class InvoiceTransformer.
  */
-class InvoiceTransformer extends BaseTransformer {
-	/**
-	 * @param $line_items_data
-	 *
-	 * @return bool|array
-	 */
-	public function transform( $line_items_data ) {
-		$invoice_data = reset( $line_items_data );
+class InvoiceTransformer extends BaseTransformer
+{
+    /**
+     * @param $line_items_data
+     *
+     * @return bool|array
+     */
+    public function transform($line_items_data)
+    {
+        $invoice_data = reset($line_items_data);
 
-		if ( $this->hasInvoice( $invoice_data['Invoice #'] ) ) {
-			throw new ImportException( 'Invoice number already exists' );
-		}
+        if ($this->hasInvoice($invoice_data['Invoice #'])) {
+            throw new ImportException('Invoice number already exists');
+        }
 
-		$invoiceStatusMap = [
-			'sent'  => Invoice::STATUS_SENT,
-			'draft' => Invoice::STATUS_DRAFT,
-		];
+        $invoiceStatusMap = [
+            'sent'  => Invoice::STATUS_SENT,
+            'draft' => Invoice::STATUS_DRAFT,
+        ];
 
-		$transformed = [
-			'company_id'  => $this->maps['company']->id,
-			'client_id'   => $this->getClient( $this->getString( $invoice_data, 'Client Name' ), null ),
-			'number'      => $this->getString( $invoice_data, 'Invoice #' ),
-			'date'        => isset( $invoice_data['Date Issued'] ) ? date( 'Y-m-d', strtotime( $invoice_data['Date Issued'] ) ) : null,
-			'currency_id' => $this->getCurrencyByCode( $invoice_data, 'Currency' ),
-			'amount'      => 0,
-			'status_id'   => $invoiceStatusMap[ $status =
-					strtolower( $this->getString( $invoice_data, 'Invoice Status' ) ) ] ?? Invoice::STATUS_SENT,
-			// 'viewed'      => $status === 'viewed',
-		];
+        $transformed = [
+            'company_id'  => $this->maps['company']->id,
+            'client_id'   => $this->getClient($this->getString($invoice_data, 'Client Name'), null),
+            'number'      => $this->getString($invoice_data, 'Invoice #'),
+            'date'        => isset($invoice_data['Date Issued']) ? date('Y-m-d', strtotime($invoice_data['Date Issued'])) : null,
+            'currency_id' => $this->getCurrencyByCode($invoice_data, 'Currency'),
+            'amount'      => 0,
+            'status_id'   => $invoiceStatusMap[$status =
+                    strtolower($this->getString($invoice_data, 'Invoice Status'))] ?? Invoice::STATUS_SENT,
+            // 'viewed'      => $status === 'viewed',
+        ];
 
-		$line_items = [];
-		foreach ( $line_items_data as $record ) {
-			$line_items[]          = [
-				'product_key'        => $this->getString( $record, 'Item Name' ),
-				'notes'              => $this->getString( $record, 'Item Description' ),
-				'cost'               => $this->getFreshbookQuantityFloat( $record, 'Rate' ),
-				'quantity'           => $this->getFreshbookQuantityFloat( $record, 'Quantity' ),
-				'discount'           => $this->getFreshbookQuantityFloat( $record, 'Discount Percentage' ),
-				'is_amount_discount' => false,
-				'tax_name1'          => $this->getString( $record, 'Tax 1 Type' ),
-				'tax_rate1'          => $this->getFreshbookQuantityFloat( $record, 'Tax 1 Amount' ),
-				'tax_name2'          => $this->getString( $record, 'Tax 2 Type' ),
-				'tax_rate2'          => $this->getFreshbookQuantityFloat( $record, 'Tax 2 Amount' ),
-			];
-			$transformed['amount'] += $this->getFreshbookQuantityFloat( $record, 'Line Total' );
-		}
-		$transformed['line_items'] = $line_items;
+        $line_items = [];
+        foreach ($line_items_data as $record) {
+            $line_items[] = [
+                'product_key'        => $this->getString($record, 'Item Name'),
+                'notes'              => $this->getString($record, 'Item Description'),
+                'cost'               => $this->getFreshbookQuantityFloat($record, 'Rate'),
+                'quantity'           => $this->getFreshbookQuantityFloat($record, 'Quantity'),
+                'discount'           => $this->getFreshbookQuantityFloat($record, 'Discount Percentage'),
+                'is_amount_discount' => false,
+                'tax_name1'          => $this->getString($record, 'Tax 1 Type'),
+                'tax_rate1'          => $this->getFreshbookQuantityFloat($record, 'Tax 1 Amount'),
+                'tax_name2'          => $this->getString($record, 'Tax 2 Type'),
+                'tax_rate2'          => $this->getFreshbookQuantityFloat($record, 'Tax 2 Amount'),
+            ];
+            $transformed['amount'] += $this->getFreshbookQuantityFloat($record, 'Line Total');
+        }
+        $transformed['line_items'] = $line_items;
 
-		if ( ! empty( $invoice_data['Date Paid'] ) ) {
-			$transformed['payments'] = [[
-				'date'   => date( 'Y-m-d', strtotime( $invoice_data['Date Paid'] ) ),
-				'amount' => $transformed['amount'],
-			]];
-		}
+        if (! empty($invoice_data['Date Paid'])) {
+            $transformed['payments'] = [[
+                'date'   => date('Y-m-d', strtotime($invoice_data['Date Paid'])),
+                'amount' => $transformed['amount'],
+            ]];
+        }
 
-		return $transformed;
-	}
-
-	/** @return float  */
-	public function getFreshbookQuantityFloat($data, $field)
-	{
-		return $data[$field];
-	}
+        return $transformed;
+    }
 
+    /** @return float  */
+    public function getFreshbookQuantityFloat($data, $field)
+    {
+        return $data[$field];
+    }
 }
diff --git a/app/Import/Transformers/Invoice2Go/InvoiceTransformer.php b/app/Import/Transformers/Invoice2Go/InvoiceTransformer.php
index 53993c656b52..1dc59e55170c 100644
--- a/app/Import/Transformers/Invoice2Go/InvoiceTransformer.php
+++ b/app/Import/Transformers/Invoice2Go/InvoiceTransformer.php
@@ -19,71 +19,73 @@ use Illuminate\Support\Str;
 /**
  * Class InvoiceTransformer.
  */
-class InvoiceTransformer extends BaseTransformer {
-	/**
-	 * @param $line_items_data
-	 *
-	 * @return bool|array
-	 */
-	public function transform( $invoice_data ) {
-		if ( $this->hasInvoice( $invoice_data['DocumentNumber'] ) ) {
-			throw new ImportException( 'Invoice number already exists' );
-		}
+class InvoiceTransformer extends BaseTransformer
+{
+    /**
+     * @param $line_items_data
+     *
+     * @return bool|array
+     */
+    public function transform($invoice_data)
+    {
+        if ($this->hasInvoice($invoice_data['DocumentNumber'])) {
+            throw new ImportException('Invoice number already exists');
+        }
 
-		$invoiceStatusMap = [
-			'unsent' => Invoice::STATUS_DRAFT,
-			'sent'   => Invoice::STATUS_SENT,
-		];
+        $invoiceStatusMap = [
+            'unsent' => Invoice::STATUS_DRAFT,
+            'sent'   => Invoice::STATUS_SENT,
+        ];
 
-		$transformed = [
-			'company_id'  => $this->maps['company']->id,
-			'number'      => $this->getString( $invoice_data, 'DocumentNumber' ),
-			'notes'       => $this->getString( $invoice_data, 'Comment' ),
-			'date'        => isset( $invoice_data['DocumentDate'] ) ? date( 'Y-m-d', strtotime( $invoice_data['DocumentDate'] ) ) : null,
-			'currency_id' => $this->getCurrencyByCode( $invoice_data, 'Currency' ),
-			'amount'      => 0,
-			'status_id'   => $invoiceStatusMap[ $status =
-					strtolower( $this->getString( $invoice_data, 'DocumentStatus' ) ) ] ?? Invoice::STATUS_SENT,
-			// 'viewed'      => $status === 'viewed',
-			'line_items'  => [
-				[
-					'amount'             => $amount = $this->getFloat( $invoice_data, 'TotalAmount' ),
-					'quantity'           => 1,
-					'discount'           => $this->getFloat( $invoice_data, 'DiscountValue' ),
-					'is_amount_discount' => false,
-				],
-			],
-		];
+        $transformed = [
+            'company_id'  => $this->maps['company']->id,
+            'number'      => $this->getString($invoice_data, 'DocumentNumber'),
+            'notes'       => $this->getString($invoice_data, 'Comment'),
+            'date'        => isset($invoice_data['DocumentDate']) ? date('Y-m-d', strtotime($invoice_data['DocumentDate'])) : null,
+            'currency_id' => $this->getCurrencyByCode($invoice_data, 'Currency'),
+            'amount'      => 0,
+            'status_id'   => $invoiceStatusMap[$status =
+                    strtolower($this->getString($invoice_data, 'DocumentStatus'))] ?? Invoice::STATUS_SENT,
+            // 'viewed'      => $status === 'viewed',
+            'line_items'  => [
+                [
+                    'amount'             => $amount = $this->getFloat($invoice_data, 'TotalAmount'),
+                    'quantity'           => 1,
+                    'discount'           => $this->getFloat($invoice_data, 'DiscountValue'),
+                    'is_amount_discount' => false,
+                ],
+            ],
+        ];
 
-		$client_id =
-			$this->getClient( $this->getString( $invoice_data, 'Name' ), $this->getString( $invoice_data, 'EmailRecipient' ) );
+        $client_id =
+            $this->getClient($this->getString($invoice_data, 'Name'), $this->getString($invoice_data, 'EmailRecipient'));
 
-		if ( $client_id ) {
-			$transformed['client_id'] = $client_id;
-		} else {
-			$transformed['client'] = [
-				'name'              => $this->getString( $invoice_data, 'Name' ),
-				'address1'          => $this->getString( $invoice_data, 'DocumentRecipientAddress' ),
-				'shipping_address1' => $this->getString( $invoice_data, 'ShipAddress' ),
-				'credit_balance'    => 0,
-				'settings'          => new \stdClass,
-				'client_hash'       => Str::random( 40 ),
-				'contacts'          => [
-					[
-						'email' => $this->getString( $invoice_data, 'Email' ),
-					],
-				],
-			];
-		}
-		if ( ! empty( $invoice_data['Date Paid'] ) ) {
-			$transformed['payments'] = [
-				[
-					'date'   => date( 'Y-m-d', strtotime( $invoice_data['DatePaid'] ) ),
-					'amount' => $this->getFloat( $invoice_data, 'Payments' ),
-				],
-			];
-		}
+        if ($client_id) {
+            $transformed['client_id'] = $client_id;
+        } else {
+            $transformed['client'] = [
+                'name'              => $this->getString($invoice_data, 'Name'),
+                'address1'          => $this->getString($invoice_data, 'DocumentRecipientAddress'),
+                'shipping_address1' => $this->getString($invoice_data, 'ShipAddress'),
+                'credit_balance'    => 0,
+                'settings'          => new \stdClass,
+                'client_hash'       => Str::random(40),
+                'contacts'          => [
+                    [
+                        'email' => $this->getString($invoice_data, 'Email'),
+                    ],
+                ],
+            ];
+        }
+        if (! empty($invoice_data['Date Paid'])) {
+            $transformed['payments'] = [
+                [
+                    'date'   => date('Y-m-d', strtotime($invoice_data['DatePaid'])),
+                    'amount' => $this->getFloat($invoice_data, 'Payments'),
+                ],
+            ];
+        }
 
-		return $transformed;
-	}
+        return $transformed;
+    }
 }
diff --git a/app/Import/Transformers/InvoiceItemTransformer.php b/app/Import/Transformers/InvoiceItemTransformer.php
index 34d854cd2b8a..acfbb9d9f6a9 100644
--- a/app/Import/Transformers/InvoiceItemTransformer.php
+++ b/app/Import/Transformers/InvoiceItemTransformer.php
@@ -24,23 +24,23 @@ class InvoiceItemTransformer extends BaseTransformer
     public function transform($data)
     {
         return [
-                'quantity' => $this->getFloat($data, 'item.quantity'),
-                'cost' => $this->getFloat($data, 'item.cost'),
-                'product_key' => $this->getString($data, 'item.product_key'),
-                'notes' => $this->getString($data, 'item.notes'),
-                'discount' => $this->getFloat($data, 'item.discount'),
-                'is_amount_discount' => $this->getString($data, 'item.is_amount_discount'),
-                'tax_name1' => $this->getString($data, 'item.tax_name1'),
-                'tax_rate1' => $this->getFloat($data, 'item.tax_rate1'),
-                'tax_name2' => $this->getString($data, 'item.tax_name2'),
-                'tax_rate2' => $this->getFloat($data, 'item.tax_rate2'),
-                'tax_name3' => $this->getString($data, 'item.tax_name3'),
-                'tax_rate3' => $this->getFloat($data, 'item.tax_rate3'),
-                'custom_value1' => $this->getString($data, 'item.custom_value1'),
-                'custom_value2' => $this->getString($data, 'item.custom_value2'),
-                'custom_value3' => $this->getString($data, 'item.custom_value3'),
-                'custom_value4' => $this->getString($data, 'item.custom_value4'),
-                'type_id' => $this->getInvoiceTypeId($data, 'item.type_id'),
-            ];
+            'quantity' => $this->getFloat($data, 'item.quantity'),
+            'cost' => $this->getFloat($data, 'item.cost'),
+            'product_key' => $this->getString($data, 'item.product_key'),
+            'notes' => $this->getString($data, 'item.notes'),
+            'discount' => $this->getFloat($data, 'item.discount'),
+            'is_amount_discount' => $this->getString($data, 'item.is_amount_discount'),
+            'tax_name1' => $this->getString($data, 'item.tax_name1'),
+            'tax_rate1' => $this->getFloat($data, 'item.tax_rate1'),
+            'tax_name2' => $this->getString($data, 'item.tax_name2'),
+            'tax_rate2' => $this->getFloat($data, 'item.tax_rate2'),
+            'tax_name3' => $this->getString($data, 'item.tax_name3'),
+            'tax_rate3' => $this->getFloat($data, 'item.tax_rate3'),
+            'custom_value1' => $this->getString($data, 'item.custom_value1'),
+            'custom_value2' => $this->getString($data, 'item.custom_value2'),
+            'custom_value3' => $this->getString($data, 'item.custom_value3'),
+            'custom_value4' => $this->getString($data, 'item.custom_value4'),
+            'type_id' => $this->getInvoiceTypeId($data, 'item.type_id'),
+        ];
     }
 }
diff --git a/app/Import/Transformers/InvoiceTransformer.php b/app/Import/Transformers/InvoiceTransformer.php
index 2942866ddadb..46f949c1e813 100644
--- a/app/Import/Transformers/InvoiceTransformer.php
+++ b/app/Import/Transformers/InvoiceTransformer.php
@@ -24,38 +24,38 @@ class InvoiceTransformer extends BaseTransformer
     public function transform($data)
     {
         return [
-                'company_id' => $this->maps['company']->id,
-                'number' => $this->getString($data, 'invoice.number'),
-                'user_id' => $this->getString($data, 'invoice.user_id'),
-                'amount' => $this->getFloat($data, 'invoice.amount'),
-                'balance' => $this->getFloat($data, 'invoice.balance'),
-                'client_id' => $this->getClient($this->getString($data, 'client.name'), $this->getString($data, 'client.email')),
-                'discount' => $this->getFloat($data, 'invoice.discount'),
-                'po_number' => $this->getString($data, 'invoice.po_number'),
-                'date' => $this->getString($data, 'invoice.date'),
-                'due_date' => $this->getString($data, 'invoice.due_date'),
-                'terms' => $this->getString($data, 'invoice.terms'),
-                'public_notes' => $this->getString($data, 'invoice.public_notes'),
-                'is_sent' => $this->getString($data, 'invoice.is_sent'),
-                'private_notes' => $this->getString($data, 'invoice.private_notes'),
-                'tax_name1' => $this->getString($data, 'invoice.tax_name1'),
-                'tax_rate1' => $this->getFloat($data, 'invoice.tax_rate1'),
-                'tax_name2' => $this->getString($data, 'invoice.tax_name2'),
-                'tax_rate2' => $this->getFloat($data, 'invoice.tax_rate2'),
-                'tax_name3' => $this->getString($data, 'invoice.tax_name3'),
-                'tax_rate3' => $this->getFloat($data, 'invoice.tax_rate3'),
-                'custom_value1' => $this->getString($data, 'invoice.custom_value1'),
-                'custom_value2' => $this->getString($data, 'invoice.custom_value2'),
-                'custom_value3' => $this->getString($data, 'invoice.custom_value3'),
-                'custom_value4' => $this->getString($data, 'invoice.custom_value4'),
-                'footer' => $this->getString($data, 'invoice.footer'),
-                'partial' => $this->getFloat($data, 'invoice.partial'),
-                'partial_due_date' => $this->getString($data, 'invoice.partial_due_date'),
-                'custom_surcharge1' => $this->getString($data, 'invoice.custom_surcharge1'),
-                'custom_surcharge2' => $this->getString($data, 'invoice.custom_surcharge2'),
-                'custom_surcharge3' => $this->getString($data, 'invoice.custom_surcharge3'),
-                'custom_surcharge4' => $this->getString($data, 'invoice.custom_surcharge4'),
-                'exchange_rate' => $this->getString($data, 'invoice.exchange_rate'),
-            ];
+            'company_id' => $this->maps['company']->id,
+            'number' => $this->getString($data, 'invoice.number'),
+            'user_id' => $this->getString($data, 'invoice.user_id'),
+            'amount' => $this->getFloat($data, 'invoice.amount'),
+            'balance' => $this->getFloat($data, 'invoice.balance'),
+            'client_id' => $this->getClient($this->getString($data, 'client.name'), $this->getString($data, 'client.email')),
+            'discount' => $this->getFloat($data, 'invoice.discount'),
+            'po_number' => $this->getString($data, 'invoice.po_number'),
+            'date' => $this->getString($data, 'invoice.date'),
+            'due_date' => $this->getString($data, 'invoice.due_date'),
+            'terms' => $this->getString($data, 'invoice.terms'),
+            'public_notes' => $this->getString($data, 'invoice.public_notes'),
+            'is_sent' => $this->getString($data, 'invoice.is_sent'),
+            'private_notes' => $this->getString($data, 'invoice.private_notes'),
+            'tax_name1' => $this->getString($data, 'invoice.tax_name1'),
+            'tax_rate1' => $this->getFloat($data, 'invoice.tax_rate1'),
+            'tax_name2' => $this->getString($data, 'invoice.tax_name2'),
+            'tax_rate2' => $this->getFloat($data, 'invoice.tax_rate2'),
+            'tax_name3' => $this->getString($data, 'invoice.tax_name3'),
+            'tax_rate3' => $this->getFloat($data, 'invoice.tax_rate3'),
+            'custom_value1' => $this->getString($data, 'invoice.custom_value1'),
+            'custom_value2' => $this->getString($data, 'invoice.custom_value2'),
+            'custom_value3' => $this->getString($data, 'invoice.custom_value3'),
+            'custom_value4' => $this->getString($data, 'invoice.custom_value4'),
+            'footer' => $this->getString($data, 'invoice.footer'),
+            'partial' => $this->getFloat($data, 'invoice.partial'),
+            'partial_due_date' => $this->getString($data, 'invoice.partial_due_date'),
+            'custom_surcharge1' => $this->getString($data, 'invoice.custom_surcharge1'),
+            'custom_surcharge2' => $this->getString($data, 'invoice.custom_surcharge2'),
+            'custom_surcharge3' => $this->getString($data, 'invoice.custom_surcharge3'),
+            'custom_surcharge4' => $this->getString($data, 'invoice.custom_surcharge4'),
+            'exchange_rate' => $this->getString($data, 'invoice.exchange_rate'),
+        ];
     }
 }
diff --git a/app/Import/Transformers/Invoicely/ClientTransformer.php b/app/Import/Transformers/Invoicely/ClientTransformer.php
index a8801535c838..ddf3645b3610 100644
--- a/app/Import/Transformers/Invoicely/ClientTransformer.php
+++ b/app/Import/Transformers/Invoicely/ClientTransformer.php
@@ -18,31 +18,33 @@ use Illuminate\Support\Str;
 /**
  * Class ClientTransformer.
  */
-class ClientTransformer extends BaseTransformer {
-	/**
-	 * @param $data
-	 *
-	 * @return array|bool
-	 */
-	public function transform( $data ) {
-		if ( isset( $data['Client Name'] ) && $this->hasClient( $data['Client Name'] ) ) {
-			throw new ImportException('Client already exists');
-		}
+class ClientTransformer extends BaseTransformer
+{
+    /**
+     * @param $data
+     *
+     * @return array|bool
+     */
+    public function transform($data)
+    {
+        if (isset($data['Client Name']) && $this->hasClient($data['Client Name'])) {
+            throw new ImportException('Client already exists');
+        }
 
-		return [
-			'company_id'     => $this->maps['company']->id,
-			'name'           => $this->getString( $data, 'Client Name' ),
-			'work_phone'     => $this->getString( $data, 'Phone' ),
-			'country_id'     => isset( $data['Country'] ) ? $this->getCountryIdBy2( $data['Country'] ) : null,
-			'credit_balance' => 0,
-			'settings'       => new \stdClass,
-			'client_hash'    => Str::random( 40 ),
-			'contacts'       => [
-				[
-					'email'         => $this->getString( $data, 'Email' ),
-					'phone'         => $this->getString( $data, 'Phone' ),
-				],
-			],
-		];
-	}
+        return [
+            'company_id'     => $this->maps['company']->id,
+            'name'           => $this->getString($data, 'Client Name'),
+            'work_phone'     => $this->getString($data, 'Phone'),
+            'country_id'     => isset($data['Country']) ? $this->getCountryIdBy2($data['Country']) : null,
+            'credit_balance' => 0,
+            'settings'       => new \stdClass,
+            'client_hash'    => Str::random(40),
+            'contacts'       => [
+                [
+                    'email'         => $this->getString($data, 'Email'),
+                    'phone'         => $this->getString($data, 'Phone'),
+                ],
+            ],
+        ];
+    }
 }
diff --git a/app/Import/Transformers/Invoicely/InvoiceTransformer.php b/app/Import/Transformers/Invoicely/InvoiceTransformer.php
index c33716e45dc9..9e7c457c08d3 100644
--- a/app/Import/Transformers/Invoicely/InvoiceTransformer.php
+++ b/app/Import/Transformers/Invoicely/InvoiceTransformer.php
@@ -18,41 +18,43 @@ use App\Models\Invoice;
 /**
  * Class InvoiceTransformer.
  */
-class InvoiceTransformer extends BaseTransformer {
-	/**
-	 * @param $data
-	 *
-	 * @return bool|array
-	 */
-	public function transform( $data ) {
-		if ( $this->hasInvoice( $data['Details'] ) ) {
-			throw new ImportException( 'Invoice number already exists' );
-		}
+class InvoiceTransformer extends BaseTransformer
+{
+    /**
+     * @param $data
+     *
+     * @return bool|array
+     */
+    public function transform($data)
+    {
+        if ($this->hasInvoice($data['Details'])) {
+            throw new ImportException('Invoice number already exists');
+        }
 
-		$transformed = [
-			'company_id' => $this->maps['company']->id,
-			'client_id'  => $this->getClient( $this->getString( $data, 'Client' ), null ),
-			'number'     => $this->getString( $data, 'Details' ),
-			'date'       => isset( $data['Date'] ) ? date( 'Y-m-d', strtotime( $data['Date'] ) ) : null,
-			'due_date'   => isset( $data['Due'] ) ? date( 'Y-m-d', strtotime( $data['Due'] ) ) : null,
-			'status_id'  => Invoice::STATUS_SENT,
-			'line_items' => [
-				[
-					'cost'     => $amount = $this->getFloat( $data, 'Total' ),
-					'quantity' => 1,
-				],
-			],
-		];
+        $transformed = [
+            'company_id' => $this->maps['company']->id,
+            'client_id'  => $this->getClient($this->getString($data, 'Client'), null),
+            'number'     => $this->getString($data, 'Details'),
+            'date'       => isset($data['Date']) ? date('Y-m-d', strtotime($data['Date'])) : null,
+            'due_date'   => isset($data['Due']) ? date('Y-m-d', strtotime($data['Due'])) : null,
+            'status_id'  => Invoice::STATUS_SENT,
+            'line_items' => [
+                [
+                    'cost'     => $amount = $this->getFloat($data, 'Total'),
+                    'quantity' => 1,
+                ],
+            ],
+        ];
 
-		if ( strtolower( $data['Status'] ) === 'paid' ) {
-			$transformed['payments'] = [
-				[
-					'date'   => date( 'Y-m-d' ),
-					'amount' => $amount,
-				],
-			];
-		}
+        if (strtolower($data['Status']) === 'paid') {
+            $transformed['payments'] = [
+                [
+                    'date'   => date('Y-m-d'),
+                    'amount' => $amount,
+                ],
+            ];
+        }
 
-		return $transformed;
-	}
+        return $transformed;
+    }
 }
diff --git a/app/Import/Transformers/PaymentTransformer.php b/app/Import/Transformers/PaymentTransformer.php
index bcac94d2b64b..03fffa3d7595 100644
--- a/app/Import/Transformers/PaymentTransformer.php
+++ b/app/Import/Transformers/PaymentTransformer.php
@@ -24,23 +24,23 @@ class PaymentTransformer extends BaseTransformer
     public function transform($data)
     {
         return [
-                'company_id' => $this->maps['company']->id,
-                'number' => $this->getString($data, 'payment.number'),
-                'user_id' => $this->getString($data, 'payment.user_id'),
-                'amount' =>  $this->getFloat($data, 'payment.amount'),
-                'refunded' =>  $this->getFloat($data, 'payment.refunded'),
-                'applied' =>  $this->getFloat($data, 'payment.applied'),
-                'transaction_reference' => $this->getString($data, 'payment.transaction_reference '),
-                'date' => $this->getString($data, 'payment.date'),
-                'private_notes' =>  $this->getString($data, 'payment.private_notes'),
-                'number' =>  $this->getString($data, 'number'),
-                'custom_value1' =>  $this->getString($data, 'custom_value1'),
-                'custom_value2' =>  $this->getString($data, 'custom_value2'),
-                'custom_value3' =>  $this->getString($data, 'custom_value3'),
-                'custom_value4' =>  $this->getString($data, 'custom_value4'),
-                'client_id' =>  $this->getString($data, 'client_id'),
-                'invoice_number' => $this->getString($data, 'payment.invoice_number'),
-                'method' => $this
-            ];
+            'company_id' => $this->maps['company']->id,
+            'number' => $this->getString($data, 'payment.number'),
+            'user_id' => $this->getString($data, 'payment.user_id'),
+            'amount' =>  $this->getFloat($data, 'payment.amount'),
+            'refunded' =>  $this->getFloat($data, 'payment.refunded'),
+            'applied' =>  $this->getFloat($data, 'payment.applied'),
+            'transaction_reference' => $this->getString($data, 'payment.transaction_reference '),
+            'date' => $this->getString($data, 'payment.date'),
+            'private_notes' =>  $this->getString($data, 'payment.private_notes'),
+            'number' =>  $this->getString($data, 'number'),
+            'custom_value1' =>  $this->getString($data, 'custom_value1'),
+            'custom_value2' =>  $this->getString($data, 'custom_value2'),
+            'custom_value3' =>  $this->getString($data, 'custom_value3'),
+            'custom_value4' =>  $this->getString($data, 'custom_value4'),
+            'client_id' =>  $this->getString($data, 'client_id'),
+            'invoice_number' => $this->getString($data, 'payment.invoice_number'),
+            'method' => $this,
+        ];
     }
 }
diff --git a/app/Import/Transformers/Waveaccounting/ClientTransformer.php b/app/Import/Transformers/Waveaccounting/ClientTransformer.php
index f52d2edb6236..a19616f968f1 100644
--- a/app/Import/Transformers/Waveaccounting/ClientTransformer.php
+++ b/app/Import/Transformers/Waveaccounting/ClientTransformer.php
@@ -18,57 +18,58 @@ use Illuminate\Support\Str;
 /**
  * Class ClientTransformer.
  */
-class ClientTransformer extends BaseTransformer {
-	/**
-	 * @param $data
-	 *
-	 * @return array|bool
-	 */
-	public function transform( $data ) {
-		if ( isset( $data['customer_name'] ) && $this->hasClient( $data['customer_name'] ) ) {
-			throw new ImportException('Client already exists');
-		}
+class ClientTransformer extends BaseTransformer
+{
+    /**
+     * @param $data
+     *
+     * @return array|bool
+     */
+    public function transform($data)
+    {
+        if (isset($data['customer_name']) && $this->hasClient($data['customer_name'])) {
+            throw new ImportException('Client already exists');
+        }
 
-		$settings              = new \stdClass;
-		$settings->currency_id = (string) $this->getCurrencyByCode( $data, 'customer_currency' );
+        $settings = new \stdClass;
+        $settings->currency_id = (string) $this->getCurrencyByCode($data, 'customer_currency');
 
-		if ( strval( $data['Payment Terms'] ?? '' ) > 0 ) {
-			$settings->payment_terms = $data['Payment Terms'];
-		}
+        if (strval($data['Payment Terms'] ?? '') > 0) {
+            $settings->payment_terms = $data['Payment Terms'];
+        }
 
-		return [
-			'company_id'     => $this->maps['company']->id,
-			'name'           => $this->getString( $data, 'customer_name' ),
-			'number'           => $this->getString( $data, 'account_number' ),
-			'work_phone'     => $this->getString( $data, 'phone' ),
-			'website'     => $this->getString( $data, 'website' ),
-			'country_id'     => !empty( $data['country'] ) ? $this->getCountryId( $data['country'] ) : null,
-			'state'          => $this->getString( $data, 'province/state' ),
-			'address1'       => $this->getString( $data, 'address_line_1' ),
-			'address2'       => $this->getString( $data, 'address_line_2' ),
-			'city'           => $this->getString( $data, 'city' ),
-			'postal_code'    => $this->getString( $data, 'postal_code/zip_code' ),
+        return [
+            'company_id'     => $this->maps['company']->id,
+            'name'           => $this->getString($data, 'customer_name'),
+            'number'           => $this->getString($data, 'account_number'),
+            'work_phone'     => $this->getString($data, 'phone'),
+            'website'     => $this->getString($data, 'website'),
+            'country_id'     => ! empty($data['country']) ? $this->getCountryId($data['country']) : null,
+            'state'          => $this->getString($data, 'province/state'),
+            'address1'       => $this->getString($data, 'address_line_1'),
+            'address2'       => $this->getString($data, 'address_line_2'),
+            'city'           => $this->getString($data, 'city'),
+            'postal_code'    => $this->getString($data, 'postal_code/zip_code'),
 
+            'shipping_country_id'     => ! empty($data['ship-to_country']) ? $this->getCountryId($data['country']) : null,
+            'shipping_state'          => $this->getString($data, 'ship-to_province/state'),
+            'shipping_address1'       => $this->getString($data, 'ship-to_address_line_1'),
+            'shipping_address2'       => $this->getString($data, 'ship-to_address_line_2'),
+            'shipping_city'           => $this->getString($data, 'ship-to_city'),
+            'shipping_postal_code'    => $this->getString($data, 'ship-to_postal_code/zip_code'),
+            'public_notes'    => $this->getString($data, 'delivery_instructions'),
 
-			'shipping_country_id'     => !empty( $data['ship-to_country'] ) ? $this->getCountryId( $data['country'] ) : null,
-			'shipping_state'          => $this->getString( $data, 'ship-to_province/state' ),
-			'shipping_address1'       => $this->getString( $data, 'ship-to_address_line_1' ),
-			'shipping_address2'       => $this->getString( $data, 'ship-to_address_line_2' ),
-			'shipping_city'           => $this->getString( $data, 'ship-to_city' ),
-			'shipping_postal_code'    => $this->getString( $data, 'ship-to_postal_code/zip_code' ),
-			'public_notes'    => $this->getString( $data, 'delivery_instructions' ),
-
-			'credit_balance' => 0,
-			'settings'       =>$settings,
-			'client_hash'    => Str::random( 40 ),
-			'contacts'       => [
-				[
-					'first_name'    => $this->getString( $data, 'contact_first_name' ),
-					'last_name'     => $this->getString( $data, 'contact_last_name' ),
-					'email'         => $this->getString( $data, 'email' ),
-					'phone'         => $this->getString( $data, 'phone' ),
-				],
-			],
-		];
-	}
+            'credit_balance' => 0,
+            'settings'       =>$settings,
+            'client_hash'    => Str::random(40),
+            'contacts'       => [
+                [
+                    'first_name'    => $this->getString($data, 'contact_first_name'),
+                    'last_name'     => $this->getString($data, 'contact_last_name'),
+                    'email'         => $this->getString($data, 'email'),
+                    'phone'         => $this->getString($data, 'phone'),
+                ],
+            ],
+        ];
+    }
 }
diff --git a/app/Import/Transformers/Waveaccounting/InvoiceTransformer.php b/app/Import/Transformers/Waveaccounting/InvoiceTransformer.php
index f365b197ec28..5f3b6d91ceaf 100644
--- a/app/Import/Transformers/Waveaccounting/InvoiceTransformer.php
+++ b/app/Import/Transformers/Waveaccounting/InvoiceTransformer.php
@@ -18,64 +18,66 @@ use App\Models\Invoice;
 /**
  * Class InvoiceTransformer.
  */
-class InvoiceTransformer extends BaseTransformer {
-	/**
-	 * @param $line_items_data
-	 *
-	 * @return bool|array
-	 */
-	public function transform( $line_items_data ) {
-		$invoice_data = reset( $line_items_data );
+class InvoiceTransformer extends BaseTransformer
+{
+    /**
+     * @param $line_items_data
+     *
+     * @return bool|array
+     */
+    public function transform($line_items_data)
+    {
+        $invoice_data = reset($line_items_data);
 
-		if ( $this->hasInvoice( $invoice_data['Invoice Number'] ) ) {
-			throw new ImportException( 'Invoice number already exists' );
-		}
+        if ($this->hasInvoice($invoice_data['Invoice Number'])) {
+            throw new ImportException('Invoice number already exists');
+        }
 
-		$transformed = [
-			'company_id'  => $this->maps['company']->id,
-			'client_id'   => $this->getClient( $customer_name = $this->getString( $invoice_data, 'Customer' ), null ),
-			'number'      => $invoice_number = $this->getString( $invoice_data, 'Invoice Number' ),
-			'date'        => date( 'Y-m-d', strtotime( $invoice_data['Transaction Date'] ) ) ?: now()->format('Y-m-d'), //27-01-2022
-			// 'date'        => isset( $invoice_data['Invoice Date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['Transaction Date'] ) ) : null,
-			'currency_id' => $this->getCurrencyByCode( $invoice_data, 'Currency' ),
-			'status_id'   => Invoice::STATUS_SENT,
-		];
+        $transformed = [
+            'company_id'  => $this->maps['company']->id,
+            'client_id'   => $this->getClient($customer_name = $this->getString($invoice_data, 'Customer'), null),
+            'number'      => $invoice_number = $this->getString($invoice_data, 'Invoice Number'),
+            'date'        => date('Y-m-d', strtotime($invoice_data['Transaction Date'])) ?: now()->format('Y-m-d'), //27-01-2022
+            // 'date'        => isset( $invoice_data['Invoice Date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['Transaction Date'] ) ) : null,
+            'currency_id' => $this->getCurrencyByCode($invoice_data, 'Currency'),
+            'status_id'   => Invoice::STATUS_SENT,
+        ];
 
-		$line_items = [];
-		$payments   = [];
-		foreach ( $line_items_data as $record ) {
-			if ( $record['Account Type'] === 'Income' ) {
-				$description = $this->getString( $record, 'Transaction Line Description' );
+        $line_items = [];
+        $payments = [];
+        foreach ($line_items_data as $record) {
+            if ($record['Account Type'] === 'Income') {
+                $description = $this->getString($record, 'Transaction Line Description');
 
-				// Remove duplicate data from description
-				if ( substr( $description, 0, strlen( $customer_name ) + 3 ) === $customer_name . ' - ' ) {
-					$description = substr( $description, strlen( $customer_name ) + 3 );
-				}
+                // Remove duplicate data from description
+                if (substr($description, 0, strlen($customer_name) + 3) === $customer_name.' - ') {
+                    $description = substr($description, strlen($customer_name) + 3);
+                }
 
-				if ( substr( $description, 0, strlen( $invoice_number ) + 3 ) === $invoice_number . ' - ' ) {
-					$description = substr( $description, strlen( $invoice_number ) + 3 );
-				}
+                if (substr($description, 0, strlen($invoice_number) + 3) === $invoice_number.' - ') {
+                    $description = substr($description, strlen($invoice_number) + 3);
+                }
 
-				$line_items[] = [
-					'notes'     => $description,
-					'cost'      => $this->getFloat( $record, 'Amount Before Sales Tax' ),
-					'tax_name1' => $this->getString( $record, 'Sales Tax Name' ),
-					'tax_rate1' => $this->getFloat( $record, 'Sales Tax Amount' ),
+                $line_items[] = [
+                    'notes'     => $description,
+                    'cost'      => $this->getFloat($record, 'Amount Before Sales Tax'),
+                    'tax_name1' => $this->getString($record, 'Sales Tax Name'),
+                    'tax_rate1' => $this->getFloat($record, 'Sales Tax Amount'),
 
-					'quantity' => 1,
-				];
-			} elseif ( $record['Account Type'] === 'System Receivable Invoice' ) {
-				// This is a payment
-				$payments[] = [
-					'date'   => date( 'Y-m-d', strtotime( $invoice_data['Transaction Date'] ) ),
-					'amount' => $this->getFloat( $record, 'Amount (One column)' ),
-				];
-			}
-		}
+                    'quantity' => 1,
+                ];
+            } elseif ($record['Account Type'] === 'System Receivable Invoice') {
+                // This is a payment
+                $payments[] = [
+                    'date'   => date('Y-m-d', strtotime($invoice_data['Transaction Date'])),
+                    'amount' => $this->getFloat($record, 'Amount (One column)'),
+                ];
+            }
+        }
 
-		$transformed['line_items'] = $line_items;
-		$transformed['payments']   = $payments;
+        $transformed['line_items'] = $line_items;
+        $transformed['payments'] = $payments;
 
-		return $transformed;
-	}
+        return $transformed;
+    }
 }
diff --git a/app/Import/Transformers/Zoho/ClientTransformer.php b/app/Import/Transformers/Zoho/ClientTransformer.php
index f412ab60ca82..e8e618d189be 100644
--- a/app/Import/Transformers/Zoho/ClientTransformer.php
+++ b/app/Import/Transformers/Zoho/ClientTransformer.php
@@ -18,55 +18,57 @@ use Illuminate\Support\Str;
 /**
  * Class ClientTransformer.
  */
-class ClientTransformer extends BaseTransformer {
-	/**
-	 * @param $data
-	 *
-	 * @return array|bool
-	 */
-	public function transform( $data ) {
-		if ( isset( $data['Company Name'] ) && $this->hasClient( $data['Company Name'] ) ) {
-			throw new ImportException( 'Client already exists' );
-		}
+class ClientTransformer extends BaseTransformer
+{
+    /**
+     * @param $data
+     *
+     * @return array|bool
+     */
+    public function transform($data)
+    {
+        if (isset($data['Company Name']) && $this->hasClient($data['Company Name'])) {
+            throw new ImportException('Client already exists');
+        }
 
-		$settings              = new \stdClass;
-		$settings->currency_id = (string) $this->getCurrencyByCode( $data, 'Currency' );
+        $settings = new \stdClass;
+        $settings->currency_id = (string) $this->getCurrencyByCode($data, 'Currency');
 
-		if ( strval( $data['Payment Terms'] ?? '' ) > 0 ) {
-			$settings->payment_terms = $data['Payment Terms'];
-		}
+        if (strval($data['Payment Terms'] ?? '') > 0) {
+            $settings->payment_terms = $data['Payment Terms'];
+        }
 
-		return [
-			'company_id'    => $this->maps['company']->id,
-			'name'          => $this->getString( $data, 'Company Name' ),
-			'work_phone'    => $this->getString( $data, 'Phone' ),
-			'private_notes' => $this->getString( $data, 'Notes' ),
-			'website'       => $this->getString( $data, 'Website' ),
-			'id_number'		=> $this->getString( $data, 'Customer ID'),
-			'address1'    => $this->getString( $data, 'Billing Address' ),
-			'address2'    => $this->getString( $data, 'Billing Street2' ),
-			'city'        => $this->getString( $data, 'Billing City' ),
-			'state'       => $this->getString( $data, 'Billing State' ),
-			'postal_code' => $this->getString( $data, 'Billing Code' ),
-			'country_id'  => isset( $data['Billing Country'] ) ? $this->getCountryId( $data['Billing Country'] ) : null,
+        return [
+            'company_id'    => $this->maps['company']->id,
+            'name'          => $this->getString($data, 'Company Name'),
+            'work_phone'    => $this->getString($data, 'Phone'),
+            'private_notes' => $this->getString($data, 'Notes'),
+            'website'       => $this->getString($data, 'Website'),
+            'id_number'		=> $this->getString($data, 'Customer ID'),
+            'address1'    => $this->getString($data, 'Billing Address'),
+            'address2'    => $this->getString($data, 'Billing Street2'),
+            'city'        => $this->getString($data, 'Billing City'),
+            'state'       => $this->getString($data, 'Billing State'),
+            'postal_code' => $this->getString($data, 'Billing Code'),
+            'country_id'  => isset($data['Billing Country']) ? $this->getCountryId($data['Billing Country']) : null,
 
-			'shipping_address1'    => $this->getString( $data, 'Shipping Address' ),
-			'shipping_address2'    => $this->getString( $data, 'Shipping Street2' ),
-			'shipping_city'        => $this->getString( $data, 'Shipping City' ),
-			'shipping_state'       => $this->getString( $data, 'Shipping State' ),
-			'shipping_postal_code' => $this->getString( $data, 'Shipping Code' ),
-			'shipping_country_id'  => isset( $data['Shipping Country'] ) ? $this->getCountryId( $data['Shipping Country'] ) : null,
-			'credit_balance' => 0,
-			'settings'       => $settings,
-			'client_hash'    => Str::random( 40 ),
-			'contacts'       => [
-				[
-					'first_name' => $this->getString( $data, 'First Name' ),
-					'last_name'  => $this->getString( $data, 'Last Name' ),
-					'email'      => $this->getString( $data, 'Email' ),
-					'phone'      => $this->getString( $data, 'Phone' ),
-				],
-			],
-		];
-	}
+            'shipping_address1'    => $this->getString($data, 'Shipping Address'),
+            'shipping_address2'    => $this->getString($data, 'Shipping Street2'),
+            'shipping_city'        => $this->getString($data, 'Shipping City'),
+            'shipping_state'       => $this->getString($data, 'Shipping State'),
+            'shipping_postal_code' => $this->getString($data, 'Shipping Code'),
+            'shipping_country_id'  => isset($data['Shipping Country']) ? $this->getCountryId($data['Shipping Country']) : null,
+            'credit_balance' => 0,
+            'settings'       => $settings,
+            'client_hash'    => Str::random(40),
+            'contacts'       => [
+                [
+                    'first_name' => $this->getString($data, 'First Name'),
+                    'last_name'  => $this->getString($data, 'Last Name'),
+                    'email'      => $this->getString($data, 'Email'),
+                    'phone'      => $this->getString($data, 'Phone'),
+                ],
+            ],
+        ];
+    }
 }
diff --git a/app/Import/Transformers/Zoho/InvoiceTransformer.php b/app/Import/Transformers/Zoho/InvoiceTransformer.php
index ddfe9bcc2de3..f18ee202bc96 100644
--- a/app/Import/Transformers/Zoho/InvoiceTransformer.php
+++ b/app/Import/Transformers/Zoho/InvoiceTransformer.php
@@ -18,61 +18,62 @@ use App\Models\Invoice;
 /**
  * Class InvoiceTransformer.
  */
-class InvoiceTransformer extends BaseTransformer {
-	/**
-	 * @param $line_items_data
-	 *
-	 * @return bool|array
-	 */
-	public function transform( $line_items_data ) {
-		$invoice_data = reset( $line_items_data );
+class InvoiceTransformer extends BaseTransformer
+{
+    /**
+     * @param $line_items_data
+     *
+     * @return bool|array
+     */
+    public function transform($line_items_data)
+    {
+        $invoice_data = reset($line_items_data);
 
-		if ( $this->hasInvoice( $invoice_data['Invoice Number'] ) ) {
-			throw new ImportException( 'Invoice number already exists' );
-		}
+        if ($this->hasInvoice($invoice_data['Invoice Number'])) {
+            throw new ImportException('Invoice number already exists');
+        }
 
-		$invoiceStatusMap = [
-			'sent'  => Invoice::STATUS_SENT,
-			'draft' => Invoice::STATUS_DRAFT,
-		];
+        $invoiceStatusMap = [
+            'sent'  => Invoice::STATUS_SENT,
+            'draft' => Invoice::STATUS_DRAFT,
+        ];
 
-		$transformed = [
-			'company_id'   => $this->maps['company']->id,
-			'client_id'    => $this->getClient( $this->getString( $invoice_data, 'Customer ID' ), null ),
-			'number'       => $this->getString( $invoice_data, 'Invoice Number' ),
-			'date'         => isset( $invoice_data['Invoice Date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['Invoice Date'] ) ) : null,
-			'due_date'     => isset( $invoice_data['Due Date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['Due Date'] ) ) : null,
-			'po_number'    => $this->getString( $invoice_data, 'PurchaseOrder' ),
-			'public_notes' => $this->getString( $invoice_data, 'Notes' ),
-			'currency_id'  => $this->getCurrencyByCode( $invoice_data, 'Currency' ),
-			'amount'       => $this->getFloat( $invoice_data, 'Total' ),
-			'balance'      => $this->getFloat( $invoice_data, 'Balance' ),
-			'status_id'    => $invoiceStatusMap[ $status =
-					strtolower( $this->getString( $invoice_data, 'Invoice Status' ) ) ] ?? Invoice::STATUS_SENT,
-			// 'viewed'       => $status === 'viewed',
-		];
+        $transformed = [
+            'company_id'   => $this->maps['company']->id,
+            'client_id'    => $this->getClient($this->getString($invoice_data, 'Customer ID'), null),
+            'number'       => $this->getString($invoice_data, 'Invoice Number'),
+            'date'         => isset($invoice_data['Invoice Date']) ? date('Y-m-d', strtotime($invoice_data['Invoice Date'])) : null,
+            'due_date'     => isset($invoice_data['Due Date']) ? date('Y-m-d', strtotime($invoice_data['Due Date'])) : null,
+            'po_number'    => $this->getString($invoice_data, 'PurchaseOrder'),
+            'public_notes' => $this->getString($invoice_data, 'Notes'),
+            'currency_id'  => $this->getCurrencyByCode($invoice_data, 'Currency'),
+            'amount'       => $this->getFloat($invoice_data, 'Total'),
+            'balance'      => $this->getFloat($invoice_data, 'Balance'),
+            'status_id'    => $invoiceStatusMap[$status =
+                    strtolower($this->getString($invoice_data, 'Invoice Status'))] ?? Invoice::STATUS_SENT,
+            // 'viewed'       => $status === 'viewed',
+        ];
 
-		$line_items = [];
-		foreach ( $line_items_data as $record ) {
-			$line_items[] = [
-				'product_key'        => $this->getString( $record, 'Item Name' ),
-				'notes'              => $this->getString( $record, 'Item Description' ),
-				'cost'               => round($this->getFloat( $record, 'Item Price' ),2),
-				'quantity'           => $this->getFloat( $record, 'Quantity' ),
-				'discount'           => $this->getString( $record, 'Discount Amount' ),
-				'is_amount_discount' => true,
-			];
-		}
-		$transformed['line_items'] = $line_items;
+        $line_items = [];
+        foreach ($line_items_data as $record) {
+            $line_items[] = [
+                'product_key'        => $this->getString($record, 'Item Name'),
+                'notes'              => $this->getString($record, 'Item Description'),
+                'cost'               => round($this->getFloat($record, 'Item Price'), 2),
+                'quantity'           => $this->getFloat($record, 'Quantity'),
+                'discount'           => $this->getString($record, 'Discount Amount'),
+                'is_amount_discount' => true,
+            ];
+        }
+        $transformed['line_items'] = $line_items;
 
-		if ( $transformed['balance'] < $transformed['amount'] ) {
-			$transformed['payments'] = [[
-				'date'   => isset( $invoice_data['Last Payment Date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['Invoice Date'] ) ) : date( 'Y-m-d' ),
-				'amount' => $transformed['amount'] - $transformed['balance'],
-			]];
-		}
+        if ($transformed['balance'] < $transformed['amount']) {
+            $transformed['payments'] = [[
+                'date'   => isset($invoice_data['Last Payment Date']) ? date('Y-m-d', strtotime($invoice_data['Invoice Date'])) : date('Y-m-d'),
+                'amount' => $transformed['amount'] - $transformed['balance'],
+            ]];
+        }
 
-		return $transformed;
-	}
+        return $transformed;
+    }
 }
-
diff --git a/app/Jobs/Account/CreateAccount.php b/app/Jobs/Account/CreateAccount.php
index 59560b803318..70fe64a2606f 100644
--- a/app/Jobs/Account/CreateAccount.php
+++ b/app/Jobs/Account/CreateAccount.php
@@ -32,12 +32,12 @@ use App\Utils\Ninja;
 use App\Utils\Traits\User\LoginCache;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
 use Symfony\Component\HttpFoundation\Response;
 use Turbo124\Beacon\Facades\LightLogs;
-use Illuminate\Support\Facades\App;
 
 class CreateAccount
 {
@@ -73,32 +73,33 @@ class CreateAccount
         $sp794f3f = new Account();
         $sp794f3f->fill($this->request);
 
-        if(array_key_exists('rc', $this->request))
+        if (array_key_exists('rc', $this->request)) {
             $sp794f3f->referral_code = $this->request['rc'];
+        }
 
         if (! $sp794f3f->key) {
             $sp794f3f->key = Str::random(32);
         }
 
-        if(Ninja::isHosted())
-        {
+        if (Ninja::isHosted()) {
             $sp794f3f->hosted_client_count = config('ninja.quotas.free.clients');
             $sp794f3f->hosted_company_count = config('ninja.quotas.free.max_companies');
+            $sp794f3f->account_sms_verified = true;
             // $sp794f3f->trial_started = now();
             // $sp794f3f->trial_plan = 'pro';
         }
-        
+
         $sp794f3f->save();
 
-        $sp035a66 = CreateCompany::dispatchNow($this->request, $sp794f3f);
+        $sp035a66 = (new CreateCompany($this->request,$sp794f3f))->handle();
         $sp035a66->load('account');
         $sp794f3f->default_company_id = $sp035a66->id;
         $sp794f3f->save();
 
-        $spaa9f78 = CreateUser::dispatchNow($this->request, $sp794f3f, $sp035a66, true);
+        $spaa9f78 = (new CreateUser($this->request, $sp794f3f, $sp035a66, true))->handle();
 
-        CreateCompanyPaymentTerms::dispatchNow($sp035a66, $spaa9f78);
-        CreateCompanyTaskStatuses::dispatchNow($sp035a66, $spaa9f78);
+        (new CreateCompanyPaymentTerms($sp035a66, $spaa9f78))->handle();
+        (new CreateCompanyTaskStatuses($sp035a66, $spaa9f78))->handle();
 
         if ($spaa9f78) {
             auth()->login($spaa9f78, false);
@@ -108,27 +109,25 @@ class CreateAccount
         $this->setLoginCache($spaa9f78);
 
         $spafe62e = isset($this->request['token_name']) ? $this->request['token_name'] : request()->server('HTTP_USER_AGENT');
-        $sp2d97e8 = CreateCompanyToken::dispatchNow($sp035a66, $spaa9f78, $spafe62e);
-
+        $sp2d97e8 = (new CreateCompanyToken($sp035a66, $spaa9f78, $spafe62e))->handle();
         if ($spaa9f78) {
             event(new AccountCreated($spaa9f78, $sp035a66, Ninja::eventVars()));
         }
 
         $spaa9f78->fresh();
 
-        if(Ninja::isHosted()){
-
+        if (Ninja::isHosted()) {
             App::forgetInstance('translator');
             $t = app('translator');
             $t->replace(Ninja::transformTranslations($sp035a66->settings));
 
             $nmo = new NinjaMailerObject;
             $nmo->mailable = new \Modules\Admin\Mail\Welcome($sp035a66->owner());
-            $nmo->company =  $sp035a66;
+            $nmo->company = $sp035a66;
             $nmo->settings = $sp035a66->settings;
             $nmo->to_user = $sp035a66->owner();
 
-            NinjaMailerJob::dispatch($nmo);
+            NinjaMailerJob::dispatch($nmo, true);
 
             \Modules\Admin\Jobs\Account\NinjaUser::dispatch([], $sp035a66);
         }
@@ -138,26 +137,22 @@ class CreateAccount
         LightLogs::create(new AnalyticsAccountCreated())
                  ->increment()
                  ->queue();
-                 
+
         $ip = '';
-        
-        if(request()->hasHeader('Cf-Connecting-Ip'))
+
+        if (request()->hasHeader('Cf-Connecting-Ip')) {
             $ip = request()->header('Cf-Connecting-Ip');
-        elseif(request()->hasHeader('X-Forwarded-For'))
+        } elseif (request()->hasHeader('X-Forwarded-For')) {
             $ip = request()->header('Cf-Connecting-Ip');
-        else
+        } else {
             $ip = request()->ip();
+        }
 
         $platform = request()->has('platform') ? request()->input('platform') : 'www';
 
         LightLogs::create(new AccountPlatform($platform, request()->server('HTTP_USER_AGENT'), $ip))
-                 ->queue();        
+                 ->queue();
 
         return $sp794f3f;
     }
-
 }
-
-
-
-
diff --git a/app/Jobs/Company/CreateCompany.php b/app/Jobs/Company/CreateCompany.php
index 6a9ac4f9a25a..6c5c1db6f689 100644
--- a/app/Jobs/Company/CreateCompany.php
+++ b/app/Jobs/Company/CreateCompany.php
@@ -65,12 +65,13 @@ class CreateCompany
         $company->default_password_timeout = 1800000;
         $company->client_registration_fields = ClientRegistrationFields::generate();
         $company->markdown_email_enabled = false;
-        
-        if(Ninja::isHosted())
+
+        if (Ninja::isHosted()) {
             $company->subdomain = MultiDB::randomSubdomainGenerator();
-        else 
+        } else {
             $company->subdomain = '';
-        
+        }
+
         $company->save();
 
         return $company;
diff --git a/app/Jobs/Company/CreateCompanyTaskStatuses.php b/app/Jobs/Company/CreateCompanyTaskStatuses.php
index d13a2bf5173d..e50549a1fc39 100644
--- a/app/Jobs/Company/CreateCompanyTaskStatuses.php
+++ b/app/Jobs/Company/CreateCompanyTaskStatuses.php
@@ -46,12 +46,12 @@ class CreateCompanyTaskStatuses
      */
     public function handle()
     {
-
         MultiDB::setDb($this->company->db);
-        
-        if(TaskStatus::where('company_id', $this->company->id)->count() > 0)
+
+        if (TaskStatus::where('company_id', $this->company->id)->count() > 0) {
             return;
-        
+        }
+
         App::forgetInstance('translator');
         $t = app('translator');
         App::setLocale($this->company->locale());
diff --git a/app/Jobs/Credit/ApplyCreditPayment.php b/app/Jobs/Credit/ApplyCreditPayment.php
index 95a343d9f132..8c3f671391c9 100644
--- a/app/Jobs/Credit/ApplyCreditPayment.php
+++ b/app/Jobs/Credit/ApplyCreditPayment.php
@@ -74,7 +74,6 @@ class ApplyCreditPayment implements ShouldQueue
                 ->adjustBalance($this->amount * -1)
                 ->updatePaidToDate($this->amount)
                 ->save();
-
         } elseif ($this->amount < $credit_balance) { //compare number appropriately
 
             $this->credit
diff --git a/app/Jobs/Credit/ZipCredits.php b/app/Jobs/Credit/ZipCredits.php
index 69c66d529a7a..0071338e0e6b 100644
--- a/app/Jobs/Credit/ZipCredits.php
+++ b/app/Jobs/Credit/ZipCredits.php
@@ -42,13 +42,13 @@ class ZipCredits implements ShouldQueue
     public $settings;
 
     public $tries = 1;
+
     /**
      * @param $invoices
      * @param Company $company
      * @param $email
      * @deprecated confirm to be deleted
      * Create a new job instance.
-     *
      */
     public function __construct($credits, Company $company, User $user)
     {
@@ -69,32 +69,25 @@ class ZipCredits implements ShouldQueue
      * @throws \ZipStream\Exception\FileNotReadableException
      * @throws \ZipStream\Exception\OverflowException
      */
-    
     public function handle()
     {
         MultiDB::setDb($this->company->db);
 
-        # create new zip object
+        // create new zip object
         $zipFile = new \PhpZip\ZipFile();
         $file_name = date('Y-m-d').'_'.str_replace(' ', '_', trans('texts.credits')).'.zip';
         $invitation = $this->credits->first()->invitations->first();
         $path = $this->credits->first()->client->quote_filepath($invitation);
 
-
-        $this->credits->each(function ($credit){
-
-            CreateEntityPdf::dispatchNow($credit->invitations()->first());
-            
+        $this->credits->each(function ($credit) {
+            (new CreateEntityPdf($credit->invitations()->first()))->handle();
         });
 
-        try{
-            
+        try {
             foreach ($this->credits as $credit) {
-        
                 $file = $credit->service()->getCreditPdf($credit->invitations()->first());
                 $zip_file_name = basename($file);
                 $zipFile->addFromString($zip_file_name, Storage::get($file));
-
             }
 
             Storage::put($path.$file_name, $zipFile->outputAsString());
@@ -104,21 +97,14 @@ class ZipCredits implements ShouldQueue
             $nmo->to_user = $this->user;
             $nmo->settings = $this->settings;
             $nmo->company = $this->company;
-            
-            NinjaMailerJob::dispatch($nmo);
-            
-            UnlinkFile::dispatch(config('filesystems.default'), $path.$file_name)->delay(now()->addHours(1));
-            
 
-        }
-        catch(\PhpZip\Exception\ZipException $e){
+            NinjaMailerJob::dispatch($nmo);
+
+            UnlinkFile::dispatch(config('filesystems.default'), $path.$file_name)->delay(now()->addHours(1));
+        } catch (\PhpZip\Exception\ZipException $e) {
             // handle exception
-        }
-        finally{
+        } finally {
             $zipFile->close();
         }
-
-
     }
-
 }
diff --git a/app/Jobs/Cron/AutoBill.php b/app/Jobs/Cron/AutoBill.php
index 289a26c89989..464ab62f3f54 100644
--- a/app/Jobs/Cron/AutoBill.php
+++ b/app/Jobs/Cron/AutoBill.php
@@ -14,14 +14,17 @@ namespace App\Jobs\Cron;
 use App\Libraries\MultiDB;
 use App\Models\Invoice;
 use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
 
-
-class AutoBill
+class AutoBill implements ShouldQueue
 {
-    use Dispatchable;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public $tries = 1;
-    
+
     public Invoice $invoice;
 
     public string $db;
@@ -46,20 +49,16 @@ class AutoBill
     {
         set_time_limit(0);
 
-        if($this->db)
+        if ($this->db) {
             MultiDB::setDb($this->db);
+        }
 
-        try{
-            
+        try {
             nlog("autobill {$this->invoice->id}");
 
             $this->invoice->service()->autoBill();
-
+        } catch (\Exception $e) {
+            nlog("Failed to capture payment for {$this->invoice->company_id} - {$this->invoice->number} ->".$e->getMessage());
         }
-        catch(\Exception $e) {
-            nlog("Failed to capture payment for {$this->invoice->company_id} - {$this->invoice->number} ->" . $e->getMessage());
-        }
-
-
     }
 }
diff --git a/app/Jobs/Cron/AutoBillCron.php b/app/Jobs/Cron/AutoBillCron.php
index 025e6ee68271..16d7ba752777 100644
--- a/app/Jobs/Cron/AutoBillCron.php
+++ b/app/Jobs/Cron/AutoBillCron.php
@@ -24,7 +24,7 @@ class AutoBillCron
     use Dispatchable;
 
     public $tries = 1;
-    
+
     private $counter = 1;
 
     /**
@@ -46,10 +46,9 @@ class AutoBillCron
         set_time_limit(0);
 
         /* Get all invoices where the send date is less than NOW + 30 minutes() */
-        info("Performing Autobilling ".Carbon::now()->format('Y-m-d h:i:s'));
+        info('Performing Autobilling '.Carbon::now()->format('Y-m-d h:i:s'));
 
         if (! config('ninja.db.multi_db_enabled')) {
-
             $auto_bill_partial_invoices = Invoice::whereDate('partial_due_date', '<=', now())
                                         ->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
                                         ->where('auto_bill_enabled', true)
@@ -57,16 +56,16 @@ class AutoBillCron
                                         ->where('balance', '>', 0)
                                         ->where('is_deleted', false)
                                         ->whereHas('company', function ($query) {
-                                             $query->where('is_disabled',0);
+                                            $query->where('is_disabled', 0);
                                         })
                                         ->orderBy('id', 'DESC')
                                         ->with('company');
 
-                                        nlog($auto_bill_partial_invoices->count(). " partial invoices to auto bill");
+            nlog($auto_bill_partial_invoices->count().' partial invoices to auto bill');
 
-                                        $auto_bill_partial_invoices->cursor()->each(function ($invoice){
-                                                AutoBill::dispatch($invoice, false);
-                                        });
+            $auto_bill_partial_invoices->cursor()->each(function ($invoice) {
+                AutoBill::dispatch($invoice, false);
+            });
 
             $auto_bill_invoices = Invoice::whereDate('due_date', '<=', now())
                                         ->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
@@ -75,24 +74,21 @@ class AutoBillCron
                                         ->where('balance', '>', 0)
                                         ->where('is_deleted', false)
                                         ->whereHas('company', function ($query) {
-                                             $query->where('is_disabled',0);
+                                            $query->where('is_disabled', 0);
                                         })
                                         ->orderBy('id', 'DESC')
                                         ->with('company');
 
-                                        nlog($auto_bill_invoices->count(). " full invoices to auto bill");
-                                        
-                                        $auto_bill_invoices->cursor()->each(function ($invoice){
-                                                AutoBill::dispatch($invoice, false);
-                                        });
-
+            nlog($auto_bill_invoices->count().' full invoices to auto bill');
 
+            $auto_bill_invoices->cursor()->each(function ($invoice) {
+                AutoBill::dispatch($invoice, false);
+            });
         } else {
             //multiDB environment, need to
             foreach (MultiDB::$dbs as $db) {
-        
                 MultiDB::setDB($db);
-                
+
                 $auto_bill_partial_invoices = Invoice::whereDate('partial_due_date', '<=', now())
                                             ->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
                                             ->where('auto_bill_enabled', true)
@@ -100,16 +96,16 @@ class AutoBillCron
                                             ->where('balance', '>', 0)
                                             ->where('is_deleted', false)
                                             ->whereHas('company', function ($query) {
-                                                 $query->where('is_disabled',0);
+                                                $query->where('is_disabled', 0);
                                             })
                                             ->orderBy('id', 'DESC')
                                             ->with('company');
 
-                                            nlog($auto_bill_partial_invoices->count(). " partial invoices to auto bill db = {$db}");
+                nlog($auto_bill_partial_invoices->count()." partial invoices to auto bill db = {$db}");
 
-                                            $auto_bill_partial_invoices->cursor()->each(function ($invoice) use($db){
-                                                AutoBill::dispatch($invoice, $db);
-                                            });
+                $auto_bill_partial_invoices->cursor()->each(function ($invoice) use ($db) {
+                    AutoBill::dispatch($invoice, $db);
+                });
 
                 $auto_bill_invoices = Invoice::whereDate('due_date', '<=', now())
                                             ->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
@@ -118,26 +114,21 @@ class AutoBillCron
                                             ->where('balance', '>', 0)
                                             ->where('is_deleted', false)
                                             ->whereHas('company', function ($query) {
-                                                 $query->where('is_disabled',0);
+                                                $query->where('is_disabled', 0);
                                             })
                                             ->orderBy('id', 'DESC')
                                             ->with('company');
 
-                                            nlog($auto_bill_invoices->count(). " full invoices to auto bill db = {$db}");
-
-                                            $auto_bill_invoices->cursor()->each(function ($invoice) use($db){
-
-                                                nlog($this->counter);
-                                                AutoBill::dispatch($invoice, $db);
-                                                $this->counter++;
-                                            });
-
-
+                nlog($auto_bill_invoices->count()." full invoices to auto bill db = {$db}");
 
+                $auto_bill_invoices->cursor()->each(function ($invoice) use ($db) {
+                    nlog($this->counter);
+                    AutoBill::dispatch($invoice, $db);
+                    $this->counter++;
+                });
             }
 
-            nlog("Auto Bill - fine");
+            nlog('Auto Bill - fine');
         }
     }
-
 }
diff --git a/app/Jobs/Cron/CompanyRecurringCron.php b/app/Jobs/Cron/CompanyRecurringCron.php
new file mode 100644
index 000000000000..5e0a1d765c19
--- /dev/null
+++ b/app/Jobs/Cron/CompanyRecurringCron.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Jobs\Cron;
+
+use App\Jobs\RecurringInvoice\SendRecurring;
+use App\Libraries\MultiDB;
+use App\Models\Company;
+use App\Models\RecurringInvoice;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Support\Carbon;
+
+/*@not used*/
+
+class CompanyRecurringCron
+{
+    use Dispatchable;
+
+    public $tries = 1;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle() : void
+    {
+        //multiDB environment, need to
+        foreach (MultiDB::$dbs as $db) {
+
+            MultiDB::setDB($db);
+
+            Company::where('is_disabled', 0)
+                   ->whereHas('recurring_invoices', function ($query){
+                        $query->where('next_send_date', '<=', now()->toDateTimeString())
+                              ->whereNotNull('next_send_date')
+                              ->whereNull('deleted_at')
+                              ->where('is_deleted', false)
+                              ->where('status_id', RecurringInvoice::STATUS_ACTIVE)
+                              ->where('remaining_cycles', '!=', '0')
+                              ->whereHas('client', function ($query) {
+                                 $query->where('is_deleted', 0)
+                                       ->where('deleted_at', null);
+                            });
+                          })
+                    ->cursor()->each(function ($company){
+
+                    SendCompanyRecurring::dispatch($company->id, $company->db);
+
+            });
+        }
+    }
+}
diff --git a/app/Jobs/Cron/RecurringExpensesCron.php b/app/Jobs/Cron/RecurringExpensesCron.php
index 8b8c0d8a8cf1..174f4decf423 100644
--- a/app/Jobs/Cron/RecurringExpensesCron.php
+++ b/app/Jobs/Cron/RecurringExpensesCron.php
@@ -25,7 +25,7 @@ class RecurringExpensesCron
     use GeneratesCounter;
 
     public $tries = 1;
-    
+
     /**
      * Create a new job instance.
      *
@@ -43,12 +43,10 @@ class RecurringExpensesCron
     public function handle() : void
     {
         /* Get all expenses where the send date is less than NOW + 30 minutes() */
-        nlog("Sending recurring expenses ".Carbon::now()->format('Y-m-d h:i:s'));
+        nlog('Sending recurring expenses '.Carbon::now()->format('Y-m-d h:i:s'));
 
         if (! config('ninja.db.multi_db_enabled')) {
-
             $this->getRecurringExpenses();
-
         } else {
             //multiDB environment, need to
             foreach (MultiDB::$dbs as $db) {
@@ -67,21 +65,19 @@ class RecurringExpensesCron
                                                     ->where('status_id', RecurringInvoice::STATUS_ACTIVE)
                                                     ->where('remaining_cycles', '!=', '0')
                                                     ->whereHas('company', function ($query) {
-                                                         $query->where('is_disabled',0);
+                                                        $query->where('is_disabled', 0);
                                                     })
                                                     ->with('company')
                                                     ->cursor();
 
-        nlog(now()->format('Y-m-d') . ' Generating Recurring Expenses. Count = '.$recurring_expenses->count());
+        nlog(now()->format('Y-m-d').' Generating Recurring Expenses. Count = '.$recurring_expenses->count());
 
         $recurring_expenses->each(function ($recurring_expense, $key) {
-            nlog("Current date = " . now()->format("Y-m-d") . " Recurring date = " .$recurring_expense->next_send_date);
+            nlog('Current date = '.now()->format('Y-m-d').' Recurring date = '.$recurring_expense->next_send_date);
 
-            if (!$recurring_expense->company->is_disabled) {
+            if (! $recurring_expense->company->is_disabled) {
                 $this->generateExpense($recurring_expense);
             }
-
-
         });
     }
 
@@ -99,5 +95,4 @@ class RecurringExpensesCron
         $recurring_expense->remaining_cycles = $recurring_expense->remainingCycles();
         $recurring_expense->save();
     }
-
 }
diff --git a/app/Jobs/Cron/RecurringInvoicesCron.php b/app/Jobs/Cron/RecurringInvoicesCron.php
index 194d17e11d7e..330efe77dde9 100644
--- a/app/Jobs/Cron/RecurringInvoicesCron.php
+++ b/app/Jobs/Cron/RecurringInvoicesCron.php
@@ -22,7 +22,7 @@ class RecurringInvoicesCron
     use Dispatchable;
 
     public $tries = 1;
-    
+
     /**
      * Create a new job instance.
      *
@@ -40,7 +40,7 @@ class RecurringInvoicesCron
     public function handle() : void
     {
         /* Get all invoices where the send date is less than NOW + 30 minutes() */
-        nlog("Sending recurring invoices ".Carbon::now()->format('Y-m-d h:i:s'));
+        nlog('Sending recurring invoices '.Carbon::now()->format('Y-m-d h:i:s'));
 
         if (! config('ninja.db.multi_db_enabled')) {
             $recurring_invoices = RecurringInvoice::where('next_send_date', '<=', now()->toDateTimeString())
@@ -50,42 +50,33 @@ class RecurringInvoicesCron
                                                         ->where('status_id', RecurringInvoice::STATUS_ACTIVE)
                                                         ->where('remaining_cycles', '!=', '0')
                                                         ->whereHas('client', function ($query) {
-                                                             $query->where('is_deleted',0)
-                                                                   ->where('deleted_at', NULL);
+                                                            $query->where('is_deleted', 0)
+                                                                   ->where('deleted_at', null);
                                                         })
                                                         ->whereHas('company', function ($query) {
-                                                             $query->where('is_disabled',0);
+                                                            $query->where('is_disabled', 0);
                                                         })
                                                         ->with('company')
                                                         ->cursor();
 
-            nlog(now()->format('Y-m-d') . ' Sending Recurring Invoices. Count = '.$recurring_invoices->count());
+            nlog(now()->format('Y-m-d').' Sending Recurring Invoices. Count = '.$recurring_invoices->count());
 
             $recurring_invoices->each(function ($recurring_invoice, $key) {
-                
-                nlog("Current date = " . now()->format("Y-m-d") . " Recurring date = " .$recurring_invoice->next_send_date);
-
+                // nlog('Current date = '.now()->format('Y-m-d').' Recurring date = '.$recurring_invoice->next_send_date);
                 nlog("Trying to send {$recurring_invoice->number}");
-                
+
                 /* Special check if we should generate another invoice is the previous one is yet to be paid */
-                if($recurring_invoice->company->stop_on_unpaid_recurring && $recurring_invoice->invoices()->whereIn('status_id', [2,3])->where('is_deleted', 0)->where('balance', '>', 0)->exists()) {
+                if ($recurring_invoice->company->stop_on_unpaid_recurring && $recurring_invoice->invoices()->whereIn('status_id', [2, 3])->where('is_deleted', 0)->where('balance', '>', 0)->exists()) {
+                    nlog('Existing invoice exists, skipping');
 
-                    nlog("Existing invoice exists, skipping");
                     return;
-
                 }
 
-                try{
-
-                    SendRecurring::dispatchNow($recurring_invoice, $recurring_invoice->company->db);
-
+                try {
+                    (new SendRecurring($recurring_invoice, $recurring_invoice->company->db))->handle();
+                } catch (\Exception $e) {
+                    nlog("Unable to sending recurring invoice {$recurring_invoice->id} ".$e->getMessage());
                 }
-                catch(\Exception $e){
-
-                    nlog("Unable to sending recurring invoice {$recurring_invoice->id} ". $e->getMessage());
-                    
-                }
-                
             });
         } else {
             //multiDB environment, need to
@@ -99,36 +90,32 @@ class RecurringInvoicesCron
                                                         ->where('status_id', RecurringInvoice::STATUS_ACTIVE)
                                                         ->where('remaining_cycles', '!=', '0')
                                                         ->whereHas('client', function ($query) {
-                                                             $query->where('is_deleted',0)
-                                                                   ->where('deleted_at', NULL);
+                                                            $query->where('is_deleted', 0)
+                                                                   ->where('deleted_at', null);
                                                         })
                                                         ->whereHas('company', function ($query) {
-                                                             $query->where('is_disabled',0);
+                                                            $query->where('is_disabled', 0);
                                                         })
                                                         ->with('company')
                                                         ->cursor();
 
-                nlog(now()->format('Y-m-d') . ' Sending Recurring Invoices. Count = '.$recurring_invoices->count());
+                nlog(now()->format('Y-m-d').' Sending Recurring Invoices. Count = '.$recurring_invoices->count());
 
                 $recurring_invoices->each(function ($recurring_invoice, $key) {
-                    nlog("Current date = " . now()->format("Y-m-d") . " Recurring date = " .$recurring_invoice->next_send_date ." Recurring #id = ". $recurring_invoice->id);
 
-                        nlog("Trying to send {$recurring_invoice->number}");
-                    
-                        if($recurring_invoice->company->stop_on_unpaid_recurring) {
-
-                            if($recurring_invoice->invoices()->whereIn('status_id', [2,3])->where('is_deleted', 0)->where('balance', '>', 0)->exists())
-                                return;
+                    nlog("Trying to send {$recurring_invoice->number}");
 
+                    if ($recurring_invoice->company->stop_on_unpaid_recurring) {
+                        if ($recurring_invoice->invoices()->whereIn('status_id', [2, 3])->where('is_deleted', 0)->where('balance', '>', 0)->exists()) {
+                            return;
                         }
+                    }
 
-                        try{
-                            SendRecurring::dispatchNow($recurring_invoice, $recurring_invoice->company->db);
-                        }
-                        catch(\Exception $e){
-                            nlog("Unable to sending recurring invoice {$recurring_invoice->id} ". $e->getMessage());
-                        }
-                    
+                    try {
+                        (new SendRecurring($recurring_invoice, $recurring_invoice->company->db))->handle();
+                    } catch (\Exception $e) {
+                        nlog("Unable to sending recurring invoice {$recurring_invoice->id} ".$e->getMessage());
+                    }
                 });
             }
         }
diff --git a/app/Jobs/Cron/SendCompanyRecurring.php b/app/Jobs/Cron/SendCompanyRecurring.php
new file mode 100644
index 000000000000..fc2fe63a01b2
--- /dev/null
+++ b/app/Jobs/Cron/SendCompanyRecurring.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Jobs\Cron;
+
+use App\Jobs\RecurringInvoice\SendRecurring;
+use App\Libraries\MultiDB;
+use App\Models\Company;
+use App\Models\RecurringInvoice;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Support\Carbon;
+
+/*@not used*/
+
+class SendCompanyRecurring
+{
+    use Dispatchable;
+
+    public $tries = 1;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+
+    public $company;
+
+    public $db;
+
+    public function __construct($company_id, $db)
+    {
+    
+        $this->company_id = $company_id;
+
+        $this->db = $db;
+
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle() : void
+    {
+
+        MultiDB::setDB($this->db);
+
+        $recurring_invoices = Company::where('id', $this->company_id)
+                                     ->where('is_disabled', 0)
+                                     ->whereHas('recurring_invoices', function ($query){
+                                        $query->where('next_send_date', '<=', now()->toDateTimeString())
+                                              ->whereNotNull('next_send_date')
+                                              ->whereNull('deleted_at')
+                                              ->where('is_deleted', false)
+                                              ->where('status_id', RecurringInvoice::STATUS_ACTIVE)
+                                              ->where('remaining_cycles', '!=', '0')
+                                              ->whereHas('client', function ($query) {
+                                                 $query->where('is_deleted', 0)
+                                                       ->where('deleted_at', null);
+                                            });
+                                          })
+                                      ->cursor()->each(function ($recurring_invoice){
+
+                                nlog("Trying to send {$recurring_invoice->number}");
+
+                                if ($recurring_invoice->company->stop_on_unpaid_recurring) {
+                                    if ($recurring_invoice->invoices()->whereIn('status_id', [2, 3])->where('is_deleted', 0)->where('balance', '>', 0)->exists()) {
+                                        return;
+                                    }
+                                }
+
+                                try {
+                                    (new SendRecurring($recurring_invoice, $recurring_invoice->company->db))->handle();
+                                } catch (\Exception $e) {
+                                    nlog("Unable to sending recurring invoice {$recurring_invoice->id} ".$e->getMessage());
+                                }
+
+                            });
+        
+    }
+}
diff --git a/app/Jobs/Cron/SubscriptionCron.php b/app/Jobs/Cron/SubscriptionCron.php
index 536c49063e84..b3e14f140d2d 100644
--- a/app/Jobs/Cron/SubscriptionCron.php
+++ b/app/Jobs/Cron/SubscriptionCron.php
@@ -21,6 +21,7 @@ class SubscriptionCron
 {
     use Dispatchable;
     use SubscriptionHooker;
+
     /**
      * Create a new job instance.
      *
@@ -37,29 +38,22 @@ class SubscriptionCron
      */
     public function handle() : void
     {
-
-        nlog("Subscription Cron");
+        nlog('Subscription Cron');
 
         if (! config('ninja.db.multi_db_enabled')) {
-
             $this->loopSubscriptions();
-
         } else {
             //multiDB environment, need to
             foreach (MultiDB::$dbs as $db) {
-
                 MultiDB::setDB($db);
 
                 $this->loopSubscriptions();
-
             }
         }
-        
     }
 
     private function loopSubscriptions()
     {
-
         $invoices = Invoice::where('is_deleted', 0)
                           ->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
                           ->where('balance', '>', 0)
@@ -68,29 +62,23 @@ class SubscriptionCron
                           ->whereNotNull('subscription_id')
                           ->cursor();
 
-
-        $invoices->each(function ($invoice){
-
+        $invoices->each(function ($invoice) {
             $subscription = $invoice->subscription;
 
             $body = [
-              'context' => 'plan_expired',
-              'client' => $invoice->client->hashed_id,
-              'invoice' => $invoice->hashed_id,
-              'subscription' => $subscription->hashed_id,
+                'context' => 'plan_expired',
+                'client' => $invoice->client->hashed_id,
+                'invoice' => $invoice->hashed_id,
+                'subscription' => $subscription->hashed_id,
             ];
 
             $this->sendLoad($subscription, $body);
-            //This will send the notification daily. 
+            //This will send the notification daily.
             //We'll need to handle this by performing some action on the invoice to either archive it or delete it?
         });
-
     }
 
-
     private function handleWebhook($invoice, $subscription)
     {
-
     }
-    
 }
diff --git a/app/Jobs/Document/ZipDocuments.php b/app/Jobs/Document/ZipDocuments.php
index e2725851288c..aa05eb1f7d17 100644
--- a/app/Jobs/Document/ZipDocuments.php
+++ b/app/Jobs/Document/ZipDocuments.php
@@ -55,7 +55,6 @@ class ZipDocuments implements ShouldQueue
      * @param $email
      * @deprecated confirm to be deleted
      * Create a new job instance.
-     *
      */
     public function __construct($document_ids, Company $company, User $user)
     {
@@ -76,7 +75,6 @@ class ZipDocuments implements ShouldQueue
      * @throws \ZipStream\Exception\FileNotReadableException
      * @throws \ZipStream\Exception\OverflowException
      */
-    
     public function handle()
     {
         MultiDB::setDb($this->company->db);
@@ -86,19 +84,16 @@ class ZipDocuments implements ShouldQueue
         $t = app('translator');
         $t->replace(Ninja::transformTranslations($this->company->settings));
 
-        # create new zip object
+        // create new zip object
         $zipFile = new \PhpZip\ZipFile();
         $file_name = date('Y-m-d').'_'.str_replace(' ', '_', trans('texts.documents')).'.zip';
         $path = $this->company->file_path();
 
-        try{
-            
+        try {
             $documents = Document::whereIn('id', $this->document_ids)->get();
 
             foreach ($documents as $document) {
-
                 $zipFile->addFromString($this->buildFileName($document), $document->getFile());
-
             }
 
             Storage::put($path.$file_name, $zipFile->outputAsString());
@@ -108,32 +103,28 @@ class ZipDocuments implements ShouldQueue
             $nmo->to_user = $this->user;
             $nmo->settings = $this->settings;
             $nmo->company = $this->company;
-            
+
             NinjaMailerJob::dispatch($nmo);
-            
+
             UnlinkFile::dispatch(config('filesystems.default'), $path.$file_name)->delay(now()->addHours(1));
-            
-        }
-        catch(\PhpZip\Exception\ZipException $e){
-            nlog("could not make zip => ". $e->getMessage());
-        }
-        finally{
+        } catch (\PhpZip\Exception\ZipException $e) {
+            nlog('could not make zip => '.$e->getMessage());
+        } finally {
             $zipFile->close();
         }
-
     }
 
-
     private function buildFileName($document) :string
     {
         $filename = $document->name;
 
         $date = $this->formatDate(Carbon::createFromTimestamp($document->created_at), 'Y-m-d');
 
-        $number = "_";
+        $number = '_';
 
-        if(isset($document->documentable->number))
-            $number = "_".$document->documentable->number;
+        if (isset($document->documentable->number)) {
+            $number = '_'.$document->documentable->number;
+        }
 
         return "{$date}_{$document->documentable->translate_entity()}{$number}_{$filename}";
     }
diff --git a/app/Jobs/Entity/CreateEntityPdf.php b/app/Jobs/Entity/CreateEntityPdf.php
index 256c618ae9f7..68988da98432 100644
--- a/app/Jobs/Entity/CreateEntityPdf.php
+++ b/app/Jobs/Entity/CreateEntityPdf.php
@@ -98,14 +98,12 @@ class CreateEntityPdf implements ShouldQueue
 
         $this->client = $invitation->contact->client;
         $this->client->load('company');
-        
-        $this->disk = $disk ?? config('filesystems.default');
 
+        $this->disk = $disk ?? config('filesystems.default');
     }
 
     public function handle()
     {
-
         MultiDB::setDb($this->company->db);
 
         /* Forget the singleton*/
@@ -146,15 +144,16 @@ class CreateEntityPdf implements ShouldQueue
         $design = Design::find($entity_design_id);
 
         /* Catch all in case migration doesn't pass back a valid design */
-        if(!$design)
+        if (! $design) {
             $design = Design::find(2);
+        }
 
         $html = new HtmlEngine($this->invitation);
 
         if ($design->is_custom) {
             $options = [
-            'custom_partials' => json_decode(json_encode($design->design), true)
-          ];
+                'custom_partials' => json_decode(json_encode($design->design), true),
+            ];
             $template = new PdfMakerDesign(PdfDesignModel::CUSTOM, $options);
         } else {
             $template = new PdfMakerDesign(strtolower($design->name));
@@ -187,28 +186,23 @@ class CreateEntityPdf implements ShouldQueue
         $pdf = null;
 
         try {
-
-            if(config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja'){
+            if (config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja') {
                 $pdf = (new NinjaPdf())->build($maker->getCompiledHTML(true));
 
                 $numbered_pdf = $this->pageNumbering($pdf, $this->company);
 
-                if($numbered_pdf)
+                if ($numbered_pdf) {
                     $pdf = $numbered_pdf;
-
-            }
-            else {
-
+                }
+            } else {
                 $pdf = $this->makePdf(null, null, $maker->getCompiledHTML(true));
-                
+
                 $numbered_pdf = $this->pageNumbering($pdf, $this->company);
 
-                if($numbered_pdf)
+                if ($numbered_pdf) {
                     $pdf = $numbered_pdf;
-                
-
+                }
             }
-
         } catch (\Exception $e) {
             nlog(print_r($e->getMessage(), 1));
         }
@@ -218,30 +212,21 @@ class CreateEntityPdf implements ShouldQueue
         }
 
         if ($pdf) {
-
-            try{
-                
-                if(!Storage::disk($this->disk)->exists($path)) 
+            try {
+                if (! Storage::disk($this->disk)->exists($path)) {
                     Storage::disk($this->disk)->makeDirectory($path, 0775);
+                }
 
                 Storage::disk($this->disk)->put($file_path, $pdf, 'public');
-
-            }
-            catch(\Exception $e)
-            {
-
+            } catch (\Exception $e) {
                 throw new FilePermissionsFailure($e->getMessage());
-
             }
         }
-        
+
         return $file_path;
     }
 
     public function failed($e)
     {
-
     }
-    
-
 }
diff --git a/app/Jobs/Entity/CreateRawPdf.php b/app/Jobs/Entity/CreateRawPdf.php
index a67eeecaef2b..0f4bf410f405 100644
--- a/app/Jobs/Entity/CreateRawPdf.php
+++ b/app/Jobs/Entity/CreateRawPdf.php
@@ -66,7 +66,7 @@ class CreateRawPdf implements ShouldQueue
     public function __construct($invitation, $db)
     {
         MultiDB::setDb($db);
-        
+
         $this->invitation = $invitation;
 
         if ($invitation instanceof InvoiceInvitation) {
@@ -86,12 +86,11 @@ class CreateRawPdf implements ShouldQueue
         $this->company = $invitation->company;
 
         $this->contact = $invitation->contact;
-
     }
 
     public function handle()
     {
-        
+
         /* Forget the singleton*/
         App::forgetInstance('translator');
 
@@ -126,15 +125,16 @@ class CreateRawPdf implements ShouldQueue
         $design = Design::find($entity_design_id);
 
         /* Catch all in case migration doesn't pass back a valid design */
-        if(!$design)
+        if (! $design) {
             $design = Design::find(2);
+        }
 
         $html = new HtmlEngine($this->invitation);
 
         if ($design->is_custom) {
             $options = [
-            'custom_partials' => json_decode(json_encode($design->design), true)
-          ];
+                'custom_partials' => json_decode(json_encode($design->design), true),
+            ];
             $template = new PdfMakerDesign(PdfDesignModel::CUSTOM, $options);
         } else {
             $template = new PdfMakerDesign(strtolower($design->name));
@@ -167,34 +167,30 @@ class CreateRawPdf implements ShouldQueue
         $pdf = null;
 
         try {
-
-            if(config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja'){
+            if (config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja') {
                 $pdf = (new NinjaPdf())->build($maker->getCompiledHTML(true));
 
                 $finfo = new \finfo(FILEINFO_MIME);
 
                 //fallback in case hosted PDF fails.
-                if($finfo->buffer($pdf) != 'application/pdf; charset=binary')
-                {
+                if ($finfo->buffer($pdf) != 'application/pdf; charset=binary') {
                     $pdf = $this->makePdf(null, null, $maker->getCompiledHTML(true));
 
                     $numbered_pdf = $this->pageNumbering($pdf, $this->company);
 
-                        if($numbered_pdf)
-                            $pdf = $numbered_pdf;
-
+                    if ($numbered_pdf) {
+                        $pdf = $numbered_pdf;
+                    }
                 }
-
-            }
-            else {
+            } else {
                 $pdf = $this->makePdf(null, null, $maker->getCompiledHTML(true));
-                    
-                    $numbered_pdf = $this->pageNumbering($pdf, $this->company);
 
-                        if($numbered_pdf)
-                            $pdf = $numbered_pdf;
+                $numbered_pdf = $this->pageNumbering($pdf, $this->company);
+
+                if ($numbered_pdf) {
+                    $pdf = $numbered_pdf;
+                }
             }
-
         } catch (\Exception $e) {
             nlog(print_r($e->getMessage(), 1));
         }
@@ -203,16 +199,14 @@ class CreateRawPdf implements ShouldQueue
             info($maker->getCompiledHTML());
         }
 
-        if ($pdf) 
+        if ($pdf) {
             return $pdf;
+        }
 
-        throw new FilePermissionsFailure("Unable to generate the raw PDF");
-
+        throw new FilePermissionsFailure('Unable to generate the raw PDF');
     }
 
     public function failed($e)
     {
-
     }
-    
 }
diff --git a/app/Jobs/Entity/EmailEntity.php b/app/Jobs/Entity/EmailEntity.php
index 7ec7839c46c2..ce76748a6f6e 100644
--- a/app/Jobs/Entity/EmailEntity.php
+++ b/app/Jobs/Entity/EmailEntity.php
@@ -32,9 +32,9 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Str;
-use Illuminate\Support\Facades\App;
 
 /*Multi Mailer implemented*/
 
@@ -61,11 +61,11 @@ class EmailEntity implements ShouldQueue
     public $template_data; //The data to be merged into the template
 
     public $tries = 1;
-   
+
     /**
      * EmailEntity constructor.
      *
-     * 
+     *
      * @param Invitation $invitation
      * @param Company    $company
      * @param ?string    $reminder_template
@@ -101,9 +101,10 @@ class EmailEntity implements ShouldQueue
     public function handle()
     {
         /* Don't fire emails if the company is disabled */
-        if ($this->company->is_disabled) 
+        if ($this->company->is_disabled) {
             return true;
-        
+        }
+
         /* Set DB */
         MultiDB::setDB($this->company->db);
 
@@ -114,7 +115,7 @@ class EmailEntity implements ShouldQueue
 
         /* Mark entity sent */
         $this->entity->service()->markSent()->save();
-        
+
         $nmo = new NinjaMailerObject;
         $nmo->mailable = new TemplateEmail($this->email_entity_builder, $this->invitation->contact, $this->invitation);
         $nmo->company = $this->company;
@@ -124,10 +125,8 @@ class EmailEntity implements ShouldQueue
         $nmo->invitation = $this->invitation;
         $nmo->reminder_template = $this->reminder_template;
         $nmo->entity = $this->entity;
-        
-        NinjaMailerJob::dispatchNow($nmo);
-
 
+        (new NinjaMailerJob($nmo))->handle();
     }
 
     private function resolveEntityString() :string
@@ -152,7 +151,7 @@ class EmailEntity implements ShouldQueue
                 break;
 
             default:
-                # code...
+                // code...
                 break;
         }
     }
@@ -160,8 +159,13 @@ class EmailEntity implements ShouldQueue
     /* Builds the email builder object */
     private function resolveEmailBuilder()
     {
-        $class = 'App\Mail\Engine\\' . ucfirst(Str::camel($this->entity_string)) . "EmailEngine";
+        $class = 'App\Mail\Engine\\'.ucfirst(Str::camel($this->entity_string)).'EmailEngine';
 
         return (new $class($this->invitation, $this->reminder_template, $this->template_data))->build();
     }
+
+    public function failed($e)
+    {
+        // nlog($e->getMessage());
+    }
 }
diff --git a/app/Jobs/Import/CSVImport.php b/app/Jobs/Import/CSVImport.php
index 4f009b310b43..61b66c4c343e 100644
--- a/app/Jobs/Import/CSVImport.php
+++ b/app/Jobs/Import/CSVImport.php
@@ -45,6 +45,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Validator;
@@ -53,559 +54,574 @@ use League\Csv\Reader;
 use League\Csv\Statement;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request;
-use Illuminate\Support\Facades\App;
 
-class CSVImport implements ShouldQueue {
-	
-	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, CleanLineItems;
+class CSVImport implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, CleanLineItems;
 
-	public $invoice;
+    public $invoice;
 
-	public $company;
+    public $company;
 
-	public $hash;
+    public $hash;
 
-	public $import_type;
+    public $import_type;
 
-	public $skip_header;
+    public $skip_header;
 
-	public $column_map;
+    public $column_map;
 
-	public $import_array;
+    public $import_array;
 
-	public $error_array = [];
+    public $error_array = [];
 
-	public $maps;
+    public $maps;
 
-	public function __construct( array $request, Company $company ) {
-		$this->company     = $company;
-		$this->hash        = $request['hash'];
-		$this->import_type = $request['import_type'];
-		$this->skip_header = $request['skip_header'] ?? null;
-		$this->column_map  =
-			! empty( $request['column_map'] ) ?
-				array_combine( array_keys( $request['column_map'] ), array_column( $request['column_map'], 'mapping' ) ) : null;
-	}
+    public function __construct(array $request, Company $company)
+    {
+        $this->company = $company;
+        $this->hash = $request['hash'];
+        $this->import_type = $request['import_type'];
+        $this->skip_header = $request['skip_header'] ?? null;
+        $this->column_map =
+            ! empty($request['column_map']) ?
+                array_combine(array_keys($request['column_map']), array_column($request['column_map'], 'mapping')) : null;
+    }
 
-	/**
-	 * Execute the job.
-	 *
-	 *
-	 * @return void
-	 */
-	public function handle() {
+    /**
+     * Execute the job.
+     *
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        MultiDB::setDb($this->company->db);
 
-		MultiDB::setDb( $this->company->db );
+        Auth::login($this->company->owner(), true);
 
-		Auth::login( $this->company->owner(), true );
-		
-		auth()->user()->setCompany($this->company);
+        auth()->user()->setCompany($this->company);
 
-		$this->buildMaps();
+        $this->buildMaps();
 
-		nlog( "import " . $this->import_type );
-		foreach ( [ 'client', 'product', 'invoice', 'payment', 'vendor', 'expense' ] as $entityType ) {
-			$csvData = $this->getCsvData( $entityType );
+        nlog('import '.$this->import_type);
+        foreach (['client', 'product', 'invoice', 'payment', 'vendor', 'expense'] as $entityType) {
+            $csvData = $this->getCsvData($entityType);
 
-			if ( ! empty( $csvData ) ) {
-				$importFunction       = "import" . Str::plural( Str::title( $entityType ) );
-				$preTransformFunction = "preTransform" . Str::title( $this->import_type );
+            if (! empty($csvData)) {
+                $importFunction = 'import'.Str::plural(Str::title($entityType));
+                $preTransformFunction = 'preTransform'.Str::title($this->import_type);
 
-				if ( method_exists( $this, $preTransformFunction ) ) {
-					$csvData = $this->$preTransformFunction( $csvData, $entityType );
-				}
+                if (method_exists($this, $preTransformFunction)) {
+                    $csvData = $this->$preTransformFunction($csvData, $entityType);
+                }
 
-				if ( empty( $csvData ) ) {
-					continue;
-				}
+                if (empty($csvData)) {
+                    continue;
+                }
 
-				if ( method_exists( $this, $importFunction ) ) {
-					// If there's an entity-specific import function, use that.
-					$this->$importFunction( $csvData );
-				} else {
-					// Otherwise, use the generic import function.
-					$this->importEntities( $csvData, $entityType );
-				}
-			}
-		}
+                if (method_exists($this, $importFunction)) {
+                    // If there's an entity-specific import function, use that.
+                    $this->$importFunction($csvData);
+                } else {
+                    // Otherwise, use the generic import function.
+                    $this->importEntities($csvData, $entityType);
+                }
+            }
+        }
 
-		$data = [
-			'errors'  => $this->error_array,
-			'company' => $this->company,
-		];
+        $data = [
+            'errors'  => $this->error_array,
+            'company' => $this->company,
+        ];
 
-		$nmo = new NinjaMailerObject;
-		$nmo->mailable = new ImportCompleted($this->company, $data);
-		$nmo->company = $this->company;
-		$nmo->settings = $this->company->settings;
-		$nmo->to_user = $this->company->owner();
+        $nmo = new NinjaMailerObject;
+        $nmo->mailable = new ImportCompleted($this->company, $data);
+        $nmo->company = $this->company;
+        $nmo->settings = $this->company->settings;
+        $nmo->to_user = $this->company->owner();
 
-		NinjaMailerJob::dispatch($nmo);
-	}
+        NinjaMailerJob::dispatch($nmo);
+    }
 
-	//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	private function preTransformCsv( $csvData, $entityType ) {
-		if ( empty( $this->column_map[ $entityType ] ) ) {
-			return false;
-		}
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    private function preTransformCsv($csvData, $entityType)
+    {
+        if (empty($this->column_map[$entityType])) {
+            return false;
+        }
 
-		if ( $this->skip_header ) {
-			array_shift( $csvData );
-		}
+        if ($this->skip_header) {
+            array_shift($csvData);
+        }
 
-		//sort the array by key
-		$keys = $this->column_map[ $entityType ];
-		ksort( $keys );
+        //sort the array by key
+        $keys = $this->column_map[$entityType];
+        ksort($keys);
 
-		$csvData = array_map( function ( $row ) use ( $keys ) {
-			return array_combine( $keys, array_intersect_key( $row, $keys ) );
-		}, $csvData );
+        $csvData = array_map(function ($row) use ($keys) {
+            return array_combine($keys, array_intersect_key($row, $keys));
+        }, $csvData);
 
-		if ( $entityType === 'invoice' ) {
-			$csvData = $this->groupInvoices( $csvData, 'invoice.number' );
-		}
-
-		return $csvData;
-	}
-
-	private function preTransformFreshbooks( $csvData, $entityType ) {
-		$csvData = $this->mapCSVHeaderToKeys( $csvData );
-
-		if ( $entityType === 'invoice' ) {
-			$csvData = $this->groupInvoices( $csvData, 'Invoice #' );
-		}
-
-		return $csvData;
-	}
-
-	private function preTransformInvoicely( $csvData, $entityType ) {
-		$csvData = $this->mapCSVHeaderToKeys( $csvData );
-
-		return $csvData;
-	}
-
-	private function preTransformInvoice2go( $csvData, $entityType ) {
-		$csvData = $this->mapCSVHeaderToKeys( $csvData );
-
-		return $csvData;
-	}
-
-	private function preTransformZoho( $csvData, $entityType ) {
-		$csvData = $this->mapCSVHeaderToKeys( $csvData );
-
-		if ( $entityType === 'invoice' ) {
-			$csvData = $this->groupInvoices( $csvData, 'Invoice Number' );
-		}
-
-		return $csvData;
-	}
-
-	private function preTransformWaveaccounting( $csvData, $entityType ) {
-		$csvData = $this->mapCSVHeaderToKeys( $csvData );
-
-		if ( $entityType === 'invoice' ) {
-			$csvData = $this->groupInvoices( $csvData, 'Invoice Number' );
-		}
-
-		return $csvData;
-	}
-
-	private function groupInvoices( $csvData, $key ) {
-		// Group by invoice.
-		$grouped = [];
-
-		foreach ( $csvData as $line_item ) {
-			if ( empty( $line_item[ $key ] ) ) {
-				$this->error_array['invoice'][] = [ 'invoice' => $line_item, 'error' => 'No invoice number' ];
-			} else {
-				$grouped[ $line_item[ $key ] ][] = $line_item;
-			}
-		}
-
-		return $grouped;
-	}
-
-	private function mapCSVHeaderToKeys( $csvData ) {
-		$keys = array_shift( $csvData );
-
-		return array_map( function ( $values ) use ( $keys ) {
-			return array_combine( $keys, $values );
-		}, $csvData );
-	}
-
-	//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	private function importInvoices( $invoices ) {
-		$invoice_transformer = $this->getTransformer( 'invoice' );
-
-		/** @var PaymentRepository $payment_repository */
-		$payment_repository              = app()->make( PaymentRepository::class );
-		$payment_repository->import_mode = true;
-
-		/** @var ClientRepository $client_repository */
-		$client_repository              = app()->make( ClientRepository::class );
-		$client_repository->import_mode = true;
-
-		$invoice_repository              = new InvoiceRepository();
-		$invoice_repository->import_mode = true;
-
-		foreach ( $invoices as $raw_invoice ) {
-			try {
-				$invoice_data = $invoice_transformer->transform( $raw_invoice );
-
-				$invoice_data['line_items'] = $this->cleanItems( $invoice_data['line_items'] ?? [] );
-
-
-				// If we don't have a client ID, but we do have client data, go ahead and create the client.
-				if ( empty( $invoice_data['client_id'] ) && ! empty( $invoice_data['client'] ) ) {
-					$client_data            = $invoice_data['client'];
-					$client_data['user_id'] = $this->getUserIDForRecord( $invoice_data );
-
-					$client_repository->save(
-						$client_data,
-						$client = ClientFactory::create( $this->company->id, $client_data['user_id'] )
-					);
-					$invoice_data['client_id'] = $client->id;
-					unset( $invoice_data['client'] );
-				}
-
-				$validator = Validator::make( $invoice_data, ( new StoreInvoiceRequest() )->rules() );
-				if ( $validator->fails() ) {
-					$this->error_array['invoice'][] =
-						[ 'invoice' => $invoice_data, 'error' => $validator->errors()->all() ];
-				} else {
-					$invoice = InvoiceFactory::create( $this->company->id, $this->getUserIDForRecord( $invoice_data ) );
-					if ( ! empty( $invoice_data['status_id'] ) ) {
-						$invoice->status_id = $invoice_data['status_id'];
-					}
-					$invoice_repository->save( $invoice_data, $invoice );
-					$this->addInvoiceToMaps( $invoice );
-
-					// If we're doing a generic CSV import, only import payment data if we're not importing a payment CSV.
-					// If we're doing a platform-specific import, trust the platform to only return payment info if there's not a separate payment CSV.
-					if ( $this->import_type !== 'csv' || empty( $this->column_map['payment'] ) ) {
-						// Check for payment columns
-						if ( ! empty( $invoice_data['payments'] ) ) {
-							foreach ( $invoice_data['payments'] as $payment_data ) {
-								$payment_data['user_id']   = $invoice->user_id;
-								$payment_data['client_id'] = $invoice->client_id;
-								$payment_data['invoices']  = [
-									[
-										'invoice_id' => $invoice->id,
-										'amount'     => $payment_data['amount'] ?? null,
-									],
-								];
-
-								/* Make sure we don't apply any payments to invoices with a Zero Amount*/
-								if($invoice->amount > 0)
-								{
-									$payment_repository->save(
-										$payment_data,
-										PaymentFactory::create( $this->company->id, $invoice->user_id, $invoice->client_id )
-									);
-								}
-							}
-						}
-					}
-
-					$this->actionInvoiceStatus( $invoice, $invoice_data, $invoice_repository );
-				}
-			} catch ( \Exception $ex ) {
-				if ( $ex instanceof ImportException ) {
-					$message = $ex->getMessage();
-				} else {
-					report( $ex );
-					$message = 'Unknown error';
-				}
-
-				$this->error_array['invoice'][] = [ 'invoice' => $raw_invoice, 'error' => $message ];
-			}
-		}
-	}
-
-	private function actionInvoiceStatus( $invoice, $invoice_data, $invoice_repository ) {
-		if ( ! empty( $invoice_data['archived'] ) ) {
-			$invoice_repository->archive( $invoice );
-			$invoice->fresh();
-		}
-
-		if ( ! empty( $invoice_data['viewed'] ) ) {
-			$invoice = $invoice->service()->markViewed()->save();
-		}
-
-		if( $invoice->status_id === Invoice::STATUS_DRAFT ){
-
-		}
-		elseif ( $invoice->status_id === Invoice::STATUS_SENT ) {
-			$invoice = $invoice->service()->markSent()->save();
-		}
-		elseif ( $invoice->status_id <= Invoice::STATUS_SENT && $invoice->amount > 0 ) {
-			if ( $invoice->balance <= 0 ) {
-				$invoice->status_id = Invoice::STATUS_PAID;
-				$invoice->save();
-			}
-			elseif ( $invoice->balance != $invoice->amount ) {
-				$invoice->status_id = Invoice::STATUS_PARTIAL;
-				$invoice->save();
-			} 
-		}
-
-
-		return $invoice;
-	}
-
-	private function importEntities( $records, $entity_type ) {
-		$entity_type           = Str::slug( $entity_type, '_' );
-		$formatted_entity_type = Str::title( $entity_type );
-
-		$request_name    = "\\App\\Http\\Requests\\${formatted_entity_type}\\Store${formatted_entity_type}Request";
-		$repository_name = '\\App\\Repositories\\' . $formatted_entity_type . 'Repository';
-		$factoryName     = '\\App\\Factory\\' . $formatted_entity_type . 'Factory';
-
-		/** @var BaseRepository $repository */
-		$repository              = app()->make( $repository_name );
-		$repository->import_mode = true;
-
-		$transformer = $this->getTransformer( $entity_type );
-
-		foreach ( $records as $record ) {
-			try {
-				$entity = $transformer->transform( $record );
-
-				/** @var \App\Http\Requests\Request $request */
-				// $request = new $request_name();
-				// $request->prepareForValidation();
-
-				// Pass entity data to request so it can be validated
-				// $request->query = $request->request = new ParameterBag( $entity );
-				// $validator = Validator::make( $entity, $request->rules() );
-				$validator = $request_name::runFormRequest($entity);
-
-				if ( $validator->fails() ) {
-					$this->error_array[ $entity_type ][] =
-						[ $entity_type => $record, 'error' => $validator->errors()->all() ];
-				} else {
-					$entity =
-						$repository->save(
-							array_diff_key( $entity, [ 'user_id' => false ] ),
-							$factoryName::create( $this->company->id, $this->getUserIDForRecord( $entity ) ) );
-
-					$entity->save();
-					if ( method_exists( $this, 'add' . $formatted_entity_type . 'ToMaps' ) ) {
-						$this->{'add' . $formatted_entity_type . 'ToMaps'}( $entity );
-					}
-				}
-			} catch ( \Exception $ex ) {
-				if ( $ex instanceof ImportException ) {
-					$message = $ex->getMessage();
-				} else {
-					report( $ex );
-					$message = 'Unknown error';
-				}
-
-				$this->error_array[ $entity_type ][] = [ $entity_type => $record, 'error' => $message ];
-			}
-		}
-	}
-
-	/**
-	 * @param $entity_type
-	 *
-	 * @return BaseTransformer
-	 */
-	private function getTransformer( $entity_type ) {
-		$formatted_entity_type = Str::title( $entity_type );
-		$formatted_import_type = Str::title( $this->import_type );
-		$transformer_name      =
-			'\\App\\Import\\Transformers\\' . $formatted_import_type . '\\' . $formatted_entity_type . 'Transformer';
-
-		return new $transformer_name( $this->maps );
-	}
-
-	//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	private function buildMaps() {
-		$this->maps = [
-			'company'            => $this->company,
-			'client'             => [],
-			'contact'            => [],
-			'invoice'            => [],
-			'invoice_client'     => [],
-			'product'            => [],
-			'countries'          => [],
-			'countries2'         => [],
-			'currencies'         => [],
-			'client_ids'         => [],
-			'invoice_ids'        => [],
-			'vendors'            => [],
-			'expense_categories' => [],
-			'payment_types'      => [],
-			'tax_rates'          => [],
-			'tax_names'          => [],
-		];
-
-		Client::where('company_id', $this->company->id)->cursor()->each(function ($client){
-			$this->addClientToMaps( $client );
-		});
-
-		ClientContact::where('company_id', $this->company->id)->cursor()->each(function ($contact){
-			$this->addContactToMaps( $contact );
-		});
-
-		Invoice::where('company_id', $this->company->id)->cursor()->each(function ($invoice){
-			$this->addInvoiceToMaps( $invoice );
-		});
-
-		Product::where('company_id', $this->company->id)->cursor()->each(function ($product){
-			$this->addProductToMaps( $product );
-		});
-
-		Project::where('company_id', $this->company->id)->cursor()->each(function ($project){
-			$this->addProjectToMaps( $project );
-		});
-
-		Country::all()->each(function ($country){
-			$this->maps['countries'][ strtolower( $country->name ) ]        = $country->id;
-			$this->maps['countries2'][ strtolower( $country->iso_3166_2 ) ] = $country->id;
-		});
-
-		Currency::all()->each(function ($currency){
-			$this->maps['currencies'][ strtolower( $currency->code ) ] = $currency->id;
-		});
-
-		PaymentType::all()->each(function ($payment_type){
-			$this->maps['payment_types'][ strtolower( $payment_type->name ) ] = $payment_type->id;
-		});
-
-		Vendor::where('company_id', $this->company->id)->cursor()->each(function ($vendor){
-			$this->addVendorToMaps( $vendor );
-		});
-
-		ExpenseCategory::where('company_id', $this->company->id)->cursor()->each(function ($category){
-			$this->addExpenseCategoryToMaps( $category );
-		});
-
-		TaxRate::where('company_id', $this->company->id)->cursor()->each(function ($taxRate){
-			$name                             = trim( strtolower( $taxRate->name ) );
-			$this->maps['tax_rates'][ $name ] = $taxRate->rate;
-			$this->maps['tax_names'][ $name ] = $taxRate->name;
-		});
-	}
-
-	/**
-	 * @param Invoice $invoice
-	 */
-	private function addInvoiceToMaps( Invoice $invoice ) {
-		if ( $number = strtolower( trim( $invoice->number ) ) ) {
-			$this->maps['invoices'][ $number ]                = $invoice;
-			$this->maps['invoice'][ $number ]                 = $invoice->id;
-			$this->maps['invoice_client'][ $number ]          = $invoice->client_id;
-			$this->maps['invoice_ids'][ $invoice->public_id ] = $invoice->id;
-		}
-	}
-
-	/**
-	 * @param Client $client
-	 */
-	private function addClientToMaps( Client $client ) {
-		if ( $name = strtolower( trim( $client->name ) ) ) {
-			$this->maps['client'][ $name ]                  = $client->id;
-			$this->maps['client_ids'][ $client->public_id ] = $client->id;
-		}
-		if ( $client->contacts->count() ) {
-			$contact = $client->contacts[0];
-			if ( $email = strtolower( trim( $contact->email ) ) ) {
-				$this->maps['client'][ $email ] = $client->id;
-			}
-			if ( $name = strtolower( trim( $contact->first_name . ' ' . $contact->last_name ) ) ) {
-				$this->maps['client'][ $name ] = $client->id;
-			}
-			$this->maps['client_ids'][ $client->public_id ] = $client->id;
-		}
-	}
-
-	/**
-	 * @param ClientContact $contact
-	 */
-	private function addContactToMaps( ClientContact $contact ) {
-		if ( $key = strtolower( trim( $contact->email ) ) ) {
-			$this->maps['contact'][ $key ] = $contact;
-		}
-	}
-
-	/**
-	 * @param Product $product
-	 */
-	private function addProductToMaps( Product $product ) {
-		if ( $key = strtolower( trim( $product->product_key ) ) ) {
-			$this->maps['product'][ $key ] = $product;
-		}
-	}
-
-	/**
-	 * @param Project $project
-	 */
-	private function addProjectToMaps( Project $project ) {
-		if ( $key = strtolower( trim( $project->name ) ) ) {
-			$this->maps['project'][ $key ] = $project;
-		}
-	}
-
-	private function addVendorToMaps( Vendor $vendor ) {
-		$this->maps['vendor'][ strtolower( $vendor->name ) ] = $vendor->id;
-	}
-
-	private function addExpenseCategoryToMaps( ExpenseCategory $category ) {
-		if ( $name = strtolower( $category->name ) ) {
-			$this->maps['expense_category'][ $name ] = $category->id;
-		}
-	}
-
-
-	private function getUserIDForRecord( $record ) {
-		if ( ! empty( $record['user_id'] ) ) {
-			return $this->findUser( $record['user_id'] );
-		} else {
-			return $this->company->owner()->id;
-		}
-	}
-
-	private function findUser( $user_hash ) {
-		$user = User::where( 'account_id', $this->company->account->id )
-					->where( \DB::raw( 'CONCAT_WS(" ", first_name, last_name)' ), 'like', '%' . $user_hash . '%' )
-					->first();
-
-		if ( $user ) {
-			return $user->id;
-		} else {
-			return $this->company->owner()->id;
-		}
-	}
-
-	private function getCsvData( $entityType ) {
-		$base64_encoded_csv = Cache::pull( $this->hash . '-' . $entityType );
-		if ( empty( $base64_encoded_csv ) ) {
-			return null;
-		}
-
-		$csv = base64_decode( $base64_encoded_csv );
-		$csv = Reader::createFromString( $csv );
-
-		$stmt = new Statement();
-		$data = iterator_to_array( $stmt->process( $csv ) );
-
-		if ( count( $data ) > 0 ) {
-			$headers = $data[0];
-
-			// Remove Invoice Ninja headers
-			if ( count( $headers ) && count( $data ) > 4 && $this->import_type === 'csv' ) {
-				$firstCell = $headers[0];
-				if ( strstr( $firstCell, config( 'ninja.app_name' ) ) ) {
-					array_shift( $data ); // Invoice Ninja...
-					array_shift( $data ); // <blank line>
-					array_shift( $data ); // Enitty Type Header
-				}
-			}
-		}
-
-		return $data;
-	}
-}
\ No newline at end of file
+        if ($entityType === 'invoice') {
+            $csvData = $this->groupInvoices($csvData, 'invoice.number');
+        }
+
+        return $csvData;
+    }
+
+    private function preTransformFreshbooks($csvData, $entityType)
+    {
+        $csvData = $this->mapCSVHeaderToKeys($csvData);
+
+        if ($entityType === 'invoice') {
+            $csvData = $this->groupInvoices($csvData, 'Invoice #');
+        }
+
+        return $csvData;
+    }
+
+    private function preTransformInvoicely($csvData, $entityType)
+    {
+        $csvData = $this->mapCSVHeaderToKeys($csvData);
+
+        return $csvData;
+    }
+
+    private function preTransformInvoice2go($csvData, $entityType)
+    {
+        $csvData = $this->mapCSVHeaderToKeys($csvData);
+
+        return $csvData;
+    }
+
+    private function preTransformZoho($csvData, $entityType)
+    {
+        $csvData = $this->mapCSVHeaderToKeys($csvData);
+
+        if ($entityType === 'invoice') {
+            $csvData = $this->groupInvoices($csvData, 'Invoice Number');
+        }
+
+        return $csvData;
+    }
+
+    private function preTransformWaveaccounting($csvData, $entityType)
+    {
+        $csvData = $this->mapCSVHeaderToKeys($csvData);
+
+        if ($entityType === 'invoice') {
+            $csvData = $this->groupInvoices($csvData, 'Invoice Number');
+        }
+
+        return $csvData;
+    }
+
+    private function groupInvoices($csvData, $key)
+    {
+        // Group by invoice.
+        $grouped = [];
+
+        foreach ($csvData as $line_item) {
+            if (empty($line_item[$key])) {
+                $this->error_array['invoice'][] = ['invoice' => $line_item, 'error' => 'No invoice number'];
+            } else {
+                $grouped[$line_item[$key]][] = $line_item;
+            }
+        }
+
+        return $grouped;
+    }
+
+    private function mapCSVHeaderToKeys($csvData)
+    {
+        $keys = array_shift($csvData);
+
+        return array_map(function ($values) use ($keys) {
+            return array_combine($keys, $values);
+        }, $csvData);
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    private function importInvoices($invoices)
+    {
+        $invoice_transformer = $this->getTransformer('invoice');
+
+        /** @var PaymentRepository $payment_repository */
+        $payment_repository = app()->make(PaymentRepository::class);
+        $payment_repository->import_mode = true;
+
+        /** @var ClientRepository $client_repository */
+        $client_repository = app()->make(ClientRepository::class);
+        $client_repository->import_mode = true;
+
+        $invoice_repository = new InvoiceRepository();
+        $invoice_repository->import_mode = true;
+
+        foreach ($invoices as $raw_invoice) {
+            try {
+                $invoice_data = $invoice_transformer->transform($raw_invoice);
+
+                $invoice_data['line_items'] = $this->cleanItems($invoice_data['line_items'] ?? []);
+
+                // If we don't have a client ID, but we do have client data, go ahead and create the client.
+                if (empty($invoice_data['client_id']) && ! empty($invoice_data['client'])) {
+                    $client_data = $invoice_data['client'];
+                    $client_data['user_id'] = $this->getUserIDForRecord($invoice_data);
+
+                    $client_repository->save(
+                        $client_data,
+                        $client = ClientFactory::create($this->company->id, $client_data['user_id'])
+                    );
+                    $invoice_data['client_id'] = $client->id;
+                    unset($invoice_data['client']);
+                }
+
+                $validator = Validator::make($invoice_data, ( new StoreInvoiceRequest() )->rules());
+                if ($validator->fails()) {
+                    $this->error_array['invoice'][] =
+                        ['invoice' => $invoice_data, 'error' => $validator->errors()->all()];
+                } else {
+                    $invoice = InvoiceFactory::create($this->company->id, $this->getUserIDForRecord($invoice_data));
+                    if (! empty($invoice_data['status_id'])) {
+                        $invoice->status_id = $invoice_data['status_id'];
+                    }
+                    $invoice_repository->save($invoice_data, $invoice);
+                    $this->addInvoiceToMaps($invoice);
+
+                    // If we're doing a generic CSV import, only import payment data if we're not importing a payment CSV.
+                    // If we're doing a platform-specific import, trust the platform to only return payment info if there's not a separate payment CSV.
+                    if ($this->import_type !== 'csv' || empty($this->column_map['payment'])) {
+                        // Check for payment columns
+                        if (! empty($invoice_data['payments'])) {
+                            foreach ($invoice_data['payments'] as $payment_data) {
+                                $payment_data['user_id'] = $invoice->user_id;
+                                $payment_data['client_id'] = $invoice->client_id;
+                                $payment_data['invoices'] = [
+                                    [
+                                        'invoice_id' => $invoice->id,
+                                        'amount'     => $payment_data['amount'] ?? null,
+                                    ],
+                                ];
+
+                                /* Make sure we don't apply any payments to invoices with a Zero Amount*/
+                                if ($invoice->amount > 0) {
+                                    $payment_repository->save(
+                                        $payment_data,
+                                        PaymentFactory::create($this->company->id, $invoice->user_id, $invoice->client_id)
+                                    );
+                                }
+                            }
+                        }
+                    }
+
+                    $this->actionInvoiceStatus($invoice, $invoice_data, $invoice_repository);
+                }
+            } catch (\Exception $ex) {
+                if ($ex instanceof ImportException) {
+                    $message = $ex->getMessage();
+                } else {
+                    report($ex);
+                    $message = 'Unknown error';
+                }
+
+                $this->error_array['invoice'][] = ['invoice' => $raw_invoice, 'error' => $message];
+            }
+        }
+    }
+
+    private function actionInvoiceStatus($invoice, $invoice_data, $invoice_repository)
+    {
+        if (! empty($invoice_data['archived'])) {
+            $invoice_repository->archive($invoice);
+            $invoice->fresh();
+        }
+
+        if (! empty($invoice_data['viewed'])) {
+            $invoice = $invoice->service()->markViewed()->save();
+        }
+
+        if ($invoice->status_id === Invoice::STATUS_DRAFT) {
+        } elseif ($invoice->status_id === Invoice::STATUS_SENT) {
+            $invoice = $invoice->service()->markSent()->save();
+        } elseif ($invoice->status_id <= Invoice::STATUS_SENT && $invoice->amount > 0) {
+            if ($invoice->balance <= 0) {
+                $invoice->status_id = Invoice::STATUS_PAID;
+                $invoice->save();
+            } elseif ($invoice->balance != $invoice->amount) {
+                $invoice->status_id = Invoice::STATUS_PARTIAL;
+                $invoice->save();
+            }
+        }
+
+        return $invoice;
+    }
+
+    private function importEntities($records, $entity_type)
+    {
+        $entity_type = Str::slug($entity_type, '_');
+        $formatted_entity_type = Str::title($entity_type);
+
+        $request_name = "\\App\\Http\\Requests\\${formatted_entity_type}\\Store${formatted_entity_type}Request";
+        $repository_name = '\\App\\Repositories\\'.$formatted_entity_type.'Repository';
+        $factoryName = '\\App\\Factory\\'.$formatted_entity_type.'Factory';
+
+        /** @var BaseRepository $repository */
+        $repository = app()->make($repository_name);
+        $repository->import_mode = true;
+
+        $transformer = $this->getTransformer($entity_type);
+
+        foreach ($records as $record) {
+            try {
+                $entity = $transformer->transform($record);
+
+                /** @var \App\Http\Requests\Request $request */
+                // $request = new $request_name();
+                // $request->prepareForValidation();
+
+                // Pass entity data to request so it can be validated
+                // $request->query = $request->request = new ParameterBag( $entity );
+                // $validator = Validator::make( $entity, $request->rules() );
+                $validator = $request_name::runFormRequest($entity);
+
+                if ($validator->fails()) {
+                    $this->error_array[$entity_type][] =
+                        [$entity_type => $record, 'error' => $validator->errors()->all()];
+                } else {
+                    $entity =
+                        $repository->save(
+                            array_diff_key($entity, ['user_id' => false]),
+                            $factoryName::create($this->company->id, $this->getUserIDForRecord($entity)));
+
+                    $entity->save();
+                    if (method_exists($this, 'add'.$formatted_entity_type.'ToMaps')) {
+                        $this->{'add'.$formatted_entity_type.'ToMaps'}($entity);
+                    }
+                }
+            } catch (\Exception $ex) {
+                if ($ex instanceof ImportException) {
+                    $message = $ex->getMessage();
+                } else {
+                    report($ex);
+                    $message = 'Unknown error';
+                }
+
+                $this->error_array[$entity_type][] = [$entity_type => $record, 'error' => $message];
+            }
+        }
+    }
+
+    /**
+     * @param $entity_type
+     *
+     * @return BaseTransformer
+     */
+    private function getTransformer($entity_type)
+    {
+        $formatted_entity_type = Str::title($entity_type);
+        $formatted_import_type = Str::title($this->import_type);
+        $transformer_name =
+            '\\App\\Import\\Transformers\\'.$formatted_import_type.'\\'.$formatted_entity_type.'Transformer';
+
+        return new $transformer_name($this->maps);
+    }
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    private function buildMaps()
+    {
+        $this->maps = [
+            'company'            => $this->company,
+            'client'             => [],
+            'contact'            => [],
+            'invoice'            => [],
+            'invoice_client'     => [],
+            'product'            => [],
+            'countries'          => [],
+            'countries2'         => [],
+            'currencies'         => [],
+            'client_ids'         => [],
+            'invoice_ids'        => [],
+            'vendors'            => [],
+            'expense_categories' => [],
+            'payment_types'      => [],
+            'tax_rates'          => [],
+            'tax_names'          => [],
+        ];
+
+        Client::where('company_id', $this->company->id)->cursor()->each(function ($client) {
+            $this->addClientToMaps($client);
+        });
+
+        ClientContact::where('company_id', $this->company->id)->cursor()->each(function ($contact) {
+            $this->addContactToMaps($contact);
+        });
+
+        Invoice::where('company_id', $this->company->id)->cursor()->each(function ($invoice) {
+            $this->addInvoiceToMaps($invoice);
+        });
+
+        Product::where('company_id', $this->company->id)->cursor()->each(function ($product) {
+            $this->addProductToMaps($product);
+        });
+
+        Project::where('company_id', $this->company->id)->cursor()->each(function ($project) {
+            $this->addProjectToMaps($project);
+        });
+
+        Country::all()->each(function ($country) {
+            $this->maps['countries'][strtolower($country->name)] = $country->id;
+            $this->maps['countries2'][strtolower($country->iso_3166_2)] = $country->id;
+        });
+
+        Currency::all()->each(function ($currency) {
+            $this->maps['currencies'][strtolower($currency->code)] = $currency->id;
+        });
+
+        PaymentType::all()->each(function ($payment_type) {
+            $this->maps['payment_types'][strtolower($payment_type->name)] = $payment_type->id;
+        });
+
+        Vendor::where('company_id', $this->company->id)->cursor()->each(function ($vendor) {
+            $this->addVendorToMaps($vendor);
+        });
+
+        ExpenseCategory::where('company_id', $this->company->id)->cursor()->each(function ($category) {
+            $this->addExpenseCategoryToMaps($category);
+        });
+
+        TaxRate::where('company_id', $this->company->id)->cursor()->each(function ($taxRate) {
+            $name = trim(strtolower($taxRate->name));
+            $this->maps['tax_rates'][$name] = $taxRate->rate;
+            $this->maps['tax_names'][$name] = $taxRate->name;
+        });
+    }
+
+    /**
+     * @param Invoice $invoice
+     */
+    private function addInvoiceToMaps(Invoice $invoice)
+    {
+        if ($number = strtolower(trim($invoice->number))) {
+            $this->maps['invoices'][$number] = $invoice;
+            $this->maps['invoice'][$number] = $invoice->id;
+            $this->maps['invoice_client'][$number] = $invoice->client_id;
+            $this->maps['invoice_ids'][$invoice->public_id] = $invoice->id;
+        }
+    }
+
+    /**
+     * @param Client $client
+     */
+    private function addClientToMaps(Client $client)
+    {
+        if ($name = strtolower(trim($client->name))) {
+            $this->maps['client'][$name] = $client->id;
+            $this->maps['client_ids'][$client->public_id] = $client->id;
+        }
+        if ($client->contacts->count()) {
+            $contact = $client->contacts[0];
+            if ($email = strtolower(trim($contact->email))) {
+                $this->maps['client'][$email] = $client->id;
+            }
+            if ($name = strtolower(trim($contact->first_name.' '.$contact->last_name))) {
+                $this->maps['client'][$name] = $client->id;
+            }
+            $this->maps['client_ids'][$client->public_id] = $client->id;
+        }
+    }
+
+    /**
+     * @param ClientContact $contact
+     */
+    private function addContactToMaps(ClientContact $contact)
+    {
+        if ($key = strtolower(trim($contact->email))) {
+            $this->maps['contact'][$key] = $contact;
+        }
+    }
+
+    /**
+     * @param Product $product
+     */
+    private function addProductToMaps(Product $product)
+    {
+        if ($key = strtolower(trim($product->product_key))) {
+            $this->maps['product'][$key] = $product;
+        }
+    }
+
+    /**
+     * @param Project $project
+     */
+    private function addProjectToMaps(Project $project)
+    {
+        if ($key = strtolower(trim($project->name))) {
+            $this->maps['project'][$key] = $project;
+        }
+    }
+
+    private function addVendorToMaps(Vendor $vendor)
+    {
+        $this->maps['vendor'][strtolower($vendor->name)] = $vendor->id;
+    }
+
+    private function addExpenseCategoryToMaps(ExpenseCategory $category)
+    {
+        if ($name = strtolower($category->name)) {
+            $this->maps['expense_category'][$name] = $category->id;
+        }
+    }
+
+    private function getUserIDForRecord($record)
+    {
+        if (! empty($record['user_id'])) {
+            return $this->findUser($record['user_id']);
+        } else {
+            return $this->company->owner()->id;
+        }
+    }
+
+    private function findUser($user_hash)
+    {
+        $user = User::where('account_id', $this->company->account->id)
+                    ->where(\DB::raw('CONCAT_WS(" ", first_name, last_name)'), 'like', '%'.$user_hash.'%')
+                    ->first();
+
+        if ($user) {
+            return $user->id;
+        } else {
+            return $this->company->owner()->id;
+        }
+    }
+
+    private function getCsvData($entityType)
+    {
+        $base64_encoded_csv = Cache::pull($this->hash.'-'.$entityType);
+        if (empty($base64_encoded_csv)) {
+            return null;
+        }
+
+        $csv = base64_decode($base64_encoded_csv);
+        $csv = Reader::createFromString($csv);
+
+        $stmt = new Statement();
+        $data = iterator_to_array($stmt->process($csv));
+
+        if (count($data) > 0) {
+            $headers = $data[0];
+
+            // Remove Invoice Ninja headers
+            if (count($headers) && count($data) > 4 && $this->import_type === 'csv') {
+                $firstCell = $headers[0];
+                if (strstr($firstCell, config('ninja.app_name'))) {
+                    array_shift($data); // Invoice Ninja...
+                    array_shift($data); // <blank line>
+                    array_shift($data); // Enitty Type Header
+                }
+            }
+        }
+
+        return $data;
+    }
+}
diff --git a/app/Jobs/Import/CSVIngest.php b/app/Jobs/Import/CSVIngest.php
index 67ab635527b9..5313050be057 100644
--- a/app/Jobs/Import/CSVIngest.php
+++ b/app/Jobs/Import/CSVIngest.php
@@ -30,9 +30,9 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Str;
 
-class CSVIngest implements ShouldQueue {
-	
-	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+class CSVIngest implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public Company $company;
 
@@ -48,15 +48,16 @@ class CSVIngest implements ShouldQueue {
 
     public $tries = 1;
 
-    public function __construct( array $request, Company $company ) {
-        $this->company     = $company;
-        $this->request     = $request;
-        $this->hash        = $request['hash'];
+    public function __construct(array $request, Company $company)
+    {
+        $this->company = $company;
+        $this->request = $request;
+        $this->hash = $request['hash'];
         $this->import_type = $request['import_type'];
         $this->skip_header = $request['skip_header'] ?? null;
-        $this->column_map  =
-            ! empty( $request['column_map'] ) ?
-                array_combine( array_keys( $request['column_map'] ), array_column( $request['column_map'], 'mapping' ) ) : null;
+        $this->column_map =
+            ! empty($request['column_map']) ?
+                array_combine(array_keys($request['column_map']), array_column($request['column_map'], 'mapping')) : null;
     }
 
     /**
@@ -65,22 +66,20 @@ class CSVIngest implements ShouldQueue {
      *
      * @return void
      */
-    public function handle() {
-
-        MultiDB::setDb( $this->company->db );
+    public function handle()
+    {
+        MultiDB::setDb($this->company->db);
 
         set_time_limit(0);
 
-        $engine = $this->bootEngine($this->import_type);
+        $engine = $this->bootEngine();
 
-        foreach ( [ 'client', 'product', 'invoice', 'payment', 'vendor', 'expense' ] as $entity ) {
-        
+        foreach (['client', 'product', 'invoice', 'payment', 'vendor', 'expense'] as $entity) {
             $engine->import($entity);
-
         }
 
         $engine->finalizeImport();
-        
+
         $this->checkContacts();
     }
 
@@ -88,52 +87,43 @@ class CSVIngest implements ShouldQueue {
     {
         $vendors = Vendor::withTrashed()->where('company_id', $this->company->id)->doesntHave('contacts')->get();
 
-            foreach ($vendors as $vendor) {
-                
-                $new_contact = VendorContactFactory::create($vendor->company_id, $vendor->user_id);
-                $new_contact->vendor_id = $vendor->id;
-                $new_contact->contact_key = Str::random(40);
-                $new_contact->is_primary = true;
-                $new_contact->save();
-            }
+        foreach ($vendors as $vendor) {
+            $new_contact = VendorContactFactory::create($vendor->company_id, $vendor->user_id);
+            $new_contact->vendor_id = $vendor->id;
+            $new_contact->contact_key = Str::random(40);
+            $new_contact->is_primary = true;
+            $new_contact->save();
+        }
 
         $clients = Client::withTrashed()->where('company_id', $this->company->id)->doesntHave('contacts')->get();
 
-            foreach ($clients as $client) {
-                
-                $new_contact = ClientContactFactory::create($client->company_id, $client->user_id);
-                $new_contact->client_id = $client->id;
-                $new_contact->contact_key = Str::random(40);
-                $new_contact->is_primary = true;
-                $new_contact->save();
-            }
-
+        foreach ($clients as $client) {
+            $new_contact = ClientContactFactory::create($client->company_id, $client->user_id);
+            $new_contact->client_id = $client->id;
+            $new_contact->contact_key = Str::random(40);
+            $new_contact->is_primary = true;
+            $new_contact->save();
+        }
     }
 
-    private function bootEngine(string $import_type)
+    private function bootEngine()
     {
-        switch ($import_type) {
+        switch ($this->import_type) {
             case 'csv':
-                return new Csv( $this->request,  $this->company);
-                break;
+                return new Csv($this->request, $this->company);
             case 'waveaccounting':
-                return new Wave( $this->request,  $this->company);
-                break;
+                return new Wave($this->request, $this->company);
             case 'invoicely':
-                return new Invoicely( $this->request,  $this->company);
-                break;
+                return new Invoicely($this->request, $this->company);
             case 'invoice2go':
-                return new Invoice2Go( $this->request,  $this->company);
-                break;
+                return new Invoice2Go($this->request, $this->company);
             case 'zoho':
-                return new Zoho( $this->request,  $this->company);
-                break;
+                return new Zoho($this->request, $this->company);
             case 'freshbooks':
-                return new Freshbooks( $this->request,  $this->company);
-                break;                          
+                return new Freshbooks($this->request, $this->company);
             default:
-                // code...
+                nlog("could not return provider");
                 break;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/Jobs/Inventory/AdjustProductInventory.php b/app/Jobs/Inventory/AdjustProductInventory.php
index 0ba808079998..1cf9476d4ed2 100644
--- a/app/Jobs/Inventory/AdjustProductInventory.php
+++ b/app/Jobs/Inventory/AdjustProductInventory.php
@@ -54,14 +54,13 @@ class AdjustProductInventory implements ShouldQueue
     {
         MultiDB::setDb($this->company->db);
 
-        if(count($this->old_invoice) > 0)
+        if (count($this->old_invoice) > 0) {
             $this->existingInventoryAdjustment();
+        }
 
         return $this->newInventoryAdjustment();
-
     }
 
-
     public function middleware()
     {
         return [new WithoutOverlapping($this->company->company_key)];
@@ -69,57 +68,48 @@ class AdjustProductInventory implements ShouldQueue
 
     private function newInventoryAdjustment()
     {
-        
         $line_items = $this->invoice->line_items;
 
-        foreach($line_items as $item)
-        {
-
+        foreach ($line_items as $item) {
             $p = Product::where('product_key', $item->product_key)->where('company_id', $this->company->id)->where('in_stock_quantity', '>', 0)->first();
 
-            if(!$p)
+            if (! $p) {
                 continue;
+            }
 
             $p->in_stock_quantity -= $item->quantity;
             $p->saveQuietly();
 
-            if($p->stock_notification_threshold && $p->in_stock_quantity <= $p->stock_notification_threshold)
+            if ($p->stock_notification_threshold && $p->in_stock_quantity <= $p->stock_notification_threshold) {
                 $this->notifyStockLevels($p, 'product');
-            elseif($this->company->stock_notification_threshold && $p->in_stock_quantity <= $this->company->stock_notification_threshold)
+            } elseif ($this->company->stock_notification_threshold && $p->in_stock_quantity <= $this->company->stock_notification_threshold) {
                 $this->notifyStocklevels($p, 'company');
-            
+            }
         }
-
     }
 
     private function existingInventoryAdjustment()
     {
-
-        foreach($this->old_invoice as $item)
-        {
+        foreach ($this->old_invoice as $item) {
             $p = Product::where('product_key', $item->product_key)->where('company_id', $this->company->id)->first();
 
-            if(!$p)
+            if (! $p) {
                 continue;
+            }
 
             $p->in_stock_quantity += $item->quantity;
             $p->saveQuietly();
-
         }
-
     }
 
     private function notifyStocklevels(Product $product, string $notification_level)
     {
-
         $nmo = new NinjaMailerObject;
-        $nmo->mailable = new NinjaMailer( (new InventoryNotificationObject($product, $notification_level))->build() );
+        $nmo->mailable = new NinjaMailer((new InventoryNotificationObject($product, $notification_level))->build());
         $nmo->company = $this->company;
         $nmo->settings = $this->company->settings;
         $nmo->to_user = $this->company->owner();
 
         NinjaMailerJob::dispatch($nmo);
-
     }
-
 }
diff --git a/app/Jobs/Invoice/BulkInvoiceJob.php b/app/Jobs/Invoice/BulkInvoiceJob.php
index 2cf263af9b1b..d46a2b009a4a 100644
--- a/app/Jobs/Invoice/BulkInvoiceJob.php
+++ b/app/Jobs/Invoice/BulkInvoiceJob.php
@@ -55,7 +55,6 @@ class BulkInvoiceJob implements ShouldQueue
      */
     public function handle()
     {
-
         $this->invoice->service()->touchReminder($this->reminder_template)->markSent()->save();
 
         $this->invoice->invitations->load('contact.client.country', 'invoice.client.country', 'invoice.company')->each(function ($invitation) {
@@ -65,7 +64,5 @@ class BulkInvoiceJob implements ShouldQueue
         if ($this->invoice->invitations->count() >= 1) {
             $this->invoice->entityEmailEvent($this->invoice->invitations->first(), 'invoice', $this->reminder_template);
         }
-
     }
-
 }
diff --git a/app/Jobs/Invoice/CreateUbl.php b/app/Jobs/Invoice/CreateUbl.php
index 85fca83bc805..8ab8946b9967 100644
--- a/app/Jobs/Invoice/CreateUbl.php
+++ b/app/Jobs/Invoice/CreateUbl.php
@@ -37,6 +37,7 @@ class CreateUbl implements ShouldQueue
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     const INVOICE_TYPE_STANDARD = 380;
+
     const INVOICE_TYPE_CREDIT = 381;
 
     public $invoice;
@@ -84,8 +85,7 @@ class CreateUbl implements ShouldQueue
         $taxtotal = new TaxTotal();
         $taxAmount1 = $taxAmount2 = $taxAmount3 = 0;
 
-        
-        if (strlen($invoice->tax_name1) > 1){
+        if (strlen($invoice->tax_name1) > 1) {
             $taxAmount1 = $this->createTaxRate($taxtotal, $taxable, $invoice->tax_rate1, $invoice->tax_name1);
         }
 
@@ -152,15 +152,15 @@ class CreateUbl implements ShouldQueue
         $taxtotal = new TaxTotal();
         $itemTaxAmount1 = $itemTaxAmount2 = $itemTaxAmount3 = 0;
 
-        if(strlen($item->tax_name1) > 1){
+        if (strlen($item->tax_name1) > 1) {
             $itemTaxAmount1 = $this->createTaxRate($taxtotal, $taxable, $item->tax_rate1, $item->tax_name1);
         }
 
-        if(strlen($item->tax_name2) > 1){
+        if (strlen($item->tax_name2) > 1) {
             $itemTaxAmount2 = $this->createTaxRate($taxtotal, $taxable, $item->tax_rate2, $item->tax_name2);
         }
 
-        if(strlen($item->tax_name3) > 1){
+        if (strlen($item->tax_name3) > 1) {
             $itemTaxAmount3 = $this->createTaxRate($taxtotal, $taxable, $item->tax_rate3, $item->tax_name3);
         }
 
diff --git a/app/Jobs/Invoice/InvoiceWorkflowSettings.php b/app/Jobs/Invoice/InvoiceWorkflowSettings.php
index c9387c9bc26c..006b8ebff76f 100644
--- a/app/Jobs/Invoice/InvoiceWorkflowSettings.php
+++ b/app/Jobs/Invoice/InvoiceWorkflowSettings.php
@@ -26,7 +26,9 @@ class InvoiceWorkflowSettings implements ShouldQueue
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public $invoice;
+
     public $client;
+
     private $base_repository;
 
     /**
diff --git a/app/Jobs/Invoice/UpdateReminders.php b/app/Jobs/Invoice/UpdateReminders.php
index 7b64a8d98507..ae8610ecef43 100644
--- a/app/Jobs/Invoice/UpdateReminders.php
+++ b/app/Jobs/Invoice/UpdateReminders.php
@@ -26,7 +26,6 @@ class UpdateReminders implements ShouldQueue
 
     public Company $company;
 
-
     public function __construct(Company $company)
     {
         $this->company = $company;
@@ -40,7 +39,6 @@ class UpdateReminders implements ShouldQueue
      */
     public function handle()
     {
-
         MultiDB::setDb($this->company->db);
 
         $this->company
@@ -48,10 +46,8 @@ class UpdateReminders implements ShouldQueue
              ->where('is_deleted', 0)
              ->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
              ->cursor()
-             ->each(function ($invoice){
-                $invoice->service()->setReminder()->save();
+             ->each(function ($invoice) {
+                 $invoice->service()->setReminder()->save();
              });
-
     }
-
 }
diff --git a/app/Jobs/Invoice/ZipInvoices.php b/app/Jobs/Invoice/ZipInvoices.php
index e24fb856d488..b0b8410b0136 100644
--- a/app/Jobs/Invoice/ZipInvoices.php
+++ b/app/Jobs/Invoice/ZipInvoices.php
@@ -49,7 +49,6 @@ class ZipInvoices implements ShouldQueue
      * @param $email
      * @deprecated confirm to be deleted
      * Create a new job instance.
-     *
      */
     public function __construct($invoices, Company $company, User $user)
     {
@@ -70,34 +69,28 @@ class ZipInvoices implements ShouldQueue
      * @throws \ZipStream\Exception\FileNotReadableException
      * @throws \ZipStream\Exception\OverflowException
      */
-    
     public function handle()
     {
         MultiDB::setDb($this->company->db);
 
-        # create new zip object
+        // create new zip object
         $zipFile = new \PhpZip\ZipFile();
         $file_name = date('Y-m-d').'_'.str_replace(' ', '_', trans('texts.invoices')).'.zip';
         $invitation = $this->invoices->first()->invitations->first();
         $path = $this->invoices->first()->client->invoice_filepath($invitation);
 
-        $this->invoices->each(function ($invoice){
-
-            CreateEntityPdf::dispatchNow($invoice->invitations()->first());
-
+        $this->invoices->each(function ($invoice) {
+            (new CreateEntityPdf($invoice->invitations()->first()))->handle();
         });
 
-        try{
-            
+        try {
             foreach ($this->invoices as $invoice) {
-        
                 $file = $invoice->service()->getInvoicePdf();
                 $zip_file_name = basename($file);
                 $zipFile->addFromString($zip_file_name, Storage::get($file));
 
                 //$download_file = file_get_contents($invoice->pdf_file_path($invitation, 'url', true));
                 //$zipFile->addFromString(basename($invoice->pdf_file_path($invitation)), $download_file);
-
             }
 
             Storage::put($path.$file_name, $zipFile->outputAsString());
@@ -107,21 +100,14 @@ class ZipInvoices implements ShouldQueue
             $nmo->to_user = $this->user;
             $nmo->settings = $this->settings;
             $nmo->company = $this->company;
-            
-            NinjaMailerJob::dispatch($nmo);
-            
-            UnlinkFile::dispatch(config('filesystems.default'), $path.$file_name)->delay(now()->addHours(1));
-            
 
-        }
-        catch(\PhpZip\Exception\ZipException $e){
-            nlog("could not make zip => ". $e->getMessage());
-        }
-        finally{
+            NinjaMailerJob::dispatch($nmo);
+
+            UnlinkFile::dispatch(config('filesystems.default'), $path.$file_name)->delay(now()->addHours(1));
+        } catch (\PhpZip\Exception\ZipException $e) {
+            nlog('could not make zip => '.$e->getMessage());
+        } finally {
             $zipFile->close();
         }
-
-
     }
-
 }
diff --git a/app/Jobs/Ledger/ClientLedgerBalanceUpdate.php b/app/Jobs/Ledger/ClientLedgerBalanceUpdate.php
index b532296a11d1..36055d693da4 100644
--- a/app/Jobs/Ledger/ClientLedgerBalanceUpdate.php
+++ b/app/Jobs/Ledger/ClientLedgerBalanceUpdate.php
@@ -31,10 +31,10 @@ class ClientLedgerBalanceUpdate implements ShouldQueue
 
     public $client;
 
+    public $deleteWhenMissingModels = true;
 
     public function __construct(Company $company, Client $client)
     {
-    
         $this->company = $company;
         $this->client = $client;
     }
@@ -50,36 +50,31 @@ class ClientLedgerBalanceUpdate implements ShouldQueue
         // nlog("Updating company ledger for client ". $this->client->id);
 
         MultiDB::setDb($this->company->db);
-        
-        CompanyLedger::where('balance', 0)->where('client_id', $this->client->id)->cursor()->each(function ($company_ledger){
 
-            if($company_ledger->balance > 0)
+        CompanyLedger::where('balance', 0)->where('client_id', $this->client->id)->cursor()->each(function ($company_ledger) {
+            if ($company_ledger->balance > 0) {
                 return;
+            }
 
-            $last_record =  CompanyLedger::where('client_id', $company_ledger->client_id)
+            $last_record = CompanyLedger::where('client_id', $company_ledger->client_id)
                             ->where('company_id', $company_ledger->company_id)
                             ->where('balance', '!=', 0)
                             ->orderBy('id', 'DESC')
                             ->first();
 
-            if(!$last_record){
-
-                $last_record =  CompanyLedger::where('client_id', $company_ledger->client_id)
+            if (! $last_record) {
+                $last_record = CompanyLedger::where('client_id', $company_ledger->client_id)
                 ->where('company_id', $company_ledger->company_id)
                 ->orderBy('id', 'DESC')
                 ->first();
-
             }
 
             // nlog("Updating Balance NOW");
-            
+
             $company_ledger->balance = $last_record->balance + $company_ledger->adjustment;
             $company_ledger->save();
-
         });
 
         // nlog("Updating company ledger for client ". $this->client->id);
-
     }
-
 }
diff --git a/app/Jobs/Ledger/LedgerBalanceUpdate.php b/app/Jobs/Ledger/LedgerBalanceUpdate.php
index 56afed59fba6..b01446d26f26 100644
--- a/app/Jobs/Ledger/LedgerBalanceUpdate.php
+++ b/app/Jobs/Ledger/LedgerBalanceUpdate.php
@@ -38,7 +38,7 @@ class LedgerBalanceUpdate implements ShouldQueue
      */
     public function handle() :void
     {
-        nlog("Updating company ledgers");
+        nlog('Updating company ledgers');
 
         if (! config('ninja.db.multi_db_enabled')) {
             $this->checkLedger();
@@ -51,36 +51,32 @@ class LedgerBalanceUpdate implements ShouldQueue
             }
         }
 
-        nlog("Finished checking company ledgers");
-
+        nlog('Finished checking company ledgers');
     }
 
     public function checkLedger()
     {
+        nlog('Checking ledgers....');
 
-        nlog("Checking ledgers....");
-
-        CompanyLedger::where('balance', 0)->where('adjustment', '!=', 0)->cursor()->each(function ($company_ledger){
-
-            if($company_ledger->balance > 0)
+        CompanyLedger::where('balance', 0)->where('adjustment', '!=', 0)->cursor()->each(function ($company_ledger) {
+            if ($company_ledger->balance > 0) {
                 return;
+            }
 
-            $last_record =  CompanyLedger::where('client_id', $company_ledger->client_id)
+            $last_record = CompanyLedger::where('client_id', $company_ledger->client_id)
                             ->where('company_id', $company_ledger->company_id)
                             ->where('balance', '!=', 0)
                             ->orderBy('id', 'DESC')
                             ->first();
 
-            if(!$last_record)
+            if (! $last_record) {
                 return;
+            }
+
+            nlog('Updating Balance NOW');
 
-            nlog("Updating Balance NOW");
-            
             $company_ledger->balance = $last_record->balance + $company_ledger->adjustment;
             $company_ledger->save();
-
         });
-
     }
-
 }
diff --git a/app/Jobs/Mail/NinjaMailer.php b/app/Jobs/Mail/NinjaMailer.php
index c05028057f6a..726327dba855 100644
--- a/app/Jobs/Mail/NinjaMailer.php
+++ b/app/Jobs/Mail/NinjaMailer.php
@@ -34,24 +34,23 @@ class NinjaMailer extends Mailable
      */
     public function build()
     {
-
         $from_name = config('mail.from.name');
 
-        if(property_exists($this->mail_obj, 'from_name')){
+        if (property_exists($this->mail_obj, 'from_name')) {
             $from_name = $this->mail_obj->from_name;
         }
 
-        $ninja_mailable =  $this->from(config('mail.from.address'), $from_name)
+        $ninja_mailable = $this->from(config('mail.from.address'), $from_name)
                     ->subject($this->mail_obj->subject)
                     ->view($this->mail_obj->markdown, $this->mail_obj->data)
-                    ->withSwiftMessage(function ($message) {
+                    ->withSymfonyMessage(function ($message) {
                         $message->getHeaders()->addTextHeader('Tag', $this->mail_obj->tag);
                     });
 
-        if(property_exists($this->mail_obj, 'text_view')){
+        if (property_exists($this->mail_obj, 'text_view')) {
             $ninja_mailable->text($this->mail_obj->text_view, $this->mail_obj->data);
         }
 
-        return $ninja_mailable;           
+        return $ninja_mailable;
     }
 }
diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php
index 245924ee94f9..23234de47dfd 100644
--- a/app/Jobs/Mail/NinjaMailerJob.php
+++ b/app/Jobs/Mail/NinjaMailerJob.php
@@ -100,6 +100,8 @@ class NinjaMailerJob implements ShouldQueue
             $this->nmo->mailable->replyTo($this->company->owner()->email, $this->company->owner()->present()->name());
         }
 
+        // $this->nmo->mailable->tag($this->company->company_key);
+
         //send email
         try {
             nlog("trying to send to {$this->nmo->to_user->email} ". now()->toDateTimeString());
@@ -115,7 +117,7 @@ class NinjaMailerJob implements ShouldQueue
             /* Count the amount of emails sent across all the users accounts */
             Cache::increment($this->company->account->key);
 
-        } catch (\Exception $e) {
+        } catch (\Exception | \RuntimeException $e) {
             
             nlog("error failed with {$e->getMessage()}");
 
@@ -228,8 +230,8 @@ class NinjaMailerJob implements ShouldQueue
         $this->nmo
              ->mailable
              ->from($user->email, $user->name())
-             ->withSwiftMessage(function ($message) use($token) {
-                $message->getHeaders()->addTextHeader('GmailToken', $token);     
+             ->withSymfonyMessage(function ($message) use($token) {
+                $message->getHeaders()->addTextHeader('gmailtoken', $token);     
              });
 
         sleep(rand(1,3));
@@ -237,8 +239,6 @@ class NinjaMailerJob implements ShouldQueue
 
     private function setGmailMailer()
     {
-        if(LaravelGmail::check())
-            LaravelGmail::logout();
 
         $sending_user = $this->nmo->settings->gmail_sending_user_id;
 
@@ -265,7 +265,7 @@ class NinjaMailerJob implements ShouldQueue
 
             $google->getClient()->setAccessToken(json_encode($user->oauth_user_token));
 
-            sleep(rand(2,6));
+            sleep(rand(2,4));
         }
         catch(\Exception $e) {
             $this->logMailError('Gmail Token Invalid', $this->company->clients()->first());
@@ -300,8 +300,8 @@ class NinjaMailerJob implements ShouldQueue
         $this->nmo
              ->mailable
              ->from($user->email, $user->name())
-             ->withSwiftMessage(function ($message) use($token) {
-                $message->getHeaders()->addTextHeader('GmailToken', $token);     
+             ->withSymfonyMessage(function ($message) use($token) {
+                $message->getHeaders()->addTextHeader('gmailtoken', $token);     
              });
 
     }
@@ -347,6 +347,10 @@ class NinjaMailerJob implements ShouldQueue
         if(class_exists(\Modules\Admin\Jobs\Account\EmailQuality::class))
             return (new \Modules\Admin\Jobs\Account\EmailQuality($this->nmo, $this->company))->run();
 
+        /* On the hosted platform if the user has not verified their account we fail here */
+        if(Ninja::isHosted() && $this->company->account && !$this->company->account->account_sms_verified)
+            return true;
+
         return false;
     }
 
diff --git a/app/Jobs/Mail/NinjaMailerObject.php b/app/Jobs/Mail/NinjaMailerObject.php
index c16d3f0c61bf..43541dbfc7cf 100644
--- a/app/Jobs/Mail/NinjaMailerObject.php
+++ b/app/Jobs/Mail/NinjaMailerObject.php
@@ -16,7 +16,6 @@ namespace App\Jobs\Mail;
  */
 class NinjaMailerObject
 {
-
     public $mailable;
 
     public $company;
@@ -30,12 +29,11 @@ class NinjaMailerObject
     public $transport; //not yet used
 
     /* Variable for cascading notifications */
-    public $entity_string = FALSE;
+    public $entity_string = false;
 
-    public $invitation = FALSE;
+    public $invitation = false;
 
-    public $template = FALSE;
+    public $template = false;
 
-    public $entity = FALSE;
-    
+    public $entity = false;
 }
diff --git a/app/Jobs/Mail/PaymentFailedMailer.php b/app/Jobs/Mail/PaymentFailedMailer.php
index 4188a3d035f3..9fb6b53d31f3 100644
--- a/app/Jobs/Mail/PaymentFailedMailer.php
+++ b/app/Jobs/Mail/PaymentFailedMailer.php
@@ -30,8 +30,8 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Mail;
 
 /*Multi Mailer implemented*/
 
@@ -57,12 +57,10 @@ class PaymentFailedMailer implements ShouldQueue
      */
     public function __construct(?PaymentHash $payment_hash, Company $company, Client $client, string $error)
     {
-
         $this->payment_hash = $payment_hash;
         $this->client = $client;
         $this->error = $error;
         $this->company = $company;
-
     }
 
     /**
@@ -75,20 +73,19 @@ class PaymentFailedMailer implements ShouldQueue
         //Set DB
         MultiDB::setDb($this->company->db);
         App::setLocale($this->client->locale());
-        
+
         $settings = $this->client->getMergedSettings();
 
         $amount = 0;
         $invoice = false;
 
-        if($this->payment_hash){
+        if ($this->payment_hash) {
             $amount = array_sum(array_column($this->payment_hash->invoices(), 'amount')) + $this->payment_hash->fee_total;
             $invoice = Invoice::whereIn('id', $this->transformKeys(array_column($this->payment_hash->invoices(), 'invoice_id')))->withTrashed()->first();
         }
 
         //iterate through company_users
-        $this->company->company_users->each(function ($company_user) use($amount, $settings, $invoice){        
-
+        $this->company->company_users->each(function ($company_user) use ($amount, $settings, $invoice) {
             $methods = $this->findUserEntityNotificationType($invoice ?: $this->client, $company_user, ['payment_failure_user', 'payment_failure_all', 'payment_failure', 'all_notifications']);
 
             //if mail is a method type -fire mail!!
@@ -104,16 +101,14 @@ class PaymentFailedMailer implements ShouldQueue
                 $nmo->settings = $settings;
 
                 NinjaMailerJob::dispatch($nmo);
-
             }
         });
 
         //add client payment failures here.
         //
-        if($this->client->contacts()->whereNotNull('email')->exists() && $this->payment_hash)
-        {
+        if ($this->client->contacts()->whereNotNull('email')->exists() && $this->payment_hash) {
             $contact = $this->client->contacts()->whereNotNull('email')->first();
-            
+
             $mail_obj = (new ClientPaymentFailureObject($this->client, $this->error, $this->company, $this->payment_hash))->build();
 
             $nmo = new NinjaMailerObject;
@@ -123,11 +118,6 @@ class PaymentFailedMailer implements ShouldQueue
             $nmo->settings = $settings;
 
             NinjaMailerJob::dispatch($nmo);
-            
         }
-        
     }
-
-
-
 }
diff --git a/app/Jobs/Mail/PaymentFailureMailer.php b/app/Jobs/Mail/PaymentFailureMailer.php
index 9584a54dc0c2..9f96d3b98f33 100644
--- a/app/Jobs/Mail/PaymentFailureMailer.php
+++ b/app/Jobs/Mail/PaymentFailureMailer.php
@@ -77,13 +77,14 @@ class PaymentFailureMailer implements ShouldQueue
         MultiDB::setDb($this->company->db);
 
         //iterate through company_users
-        $this->company->company_users->each(function ($company_user) {        
+        $this->company->company_users->each(function ($company_user) {
 
             //determine if this user has the right permissions
-            $methods = $this->findCompanyUserNotificationType($company_user, ['payment_failure_all','payment_failure', 'payment_failure_user', 'all_notifications']);
+            $methods = $this->findCompanyUserNotificationType($company_user, ['payment_failure_all', 'payment_failure', 'payment_failure_user', 'all_notifications']);
 
-            if(!is_string($this->error))
-                $this->error = "Undefined error. Please contact the administrator for further information.";
+            if (! is_string($this->error)) {
+                $this->error = 'Undefined error. Please contact the administrator for further information.';
+            }
 
             //if mail is a method type -fire mail!!
             if (($key = array_search('mail', $methods)) !== false) {
@@ -98,7 +99,6 @@ class PaymentFailureMailer implements ShouldQueue
                 $nmo->settings = $this->settings;
 
                 NinjaMailerJob::dispatch($nmo);
-
             }
         });
 
diff --git a/app/Jobs/Ninja/AdjustEmailQuota.php b/app/Jobs/Ninja/AdjustEmailQuota.php
index ff112ba2f9be..d7be86df3b99 100644
--- a/app/Jobs/Ninja/AdjustEmailQuota.php
+++ b/app/Jobs/Ninja/AdjustEmailQuota.php
@@ -42,28 +42,24 @@ class AdjustEmailQuota implements ShouldQueue
      */
     public function handle()
     {
-        if(!Ninja::isHosted())
+        if (! Ninja::isHosted()) {
             return;
+        }
 
         //multiDB environment, need to
         foreach (MultiDB::$dbs as $db) {
-
             MultiDB::setDB($db);
 
             $this->adjust();
-
         }
-        
     }
 
     public function adjust()
     {
-
-        Account::query()->cursor()->each(function ($account){
+        Account::query()->cursor()->each(function ($account) {
             nlog("resetting email quota for {$account->key}");
             Cache::forget($account->key);
             Cache::forget("throttle_notified:{$account->key}");
         });
-
     }
 }
diff --git a/app/Jobs/Ninja/CheckCompanyData.php b/app/Jobs/Ninja/CheckCompanyData.php
index b8105f367dcb..1fd8509805a0 100644
--- a/app/Jobs/Ninja/CheckCompanyData.php
+++ b/app/Jobs/Ninja/CheckCompanyData.php
@@ -23,9 +23,9 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\Middleware\RateLimited;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Turbo124\Beacon\Jobs\Database\MySQL\DbStatus;
-use Illuminate\Support\Facades\Cache;
 
 class CheckCompanyData implements ShouldQueue
 {
@@ -38,6 +38,7 @@ class CheckCompanyData implements ShouldQueue
     public $company_data = [];
 
     public $is_valid;
+
     /**
      * Create a new job instance.
      *
@@ -65,11 +66,11 @@ class CheckCompanyData implements ShouldQueue
         $this->checkContacts();
         $this->checkCompanyData();
 
-
-        if(Cache::has($this->hash))
+        if (Cache::has($this->hash)) {
             $cache_instance = Cache::get($this->hash);
-        else
+        } else {
             $cache_instance = Cache::add($this->hash, '');
+        }
 
         $this->company_data['company_hash'] = $this->company->company_hash;
 
@@ -78,13 +79,13 @@ class CheckCompanyData implements ShouldQueue
         nlog(Cache::get($this->hash));
         nlog($this->company_data);
 
-        if(!$this->is_valid)
+        if (! $this->is_valid) {
             $this->company_data['status'] = 'errors';
-        else
+        } else {
             $this->company_data['status'] = 'success';
+        }
 
         return $this->company_data;
-        
     }
 
     public function middleware()
@@ -92,7 +93,6 @@ class CheckCompanyData implements ShouldQueue
         return [new RateLimited('checkdata')];
     }
 
-
     private function checkInvoiceBalances()
     {
         $wrong_balances = 0;
@@ -108,10 +108,9 @@ class CheckCompanyData implements ShouldQueue
             $ledger = CompanyLedger::where('client_id', $client->id)->orderBy('id', 'DESC')->first();
 
             if ($ledger && number_format($invoice_balance, 4) != number_format($client->balance, 4)) {
-
                 $wrong_balances++;
 
-                $this->company_data[] = "# {$client->id} " . $client->present()->name.' - '.$client->number." - Balance Failure - Invoice Balances = {$invoice_balance} Client Balance = {$client->balance} Ledger Balance = {$ledger->balance} ";
+                $this->company_data[] = "# {$client->id} ".$client->present()->name.' - '.$client->number." - Balance Failure - Invoice Balances = {$invoice_balance} Client Balance = {$client->balance} Ledger Balance = {$ledger->balance} ";
 
                 $this->is_valid = false;
             }
@@ -134,7 +133,7 @@ class CheckCompanyData implements ShouldQueue
                 $total_paid = $total_amount - $total_refund;
                 $calculated_paid_amount = $invoice->amount - $invoice->balance - $total_credit;
 
-                if ((string)$total_paid != (string)($invoice->amount - $invoice->balance - $total_credit)) {
+                if ((string) $total_paid != (string) ($invoice->amount - $invoice->balance - $total_credit)) {
                     $wrong_balances++;
 
                     $this->company_data[] = $client->present()->name.' - '.$client->id." - Total Amount = {$total_amount} != Calculated Total = {$calculated_paid_amount} - Total Refund = {$total_refund} Total credit = {$total_credit}";
@@ -156,8 +155,6 @@ class CheckCompanyData implements ShouldQueue
             $total_invoice_payments = 0;
 
             foreach ($client->invoices->where('is_deleted', false)->where('status_id', '>', 1) as $invoice) {
-
-
                 $total_amount = $invoice->payments->where('is_deleted', false)->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment:: STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED, Payment::STATUS_REFUNDED])->sum('pivot.amount');
                 $total_refund = $invoice->payments->where('is_deleted', false)->whereIn('status_id', [Payment::STATUS_COMPLETED, Payment:: STATUS_PENDING, Payment::STATUS_PARTIALLY_REFUNDED, Payment::STATUS_REFUNDED])->sum('pivot.refunded');
 
@@ -187,7 +184,6 @@ class CheckCompanyData implements ShouldQueue
         $this->company_data[] = "{$wrong_paid_to_dates} clients with incorrect paid to dates";
     }
 
-
     private function checkClientBalances()
     {
         $wrong_balances = 0;
@@ -207,8 +203,8 @@ class CheckCompanyData implements ShouldQueue
 
             if ($ledger && (string) $invoice_balance != (string) $client->balance) {
                 $wrong_paid_to_dates++;
-                
-                $this->company_data[] = $client->present()->name.' - '.$client->id." - calculated client balances do not match {$invoice_balance} - ".rtrim($client->balance, '0')."";
+
+                $this->company_data[] = $client->present()->name.' - '.$client->id." - calculated client balances do not match {$invoice_balance} - ".rtrim($client->balance, '0').'';
 
                 $this->is_valid = false;
             }
@@ -226,7 +222,7 @@ class CheckCompanyData implements ShouldQueue
                         ->orderBy('id')
                         ->get(['id']);
 
-        $this->company_data[] =  $contacts->count().' contacts without a contact_key';
+        $this->company_data[] = $contacts->count().' contacts without a contact_key';
 
         if ($contacts->count() > 0) {
             $this->is_valid = false;
@@ -259,7 +255,7 @@ class CheckCompanyData implements ShouldQueue
         // }
 
         $clients = $clients->get(['clients.id', 'clients.user_id', 'clients.company_id']);
-        
+
         $this->company_data[] = $clients->count().' clients without any contacts';
 
         if ($clients->count() > 0) {
@@ -342,7 +338,6 @@ class CheckCompanyData implements ShouldQueue
                 }
             }
         }
-
     }
 
     public function pluralizeEntityType($type)
diff --git a/app/Jobs/Ninja/CheckDbStatus.php b/app/Jobs/Ninja/CheckDbStatus.php
index 82c8633d4f00..1fb53b1a123d 100644
--- a/app/Jobs/Ninja/CheckDbStatus.php
+++ b/app/Jobs/Ninja/CheckDbStatus.php
@@ -39,7 +39,7 @@ class CheckDbStatus implements ShouldQueue
      */
     public function handle()
     {
-        DbStatus::dispatchNow('db-ninja-01', 'db.status.db-ninja-01');
-        DbStatus::dispatchNow('db-ninja-02', 'db.status.db-ninja-02');
+        (new DbStatus('db-ninja-01', 'db.status.db-ninja-01'))->handle();
+        (new DbStatus('db-ninja-02', 'db.status.db-ninja-02'))->handle();
     }
 }
diff --git a/app/Jobs/Ninja/CompanySizeCheck.php b/app/Jobs/Ninja/CompanySizeCheck.php
index 991f864c2b56..cc9f3f50bbf8 100644
--- a/app/Jobs/Ninja/CompanySizeCheck.php
+++ b/app/Jobs/Ninja/CompanySizeCheck.php
@@ -54,20 +54,12 @@ class CompanySizeCheck implements ShouldQueue
 
     private function check()
     {
+        Company::where('is_large', false)->withCount(['invoices', 'clients', 'products'])->cursor()->each(function ($company) {
+            if ($company->invoices_count > 500 || $company->products_count > 500 || $company->clients_count > 500) {
+                nlog("Marking company {$company->id} as large");
 
-        Company::where('is_large', false)->withCount(['invoices','clients','products'])->cursor()->each(function ($company){
-            
-            if ($company->invoices_count > 500 || $company->products_count > 500 || $company->clients_count > 500) 
-            {
-                        
-            nlog("Marking company {$company->id} as large");
-
-            $company->account->companies()->update(['is_large' => true]);
-
+                $company->account->companies()->update(['is_large' => true]);
             }
-           
-           
-         });
-
+        });
     }
 }
diff --git a/app/Jobs/Ninja/QueueSize.php b/app/Jobs/Ninja/QueueSize.php
index f5a5d6951da3..6b037344f401 100644
--- a/app/Jobs/Ninja/QueueSize.php
+++ b/app/Jobs/Ninja/QueueSize.php
@@ -43,6 +43,6 @@ class QueueSize implements ShouldQueue
     public function handle()
     {
         LightLogs::create(new QueueSizeAnalytic(Queue::size()))
-         ->queue();        
+         ->queue();
     }
 }
diff --git a/app/Jobs/Ninja/RefundCancelledAccount.php b/app/Jobs/Ninja/RefundCancelledAccount.php
index 0a1154d153c6..2a208b426692 100644
--- a/app/Jobs/Ninja/RefundCancelledAccount.php
+++ b/app/Jobs/Ninja/RefundCancelledAccount.php
@@ -41,7 +41,7 @@ class RefundCancelledAccount implements ShouldQueue
 
         $plan_details = $this->account->getPlanDetails();
 
-        if (!$plan_details) {
+        if (! $plan_details) {
             return;
         }
 
@@ -49,12 +49,11 @@ class RefundCancelledAccount implements ShouldQueue
         if ($plan_details['trial_plan']) {
             return;
         }
-        
+
         /* Is the plan Active? */
         if (! $plan_details['active']) {
             return;
         }
-        
 
         /* Refundable client! */
 
diff --git a/app/Jobs/Ninja/SendReminders.php b/app/Jobs/Ninja/SendReminders.php
index 2af0071b3030..f2d520aac270 100644
--- a/app/Jobs/Ninja/SendReminders.php
+++ b/app/Jobs/Ninja/SendReminders.php
@@ -52,7 +52,7 @@ class SendReminders implements ShouldQueue
      */
     public function handle()
     {
-        nlog("Sending reminders ".Carbon::now()->format('Y-m-d h:i:s'));
+        nlog('Sending reminders '.Carbon::now()->format('Y-m-d h:i:s'));
 
         if (! config('ninja.db.multi_db_enabled')) {
             $this->sendReminderEmails();
@@ -66,7 +66,6 @@ class SendReminders implements ShouldQueue
         }
     }
 
-
     private function sendReminderEmails()
     {
         $invoices = Invoice::where('is_deleted', 0)
@@ -83,7 +82,7 @@ class SendReminders implements ShouldQueue
             $reminder_template = $invoice->calculateTemplate('invoice');
 
             nlog("hitting a reminder for {$invoice->number} with template {$reminder_template}");
-                
+
             if (in_array($reminder_template, ['reminder1', 'reminder2', 'reminder3', 'endless_reminder'])) {
                 $this->sendReminder($invoice, $reminder_template);
                 WebhookHandler::dispatch(Webhook::EVENT_REMIND_INVOICE, $invoice, $invoice->company);
@@ -129,42 +128,42 @@ class SendReminders implements ShouldQueue
         $set_reminder2 = false;
         $set_reminder3 = false;
 
-        if ((int)$settings->schedule_reminder1 > 0) {
-            $next_reminder_date = $this->calculateScheduledDate($invoice, $settings->schedule_reminder1, (int)$settings->num_days_reminder1);
+        if ((int) $settings->schedule_reminder1 > 0) {
+            $next_reminder_date = $this->calculateScheduledDate($invoice, $settings->schedule_reminder1, (int) $settings->num_days_reminder1);
 
             if ($next_reminder_date && $next_reminder_date->gt(Carbon::parse($invoice->last_sent_date)));
             $dates->push($next_reminder_date);
 
-            if (!$invoice->reminder1_sent) {
+            if (! $invoice->reminder1_sent) {
                 $set_reminder1 = true;
             }
         }
 
-        if ((int)$settings->num_days_reminder2 > 0) {
-            $next_reminder_date = $this->calculateScheduledDate($invoice, $settings->schedule_reminder2, (int)$settings->num_days_reminder2);
+        if ((int) $settings->num_days_reminder2 > 0) {
+            $next_reminder_date = $this->calculateScheduledDate($invoice, $settings->schedule_reminder2, (int) $settings->num_days_reminder2);
 
             if ($next_reminder_date && $next_reminder_date->gt(Carbon::parse($invoice->last_sent_date)));
             $dates->push($next_reminder_date);
 
-            if (!$invoice->reminder2_sent) {
+            if (! $invoice->reminder2_sent) {
                 $set_reminder2 = true;
             }
         }
 
-        if ((int)$settings->num_days_reminder3 > 0) {
-            $next_reminder_date = $this->calculateScheduledDate($invoice, $settings->schedule_reminder3, (int)$settings->num_days_reminder3);
+        if ((int) $settings->num_days_reminder3 > 0) {
+            $next_reminder_date = $this->calculateScheduledDate($invoice, $settings->schedule_reminder3, (int) $settings->num_days_reminder3);
 
             if ($next_reminder_date && $next_reminder_date->gt(Carbon::parse($invoice->last_sent_date)));
             $dates->push($next_reminder_date);
 
-            if (!$invoice->reminder3_sent) {
+            if (! $invoice->reminder3_sent) {
                 $set_reminder3 = true;
             }
         }
 
         //If all the available reminders have fired, we then start to fire the endless reminders
-        if ((int)$settings->endless_reminder_frequency_id > 0 && !$set_reminder1 && !$set_reminder2 && !$set_reminder3) {
-            $dates->push($this->addTimeInterval($invoice->last_sent_date, (int)$settings->endless_reminder_frequency_id));
+        if ((int) $settings->endless_reminder_frequency_id > 0 && ! $set_reminder1 && ! $set_reminder2 && ! $set_reminder3) {
+            $dates->push($this->addTimeInterval($invoice->last_sent_date, (int) $settings->endless_reminder_frequency_id));
         }
 
         //order the dates ascending and get first one
@@ -213,23 +212,21 @@ class SendReminders implements ShouldQueue
 
             //only send if enable_reminder setting is toggled to yes
             if ($this->checkSendSetting($invoice, $template) && $invoice->company->account->hasFeature(Account::FEATURE_EMAIL_TEMPLATES_REMINDERS)) {
-                nlog("firing email");
+                nlog('firing email');
 
-                EmailEntity::dispatchNow($invitation, $invitation->company, $template);
-                
+                EmailEntity::dispatch($invitation, $invitation->company, $template)->delay(10);
             }
         });
 
-
         if ($this->checkSendSetting($invoice, $template)) {
             event(new InvoiceWasEmailed($invoice->invitations->first(), $invoice->company, Ninja::eventVars(), $template));
         }
-    
+
         $invoice->last_sent_date = now();
         $invoice->next_send_date = $this->calculateNextSendDate($invoice);
 
         if (in_array($template, ['reminder1', 'reminder2', 'reminder3'])) {
-            $invoice->{$template."_sent"} = now();
+            $invoice->{$template.'_sent'} = now();
         }
         $invoice->service()->touchReminder($template)->save();
 
diff --git a/app/Jobs/Ninja/SystemMaintenance.php b/app/Jobs/Ninja/SystemMaintenance.php
index 003dd172972d..de3571304c08 100644
--- a/app/Jobs/Ninja/SystemMaintenance.php
+++ b/app/Jobs/Ninja/SystemMaintenance.php
@@ -47,10 +47,11 @@ class SystemMaintenance implements ShouldQueue
     {
         set_time_limit(0);
 
-        nlog("Starting System Maintenance");
+        nlog('Starting System Maintenance');
 
-        if(Ninja::isHosted())
+        if (Ninja::isHosted()) {
             return;
+        }
 
         $delete_pdf_days = config('ninja.maintenance.delete_pdfs');
 
@@ -63,70 +64,61 @@ class SystemMaintenance implements ShouldQueue
         $this->maintainPdfs($delete_pdf_days);
 
         $this->maintainBackups($delete_backup_days);
-     
     }
 
     private function maintainPdfs(int $delete_pdf_days)
     {
-        if($delete_pdf_days == 0)
+        if ($delete_pdf_days == 0) {
             return;
+        }
 
         Invoice::with('invitations')
                 ->whereBetween('created_at', [now()->subYear(), now()->subDays($delete_pdf_days)])
                 ->withTrashed()
                 ->cursor()
-                ->each(function ($invoice){
-
+                ->each(function ($invoice) {
                     nlog("deleting invoice {$invoice->number}");
 
                     $invoice->service()->deletePdf();
-
-               });
+                });
 
         Quote::with('invitations')
                 ->whereBetween('created_at', [now()->subYear(), now()->subDays($delete_pdf_days)])
                 ->withTrashed()
                 ->cursor()
-                ->each(function ($quote){
-
+                ->each(function ($quote) {
                     nlog("deleting quote {$quote->number}");
 
                     $quote->service()->deletePdf();
-
-               });
+                });
 
         Credit::with('invitations')
                 ->whereBetween('created_at', [now()->subYear(), now()->subDays($delete_pdf_days)])
                 ->withTrashed()
                 ->cursor()
-                ->each(function ($credit){
-
+                ->each(function ($credit) {
                     nlog("deleting credit {$credit->number}");
-                    
+
                     $credit->service()->deletePdf();
-
-               });
-
-
+                });
     }
 
     private function maintainBackups(int $delete_backup_days)
     {
-        if($delete_backup_days == 0)
+        if ($delete_backup_days == 0) {
             return;
+        }
 
         Backup::where('created_at', '<', now()->subDays($delete_backup_days))
                 ->cursor()
-                ->each(function ($backup){
-                    
+                ->each(function ($backup) {
                     nlog("deleting {$backup->filename}");
 
-                    if($backup->filename)
+                    if ($backup->filename) {
                         $backup->deleteFile();
-                    
+                    }
+
                     $backup->delete();
-
                 });
-
     }
 }
diff --git a/app/Jobs/Ninja/TaskScheduler.php b/app/Jobs/Ninja/TaskScheduler.php
index 89053b7f998e..76ebad1883d1 100644
--- a/app/Jobs/Ninja/TaskScheduler.php
+++ b/app/Jobs/Ninja/TaskScheduler.php
@@ -11,7 +11,6 @@
 
 namespace App\Jobs\Ninja;
 
-
 use App\Jobs\Report\SendToAdmin;
 use App\Libraries\MultiDB;
 use App\Models\Scheduler;
@@ -31,10 +30,8 @@ class TaskScheduler implements ShouldQueue
      *
      * @return void
      */
-
     public function __construct()
     {
-
     }
 
     /**
@@ -44,9 +41,7 @@ class TaskScheduler implements ShouldQueue
      */
     public function handle()
     {
-        foreach (MultiDB::$dbs as $db)
-        {
-
+        foreach (MultiDB::$dbs as $db) {
             MultiDB::setDB($db);
 
             Scheduler::with('company')
@@ -54,12 +49,10 @@ class TaskScheduler implements ShouldQueue
                 ->where('is_deleted', false)
                 ->where('scheduled_run', '<', now())
                 ->cursor()
-                ->each(function ($scheduler){
+                ->each(function ($scheduler) {
                     $this->doJob($scheduler);
                 });
-
         }
-
     }
 
     private function doJob(Scheduler $scheduler)
@@ -70,7 +63,6 @@ class TaskScheduler implements ShouldQueue
 
         $parameters = $scheduler->parameters;
 
-
         switch ($scheduler->action_name) {
             case Scheduler::CREATE_CLIENT_REPORT:
                 SendToAdmin::dispatch($company, $parameters, $scheduler->action_class, 'contacts.csv');
@@ -120,5 +112,4 @@ class TaskScheduler implements ShouldQueue
         $scheduler->scheduled_run = $scheduler->nextScheduledDate();
         $scheduler->save();
     }
-
 }
diff --git a/app/Jobs/Ninja/TransactionLog.php b/app/Jobs/Ninja/TransactionLog.php
index 6c9f1974dc9f..53cbe761548c 100644
--- a/app/Jobs/Ninja/TransactionLog.php
+++ b/app/Jobs/Ninja/TransactionLog.php
@@ -38,7 +38,6 @@ class TransactionLog implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-
     private array $payload;
 
     private string $db;
@@ -76,7 +75,6 @@ class TransactionLog implements ShouldQueue
         $this->db = $db;
         $this->event = $event;
         $this->data = $data;
-
     }
 
     /**
@@ -91,12 +89,11 @@ class TransactionLog implements ShouldQueue
 
         $this->setTransformer();
 
-        $this->payload =  $this->event_transformer->transform($this->data);
+        $this->payload = $this->event_transformer->transform($this->data);
 
         $this->persist();
     }
 
-
     private function setTransformer()
     {
         $class = $this->transformer_array[$this->event];
@@ -106,7 +103,6 @@ class TransactionLog implements ShouldQueue
         return $this;
     }
 
-
     private function persist()
     {
         MultiDB::setDB($this->db);
diff --git a/app/Jobs/Payment/EmailPayment.php b/app/Jobs/Payment/EmailPayment.php
index 2ea84641b254..5797b57c2dc1 100644
--- a/app/Jobs/Payment/EmailPayment.php
+++ b/app/Jobs/Payment/EmailPayment.php
@@ -42,7 +42,7 @@ class EmailPayment implements ShouldQueue
     private $company;
 
     public $settings;
-    
+
     /**
      * Create a new job instance.
      *
@@ -67,11 +67,11 @@ class EmailPayment implements ShouldQueue
      */
     public function handle()
     {
-        if ($this->company->is_disabled) 
+        if ($this->company->is_disabled) {
             return true;
-        
-        if ($this->contact->email) {
+        }
 
+        if ($this->contact->email) {
             MultiDB::setDb($this->company->db);
 
             $this->payment->load('invoices');
@@ -81,8 +81,9 @@ class EmailPayment implements ShouldQueue
 
             $invitation = null;
 
-            if($this->payment->invoices && $this->payment->invoices->count() >=1)
+            if ($this->payment->invoices && $this->payment->invoices->count() >= 1) {
                 $invitation = $this->payment->invoices->first()->invitations()->first();
+            }
 
             $nmo = new NinjaMailerObject;
             $nmo->mailable = new TemplateEmail($email_builder, $this->contact, $invitation);
diff --git a/app/Jobs/Payment/EmailRefundPayment.php b/app/Jobs/Payment/EmailRefundPayment.php
index 7b1769886533..bea9061c6a84 100644
--- a/app/Jobs/Payment/EmailRefundPayment.php
+++ b/app/Jobs/Payment/EmailRefundPayment.php
@@ -27,8 +27,8 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Mail;
 
 class EmailRefundPayment implements ShouldQueue
 {
@@ -43,7 +43,7 @@ class EmailRefundPayment implements ShouldQueue
     private $company;
 
     public $settings;
-    
+
     /**
      * Create a new job instance.
      *
@@ -68,11 +68,11 @@ class EmailRefundPayment implements ShouldQueue
      */
     public function handle()
     {
-        if ($this->company->is_disabled) 
+        if ($this->company->is_disabled) {
             return true;
-        
-        if ($this->contact->email) {
+        }
 
+        if ($this->contact->email) {
             MultiDB::setDb($this->company->db);
 
             $this->payment->load('invoices');
@@ -83,15 +83,16 @@ class EmailRefundPayment implements ShouldQueue
             App::setLocale($this->contact->preferredLocale());
             $t->replace(Ninja::transformTranslations($this->settings));
 
-            $template_data['body'] = ctrans('texts.refunded_payment') . ' $payment.refunded <br><br>$invoices';
+            $template_data['body'] = ctrans('texts.refunded_payment').' $payment.refunded <br><br>$invoices';
             $template_data['subject'] = ctrans('texts.refunded_payment');
 
             $email_builder = (new PaymentEmailEngine($this->payment, $this->contact, $template_data))->build();
 
             $invitation = null;
 
-            if($this->payment->invoices && $this->payment->invoices->count() >=1)
+            if ($this->payment->invoices && $this->payment->invoices->count() >= 1) {
                 $invitation = $this->payment->invoices->first()->invitations()->first();
+            }
 
             $nmo = new NinjaMailerObject;
             $nmo->mailable = new TemplateEmail($email_builder, $this->contact, $invitation);
diff --git a/app/Jobs/Product/UpdateOrCreateProduct.php b/app/Jobs/Product/UpdateOrCreateProduct.php
index 3f58bd8779ab..8544f8316404 100644
--- a/app/Jobs/Product/UpdateOrCreateProduct.php
+++ b/app/Jobs/Product/UpdateOrCreateProduct.php
@@ -55,19 +55,21 @@ class UpdateOrCreateProduct implements ShouldQueue
     {
         MultiDB::setDB($this->company->db);
 
-        if(strval($this->invoice->client->getSetting('currency_id')) != strval($this->company->settings->currency_id))
+        if (strval($this->invoice->client->getSetting('currency_id')) != strval($this->company->settings->currency_id)) {
             return;
-        
-        /* 
+        }
+
+        /*
          * If the invoice was generated from a Task or Expense then
          * we do NOT update the product details this short block we
          * check for the presence of a task_id and/or expense_id
-         */        
-        $expense_count = count(array_column((array)$this->products, 'expense_id'));
-        $task_count = count(array_column((array)$this->products, 'task_id'));
+         */
+        $expense_count = count(array_column((array) $this->products, 'expense_id'));
+        $task_count = count(array_column((array) $this->products, 'task_id'));
 
-        if($task_count >= 1 || $expense_count >= 1)
+        if ($task_count >= 1 || $expense_count >= 1) {
             return;
+        }
 
         //only update / create products - not tasks or gateway fees
         $updateable_products = collect($this->products)->filter(function ($item) {
@@ -85,10 +87,11 @@ class UpdateOrCreateProduct implements ShouldQueue
             $product->notes = isset($item->notes) ? $item->notes : '';
             //$product->cost = isset($item->cost) ? $item->cost : 0; //this value shouldn't be updated.
             $product->price = isset($item->cost) ? $item->cost : 0;
-            
-            if(!$product->id)
+
+            if (! $product->id) {
                 $product->quantity = isset($item->quantity) ? $item->quantity : 0;
-            
+            }
+
             $product->tax_name1 = isset($item->tax_name1) ? $item->tax_name1 : '';
             $product->tax_rate1 = isset($item->tax_rate1) ? $item->tax_rate1 : 0;
             $product->tax_name2 = isset($item->tax_name2) ? $item->tax_name2 : '';
@@ -109,7 +112,7 @@ class UpdateOrCreateProduct implements ShouldQueue
 
     public function failed($exception = null)
     {
-        info("update create failed with = ");
+        info('update create failed with = ');
         info(print_r($exception->getMessage(), 1));
     }
 }
diff --git a/app/Jobs/PurchaseOrder/PurchaseOrderEmail.php b/app/Jobs/PurchaseOrder/PurchaseOrderEmail.php
index d27ffdd21ae7..aeccc61a723c 100644
--- a/app/Jobs/PurchaseOrder/PurchaseOrderEmail.php
+++ b/app/Jobs/PurchaseOrder/PurchaseOrderEmail.php
@@ -62,9 +62,10 @@ class PurchaseOrderEmail implements ShouldQueue
         $this->purchase_order->invitations->load('contact.vendor.country', 'purchase_order.vendor.country', 'purchase_order.company')->each(function ($invitation) {
 
         /* Don't fire emails if the company is disabled */
-        if ($this->company->is_disabled) 
-            return true;
-        
+            if ($this->company->is_disabled) {
+                return true;
+            }
+
             /* Set DB */
             MultiDB::setDB($this->company->db);
 
@@ -75,7 +76,7 @@ class PurchaseOrderEmail implements ShouldQueue
 
             /* Mark entity sent */
             $invitation->purchase_order->service()->markSent()->save();
-            
+
             $email_builder = (new PurchaseOrderEmailEngine($invitation, 'purchase_order', $this->template_data))->build();
 
             $nmo = new NinjaMailerObject;
@@ -87,16 +88,12 @@ class PurchaseOrderEmail implements ShouldQueue
             $nmo->invitation = $invitation;
             $nmo->reminder_template = 'purchase_order';
             $nmo->entity = $invitation->purchase_order;
-            
-            NinjaMailerJob::dispatchNow($nmo);
-
 
+            NinjaMailerJob::dispatch($nmo)->delay(5);
         });
 
         if ($this->purchase_order->invitations->count() >= 1) {
             event(new PurchaseOrderWasEmailed($this->purchase_order->invitations->first(), $this->purchase_order->invitations->first()->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
         }
-
     }
-
 }
diff --git a/app/Jobs/PurchaseOrder/ZipPurchaseOrders.php b/app/Jobs/PurchaseOrder/ZipPurchaseOrders.php
index e95d86cf72b8..73b1f9d399a1 100644
--- a/app/Jobs/PurchaseOrder/ZipPurchaseOrders.php
+++ b/app/Jobs/PurchaseOrder/ZipPurchaseOrders.php
@@ -51,7 +51,6 @@ class ZipPurchaseOrders implements ShouldQueue
      * @param $email
      * @deprecated confirm to be deleted
      * Create a new job instance.
-     *
      */
     public function __construct($purchase_orders, Company $company, User $user)
     {
@@ -72,31 +71,25 @@ class ZipPurchaseOrders implements ShouldQueue
      * @throws \ZipStream\Exception\FileNotReadableException
      * @throws \ZipStream\Exception\OverflowException
      */
-    
     public function handle()
     {
         MultiDB::setDb($this->company->db);
 
-        # create new zip object
+        // create new zip object
         $zipFile = new \PhpZip\ZipFile();
         $file_name = date('Y-m-d').'_'.str_replace(' ', '_', trans('texts.invoices')).'.zip';
         $invitation = $this->purchase_orders->first()->invitations->first();
         $path = $this->purchase_orders->first()->vendor->purchase_order_filepath($invitation);
 
-        $this->purchase_orders->each(function ($purchase_order){
-
-            CreatePurchaseOrderPdf::dispatchNow($purchase_order->invitations()->first());
-
+        $this->purchase_orders->each(function ($purchase_order) {
+            (new CreatePurchaseOrderPdf($purchase_order->invitations()->first()))->handle();
         });
 
-        try{
-            
+        try {
             foreach ($this->purchase_orders as $purchase_order) {
-        
                 $file = $purchase_order->service()->getPurchaseOrderPdf();
                 $zip_file_name = basename($file);
                 $zipFile->addFromString($zip_file_name, Storage::get($file));
-
             }
 
             Storage::put($path.$file_name, $zipFile->outputAsString());
@@ -106,21 +99,14 @@ class ZipPurchaseOrders implements ShouldQueue
             $nmo->to_user = $this->user;
             $nmo->settings = $this->settings;
             $nmo->company = $this->company;
-            
-            NinjaMailerJob::dispatch($nmo);
-            
-            UnlinkFile::dispatch(config('filesystems.default'), $path.$file_name)->delay(now()->addHours(1));
-            
 
-        }
-        catch(\PhpZip\Exception\ZipException $e){
-            nlog("could not make zip => ". $e->getMessage());
-        }
-        finally{
+            NinjaMailerJob::dispatch($nmo);
+
+            UnlinkFile::dispatch(config('filesystems.default'), $path.$file_name)->delay(now()->addHours(1));
+        } catch (\PhpZip\Exception\ZipException $e) {
+            nlog('could not make zip => '.$e->getMessage());
+        } finally {
             $zipFile->close();
         }
-
-
     }
-
 }
diff --git a/app/Jobs/Quote/QuoteWorkflowSettings.php b/app/Jobs/Quote/QuoteWorkflowSettings.php
index e237212ae66c..8736932d4ea5 100644
--- a/app/Jobs/Quote/QuoteWorkflowSettings.php
+++ b/app/Jobs/Quote/QuoteWorkflowSettings.php
@@ -26,7 +26,9 @@ class QuoteWorkflowSettings implements ShouldQueue
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public $quote;
+
     public $client;
+
     public $base_repository;
 
     /**
diff --git a/app/Jobs/Quote/ZipQuotes.php b/app/Jobs/Quote/ZipQuotes.php
index b18cd766e9d4..a4f9d85883c5 100644
--- a/app/Jobs/Quote/ZipQuotes.php
+++ b/app/Jobs/Quote/ZipQuotes.php
@@ -49,7 +49,6 @@ class ZipQuotes implements ShouldQueue
      * @param $email
      * @deprecated confirm to be deleted
      * Create a new job instance.
-     *
      */
     public function __construct($quotes, Company $company, User $user)
     {
@@ -70,35 +69,28 @@ class ZipQuotes implements ShouldQueue
      * @throws \ZipStream\Exception\FileNotReadableException
      * @throws \ZipStream\Exception\OverflowException
      */
-    
     public function handle()
     {
         MultiDB::setDb($this->company->db);
 
-        # create new zip object
+        // create new zip object
         $zipFile = new \PhpZip\ZipFile();
         $file_name = date('Y-m-d').'_'.str_replace(' ', '_', trans('texts.quotes')).'.zip';
         $invitation = $this->quotes->first()->invitations->first();
         $path = $this->quotes->first()->client->quote_filepath($invitation);
 
-
-        $this->quotes->each(function ($quote){
-
-        CreateEntityPdf::dispatchNow($quote->invitations()->first());
-            
+        $this->quotes->each(function ($quote) {
+            (new CreateEntityPdf($quote->invitations()->first()))->handle();
         });
 
-        try{
-            
+        try {
             foreach ($this->quotes as $quote) {
-        
                 $file = $quote->service()->getQuotePdf();
                 $zip_file_name = basename($file);
                 $zipFile->addFromString($zip_file_name, Storage::get($file));
 
                 // $download_file = file_get_contents($quote->pdf_file_path($invitation, 'url', true));
                 // $zipFile->addFromString(basename($quote->pdf_file_path($invitation)), $download_file);
-
             }
 
             Storage::put($path.$file_name, $zipFile->outputAsString());
@@ -108,21 +100,14 @@ class ZipQuotes implements ShouldQueue
             $nmo->to_user = $this->user;
             $nmo->settings = $this->settings;
             $nmo->company = $this->company;
-            
-            NinjaMailerJob::dispatch($nmo);
-            
-            UnlinkFile::dispatch(config('filesystems.default'), $path.$file_name)->delay(now()->addHours(1));
-            
 
-        }
-        catch(\PhpZip\Exception\ZipException $e){
+            NinjaMailerJob::dispatch($nmo);
+
+            UnlinkFile::dispatch(config('filesystems.default'), $path.$file_name)->delay(now()->addHours(1));
+        } catch (\PhpZip\Exception\ZipException $e) {
             // handle exception
-        }
-        finally{
+        } finally {
             $zipFile->close();
         }
-
-
     }
-
 }
diff --git a/app/Jobs/RecurringInvoice/SendRecurring.php b/app/Jobs/RecurringInvoice/SendRecurring.php
index d019e23790f4..c67b28fd6e3f 100644
--- a/app/Jobs/RecurringInvoice/SendRecurring.php
+++ b/app/Jobs/RecurringInvoice/SendRecurring.php
@@ -15,6 +15,7 @@ use App\DataMapper\Analytics\SendRecurringFailure;
 use App\Events\Invoice\InvoiceWasEmailed;
 use App\Factory\InvoiceInvitationFactory;
 use App\Factory\RecurringInvoiceToInvoiceFactory;
+use App\Jobs\Cron\AutoBill;
 use App\Jobs\Entity\EmailEntity;
 use App\Models\Invoice;
 use App\Models\RecurringInvoice;
@@ -41,7 +42,7 @@ class SendRecurring implements ShouldQueue
     protected $db;
 
     public $tries = 1;
-    
+
     /**
      * Create a new job instance.
      *
@@ -65,13 +66,10 @@ class SendRecurring implements ShouldQueue
         // Generate Standard Invoice
         $invoice = RecurringInvoiceToInvoiceFactory::create($this->recurring_invoice, $this->recurring_invoice->client);
 
-        if($this->recurring_invoice->auto_bill === "always"){
+        if ($this->recurring_invoice->auto_bill === 'always') {
             $invoice->auto_bill_enabled = true;
-        }
-        elseif($this->recurring_invoice->auto_bill === "optout" || $this->recurring_invoice->auto_bill === "optin"){
-
-        }
-        elseif($this->recurring_invoice->auto_bill === "off"){
+        } elseif ($this->recurring_invoice->auto_bill === 'optout' || $this->recurring_invoice->auto_bill === 'optin') {
+        } elseif ($this->recurring_invoice->auto_bill === 'off') {
             $invoice->auto_bill_enabled = false;
         }
 
@@ -80,29 +78,25 @@ class SendRecurring implements ShouldQueue
         $invoice->recurring_id = $this->recurring_invoice->id;
         $invoice->saveQuietly();
 
-        if($invoice->client->getSetting('auto_email_invoice'))
-        {
+        if ($invoice->client->getSetting('auto_email_invoice')) {
             $invoice = $invoice->service()
                                ->markSent()
                                ->applyNumber()
                                ->fillDefaults()
                                ->adjustInventory()
                                ->save();
-
-        }
-        else{
-
+        } else {
             $invoice = $invoice->service()
                                ->fillDefaults()
-                               ->save();            
+                               ->save();
         }
 
         $invoice = $this->createRecurringInvitations($invoice);
-        
+
         /* 09-01-2022 ensure we create the PDFs at this point in time! */
         $invoice->service()->touchPdf(true);
 
-        nlog("updating recurring invoice dates");
+        nlog('updating recurring invoice dates');
         /* Set next date here to prevent a recurring loop forming */
         $this->recurring_invoice->next_send_date = $this->recurring_invoice->nextSendDate();
         $this->recurring_invoice->next_send_date_client = $this->recurring_invoice->nextSendDateClient();
@@ -114,39 +108,27 @@ class SendRecurring implements ShouldQueue
             $this->recurring_invoice->setCompleted();
         }
 
-        nlog("next send date = " . $this->recurring_invoice->next_send_date);
-        nlog("remaining cycles = " . $this->recurring_invoice->remaining_cycles);
-        nlog("last send date = " . $this->recurring_invoice->last_sent_date);
+        // nlog('next send date = '.$this->recurring_invoice->next_send_date);
+        // nlog('remaining cycles = '.$this->recurring_invoice->remaining_cycles);
+        // nlog('last send date = '.$this->recurring_invoice->last_sent_date);
 
         $this->recurring_invoice->save();
-        
-        /*
-
-        if ($this->recurring_invoice->company->pause_recurring_until_paid){
-            $this->recurring_invoice->service()
-                                    ->stop();
-        }
-
-        */
 
         event('eloquent.created: App\Models\Invoice', $invoice);
 
-        if($invoice->client->getSetting('auto_email_invoice'))
-        {
-            //Admin notification for recurring invoice sent. 
-            if ($invoice->invitations->count() >= 1 ) {
+        if ($invoice->client->getSetting('auto_email_invoice')) {
+            //Admin notification for recurring invoice sent.
+            if ($invoice->invitations->count() >= 1) {
                 $invoice->entityEmailEvent($invoice->invitations->first(), 'invoice', 'email_template_invoice');
             }
-        
+
             nlog("Invoice {$invoice->number} created");
 
             $invoice->invitations->each(function ($invitation) use ($invoice) {
-                if ($invitation->contact && !$invitation->contact->trashed() && strlen($invitation->contact->email) >=1 && $invoice->client->getSetting('auto_email_invoice')) {
-
-                    try{
-                        EmailEntity::dispatch($invitation, $invoice->company);
-                    }
-                    catch(\Exception $e) {
+                if ($invitation->contact && ! $invitation->contact->trashed() && strlen($invitation->contact->email) >= 1 && $invoice->client->getSetting('auto_email_invoice')) {
+                    try {
+                        EmailEntity::dispatch($invitation, $invoice->company)->delay(10);
+                    } catch (\Exception $e) {
                         nlog($e->getMessage());
                     }
 
@@ -154,44 +136,36 @@ class SendRecurring implements ShouldQueue
                 }
             });
         }
-        
+
         if ($invoice->client->getSetting('auto_bill_date') == 'on_send_date' && $invoice->auto_bill_enabled) {
             nlog("attempting to autobill {$invoice->number}");
-            $invoice->service()->autoBill();
+                // $invoice->service()->autoBill();
+                AutoBill::dispatch($invoice, $this->db)->delay(20);
 
-        }
-        elseif($invoice->client->getSetting('auto_bill_date') == 'on_due_date' && $invoice->auto_bill_enabled) {
-
-            if($invoice->due_date && Carbon::parse($invoice->due_date)->startOfDay()->lte(now()->startOfDay())) {
-            
+        } elseif ($invoice->client->getSetting('auto_bill_date') == 'on_due_date' && $invoice->auto_bill_enabled) {
+            if ($invoice->due_date && Carbon::parse($invoice->due_date)->startOfDay()->lte(now()->startOfDay())) {
                 nlog("attempting to autobill {$invoice->number}");
-                $invoice->service()->autoBill();
-            
+                // $invoice->service()->autoBill();
+                AutoBill::dispatch($invoice, $this->db)->delay(20);
             }
-
         }
-
     }
 
     /**
      * Only create the invitations that are defined on the recurring invoice.
-     * @param  Invoice $invoice 
+     * @param  Invoice $invoice
      * @return Invoice $invoice
      */
     private function createRecurringInvitations($invoice) :Invoice
     {
-
-        $this->recurring_invoice->invitations->each(function ($recurring_invitation) use($invoice){
-
+        $this->recurring_invoice->invitations->each(function ($recurring_invitation) use ($invoice) {
             $ii = InvoiceInvitationFactory::create($invoice->company_id, $invoice->user_id);
             $ii->key = $this->createDbHash($invoice->company->db);
             $ii->invoice_id = $invoice->id;
             $ii->client_contact_id = $recurring_invitation->client_contact_id;
             $ii->save();
-
         });
 
-
         return $invoice->fresh();
     }
 
@@ -209,3 +183,17 @@ class SendRecurring implements ShouldQueue
         nlog(print_r($exception->getMessage(), 1));
     }
 }
+
+
+/**
+ * 
+ * 1/8/2022
+ * 
+ * Improvements here include moving the emailentity and autobilling into the queue.
+ * 
+ * Further improvements could using the CompanyRecurringCron.php stub which divides
+ * the recurring invoices into companies and spins them off into their own queue to
+ * improve parallel processing.
+ * 
+ * Need to be careful we do not overload redis and OOM.
+*/
\ No newline at end of file
diff --git a/app/Jobs/Report/ProfitAndLoss.php b/app/Jobs/Report/ProfitAndLoss.php
index da26197b4148..cc652ac7357f 100644
--- a/app/Jobs/Report/ProfitAndLoss.php
+++ b/app/Jobs/Report/ProfitAndLoss.php
@@ -48,7 +48,6 @@ class ProfitAndLoss implements ShouldQueue
      */
     public function handle() : void
     {
-
         MultiDB::setDb($this->company->db);
 
         /*
@@ -56,7 +55,7 @@ class ProfitAndLoss implements ShouldQueue
 
             start_date - Y-m-d
             end_date - Y-m-d
-            date_range - 
+            date_range -
                 all
                 last7
                 last30
@@ -75,15 +74,9 @@ class ProfitAndLoss implements ShouldQueue
         $pl = new ProfitLoss($this->company, $this->payload);
 
         $pl->build();
-
     }
 
-
-
-
-
     public function failed($exception = null)
     {
-
     }
 }
diff --git a/app/Jobs/Report/SendToAdmin.php b/app/Jobs/Report/SendToAdmin.php
index a2624eeaf9d2..1530f35895ed 100644
--- a/app/Jobs/Report/SendToAdmin.php
+++ b/app/Jobs/Report/SendToAdmin.php
@@ -11,7 +11,6 @@
 
 namespace App\Jobs\Report;
 
-
 use App\Http\Requests\Report\GenericReportRequest;
 use App\Jobs\Mail\NinjaMailerJob;
 use App\Jobs\Mail\NinjaMailerObject;
@@ -29,13 +28,15 @@ class SendToAdmin implements ShouldQueue
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     protected Company $company;
+
     protected array $request;
+
     protected string $report_class;
+
     protected string $file_name;
 
     /**
      * Create a new job instance.
-     *
      */
     public function __construct(Company $company, array $request, $report_class, $file_name)
     {
@@ -43,12 +44,10 @@ class SendToAdmin implements ShouldQueue
         $this->request = $request;
         $this->report_class = $report_class;
         $this->file_name = $file_name;
-
     }
 
     public function handle()
     {
-        
         MultiDB::setDb($this->company->db);
         $export = new $this->report_class($this->company, $this->request);
         $csv = $export->run();
@@ -60,6 +59,5 @@ class SendToAdmin implements ShouldQueue
         $nmo->to_user = $this->company->owner();
 
         NinjaMailerJob::dispatch($nmo);
-
     }
 }
diff --git a/app/Jobs/User/CreateUser.php b/app/Jobs/User/CreateUser.php
index a75d9ecb5a03..f810b47e3695 100644
--- a/app/Jobs/User/CreateUser.php
+++ b/app/Jobs/User/CreateUser.php
@@ -66,8 +66,9 @@ class CreateUser
         $user->last_login = now();
         $user->ip = request()->ip();
 
-        if(Ninja::isSelfHost())
+        if (Ninja::isSelfHost()) {
             $user->email_verified_at = now();
+        }
 
         $user->save();
 
@@ -82,7 +83,7 @@ class CreateUser
             'settings' => null,
         ]);
 
-        if(!Ninja::isSelfHost()) {
+        if (! Ninja::isSelfHost()) {
             event(new UserWasCreated($user, $user, $this->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
         }
 
diff --git a/app/Jobs/User/UserEmailChanged.php b/app/Jobs/User/UserEmailChanged.php
index 09c517d00f8c..8a582c4d951d 100644
--- a/app/Jobs/User/UserEmailChanged.php
+++ b/app/Jobs/User/UserEmailChanged.php
@@ -54,8 +54,8 @@ class UserEmailChanged implements ShouldQueue
 
     public function handle()
     {
-        nlog("notifying user of email change");
-        
+        nlog('notifying user of email change');
+
         //Set DB
         MultiDB::setDb($this->company->db);
 
@@ -68,7 +68,7 @@ class UserEmailChanged implements ShouldQueue
         $mail_obj->data = $this->getData();
 
         //Send email via a Mailable class
-        
+
         $nmo = new NinjaMailerObject;
         $nmo->mailable = new UserNotificationMailer($mail_obj);
         $nmo->settings = $this->settings;
@@ -78,7 +78,6 @@ class UserEmailChanged implements ShouldQueue
         NinjaMailerJob::dispatch($nmo, true);
 
         $this->new_user->service()->invite($this->company);
-
     }
 
     private function getData()
@@ -88,8 +87,8 @@ class UserEmailChanged implements ShouldQueue
             'message' => ctrans(
                 'texts.email_address_changed_message',
                 ['old_email' => $this->old_user->email,
-                'new_email' => $this->new_user->email,
-            ]
+                    'new_email' => $this->new_user->email,
+                ]
             ),
             'url' => config('ninja.app_url'),
             'button' => ctrans('texts.account_login'),
diff --git a/app/Jobs/Util/ApplePayDomain.php b/app/Jobs/Util/ApplePayDomain.php
index da8b183d47db..9b60532be5cb 100644
--- a/app/Jobs/Util/ApplePayDomain.php
+++ b/app/Jobs/Util/ApplePayDomain.php
@@ -37,11 +37,9 @@ class ApplePayDomain implements ShouldQueue
 
     public function __construct(CompanyGateway $company_gateway, string $db)
     {
-    
         $this->db = $db;
 
         $this->company_gateway = $company_gateway;
-
     }
 
     /**
@@ -51,50 +49,35 @@ class ApplePayDomain implements ShouldQueue
      */
     public function handle()
     {
-        
         MultiDB::setDB($this->db);
 
-        if(in_array($this->company_gateway->gateway_key, $this->stripe_keys))
-        {
-            
+        if (in_array($this->company_gateway->gateway_key, $this->stripe_keys)) {
             $domain = $this->getDomain();
 
-            try{
+            try {
                 $this->company_gateway->driver()->setApplePayDomain($domain);
+            } catch (\Exception $e) {
+                nlog('failed to set Apple Domain with Stripe '.$e->getMessage());
             }
-            catch(\Exception $e){
-                nlog("failed to set Apple Domain with Stripe " . $e->getMessage());
-            }
-
         }
-
     }
 
     private function getDomain()
     {
-
         $domain = '';
 
-        if(Ninja::isHosted())
-        {
-
-            if($this->company_gateway->company->portal_mode == 'domain'){
+        if (Ninja::isHosted()) {
+            if ($this->company_gateway->company->portal_mode == 'domain') {
                 $domain = $this->company_gateway->company->portal_domain;
+            } else {
+                $domain = $this->company_gateway->company->subdomain.'.'.config('ninja.app_domain');
             }
-            else{
-                $domain = $this->company_gateway->company->subdomain . '.' . config('ninja.app_domain');
-            }
-
-        }
-        else {
-
+        } else {
             $domain = config('ninja.app_url');
-        }    
+        }
 
         $parsed_url = parse_url($domain);
 
         return $parsed_url['host'];
-
     }
-
 }
diff --git a/app/Jobs/Util/DiskCleanup.php b/app/Jobs/Util/DiskCleanup.php
index 698ae3975db7..d00a07dbb6d6 100644
--- a/app/Jobs/Util/DiskCleanup.php
+++ b/app/Jobs/Util/DiskCleanup.php
@@ -36,11 +36,10 @@ class DiskCleanup implements ShouldQueue
      */
     public function handle()
     {
-        nlog("Cleaning Storage");
+        nlog('Cleaning Storage');
 
         // Get all files in a directory
         $files = Storage::allFiles(config('filesystems.default'), 'backups/');
         Storage::delete($files);
-
     }
 }
diff --git a/app/Jobs/Util/ImportStripeCustomers.php b/app/Jobs/Util/ImportStripeCustomers.php
index 58596e2e0681..e0544c97afca 100644
--- a/app/Jobs/Util/ImportStripeCustomers.php
+++ b/app/Jobs/Util/ImportStripeCustomers.php
@@ -8,6 +8,7 @@
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace App\Jobs\Util;
 
 use App\Libraries\MultiDB;
@@ -19,7 +20,6 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-
 class ImportStripeCustomers implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
@@ -30,7 +30,6 @@ class ImportStripeCustomers implements ShouldQueue
 
     public $tries = 1;
 
-    
     /**
      * Create a new job instance.
      *
@@ -49,25 +48,21 @@ class ImportStripeCustomers implements ShouldQueue
      */
     public function handle()
     {
+        MultiDB::setDb($this->company->db);
 
-    	MultiDB::setDb($this->company->db);
-
-    	$cgs = CompanyGateway::where('company_id', $this->company->id)
-                            ->where('is_deleted',0)
-    						->whereIn('gateway_key', $this->stripe_keys)
-    						->get();
-
-		$cgs->each(function ($company_gateway){
-
-			$company_gateway->driver(new Client)->importCustomers();
-
-		});
+        $cgs = CompanyGateway::where('company_id', $this->company->id)
+                            ->where('is_deleted', 0)
+                            ->whereIn('gateway_key', $this->stripe_keys)
+                            ->get();
 
+        $cgs->each(function ($company_gateway) {
+            $company_gateway->driver(new Client)->importCustomers();
+        });
     }
 
     public function failed($exception)
     {
-    	nlog("Stripe import customer methods exception");
+        nlog('Stripe import customer methods exception');
         nlog($exception->getMessage());
     }
 }
diff --git a/app/Jobs/Util/PreviewPdf.php b/app/Jobs/Util/PreviewPdf.php
index f681d51b7264..44109392fcc9 100644
--- a/app/Jobs/Util/PreviewPdf.php
+++ b/app/Jobs/Util/PreviewPdf.php
@@ -51,9 +51,10 @@ class PreviewPdf implements ShouldQueue
 
         $numbered_pdf = $this->pageNumbering($pdf, $this->company);
 
-        if($numbered_pdf)
+        if ($numbered_pdf) {
             $pdf = $numbered_pdf;
-        
+        }
+
         return $pdf;
     }
 }
diff --git a/app/Jobs/Util/RefreshPdfs.php b/app/Jobs/Util/RefreshPdfs.php
index 4dedb987eaa8..2d45f3c228d9 100644
--- a/app/Jobs/Util/RefreshPdfs.php
+++ b/app/Jobs/Util/RefreshPdfs.php
@@ -46,31 +46,21 @@ class RefreshPdfs implements ShouldQueue
      */
     public function handle()
     {
-
         MultiDB::setDb($this->company->db);
 
-
         InvoiceInvitation::where('company_id', $this->company->id)->cursor()->each(function ($invitation) {
-            
             nlog("generating invoice pdf for {$invitation->invoice_id}");
             CreateEntityPdf::dispatch($invitation);
-
         });
 
         QuoteInvitation::where('company_id', $this->company->id)->cursor()->each(function ($invitation) {
-            
             nlog("generating quote pdf for {$invitation->quote_id}");
             CreateEntityPdf::dispatch($invitation);
-            
         });
 
-
         CreditInvitation::where('company_id', $this->company->id)->cursor()->each(function ($invitation) {
-            
             nlog("generating credit pdf for {$invitation->credit_id}");
             CreateEntityPdf::dispatch($invitation);
-            
         });
-
     }
 }
diff --git a/app/Jobs/Util/ReminderJob.php b/app/Jobs/Util/ReminderJob.php
index 28a6bd5df7de..4aef5a9a3a60 100644
--- a/app/Jobs/Util/ReminderJob.php
+++ b/app/Jobs/Util/ReminderJob.php
@@ -44,7 +44,6 @@ class ReminderJob implements ShouldQueue
      */
     public function handle()
     {
-
         if (! config('ninja.db.multi_db_enabled')) {
             $this->processReminders();
         } else {
@@ -59,7 +58,7 @@ class ReminderJob implements ShouldQueue
 
     private function processReminders()
     {
-        nlog("Sending invoice reminders " . now()->format('Y-m-d h:i:s'));
+        nlog('Sending invoice reminders '.now()->format('Y-m-d h:i:s'));
 
         Invoice::where('next_send_date', '<=', now()->toDateTimeString())
                  ->whereNull('deleted_at')
@@ -67,54 +66,50 @@ class ReminderJob implements ShouldQueue
                  ->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
                  ->where('balance', '>', 0)
                  ->whereHas('client', function ($query) {
-                     $query->where('is_deleted',0)
-                           ->where('deleted_at', NULL);
+                     $query->where('is_deleted', 0)
+                           ->where('deleted_at', null);
                  })
                  ->whereHas('company', function ($query) {
-                     $query->where('is_disabled',0);
+                     $query->where('is_disabled', 0);
                  })
                  ->with('invitations')->cursor()->each(function ($invoice) {
+                     if ($invoice->isPayable()) {
+                         $reminder_template = $invoice->calculateTemplate('invoice');
+                         $invoice->service()->touchReminder($reminder_template)->save();
+                         $invoice = $this->calcLateFee($invoice, $reminder_template);
 
-            if ($invoice->isPayable()) {
-                $reminder_template = $invoice->calculateTemplate('invoice');
-                $invoice->service()->touchReminder($reminder_template)->save();
-                $invoice = $this->calcLateFee($invoice, $reminder_template);
+                         $invoice->service()->touchPdf();
 
-                $invoice->service()->touchPdf();
+                         //20-04-2022 fixes for endless reminders - generic template naming was wrong
+                         $enabled_reminder = 'enable_'.$reminder_template;
 
-                //20-04-2022 fixes for endless reminders - generic template naming was wrong
-                $enabled_reminder = "enable_".$reminder_template;
-   
-                if($reminder_template == 'endless_reminder')
-                 $enabled_reminder = 'enable_reminder_endless';
+                         if ($reminder_template == 'endless_reminder') {
+                             $enabled_reminder = 'enable_reminder_endless';
+                         }
 
-                //check if this reminder needs to be emailed
-                //15-01-2022 - insert addition if block if send_reminders is definitely set
-                if(in_array($reminder_template, ['reminder1','reminder2','reminder3','reminder_endless','endless_reminder']) && 
-                    $invoice->client->getSetting($enabled_reminder) && 
-                    $invoice->client->getSetting("send_reminders") && 
-                    (Ninja::isSelfHost() || $invoice->company->account->isPaidHostedClient()))
-                {
-                    $invoice->invitations->each(function ($invitation) use ($invoice, $reminder_template) {
-                        EmailEntity::dispatch($invitation, $invitation->company, $reminder_template);
-                        nlog("Firing reminder email for invoice {$invoice->number}");
-                    });
+                         //check if this reminder needs to be emailed
+                         //15-01-2022 - insert addition if block if send_reminders is definitely set
+                         if (in_array($reminder_template, ['reminder1', 'reminder2', 'reminder3', 'reminder_endless', 'endless_reminder']) &&
+                    $invoice->client->getSetting($enabled_reminder) &&
+                    $invoice->client->getSetting('send_reminders') &&
+                    (Ninja::isSelfHost() || $invoice->company->account->isPaidHostedClient())) {
+                             $invoice->invitations->each(function ($invitation) use ($invoice, $reminder_template) {
+                                 EmailEntity::dispatch($invitation, $invitation->company, $reminder_template);
+                                 nlog("Firing reminder email for invoice {$invoice->number}");
+                             });
 
-                    if ($invoice->invitations->count() > 0) {
-                        event(new InvoiceWasEmailed($invoice->invitations->first(), $invoice->company, Ninja::eventVars(), $reminder_template));
-                    }
-                }
-                $invoice->service()->setReminder()->save();
-                
-            } else {
-                $invoice->next_send_date = null;
-                $invoice->save();
-            }
-
-        });
+                             if ($invoice->invitations->count() > 0) {
+                                 event(new InvoiceWasEmailed($invoice->invitations->first(), $invoice->company, Ninja::eventVars(), $reminder_template));
+                             }
+                         }
+                         $invoice->service()->setReminder()->save();
+                     } else {
+                         $invoice->next_send_date = null;
+                         $invoice->save();
+                     }
+                 });
     }
 
-
     /**
      * Calculates the late if - if any - and rebuilds the invoice
      *
@@ -164,7 +159,6 @@ class ReminderJob implements ShouldQueue
      */
     private function setLateFee($invoice, $amount, $percent) :Invoice
     {
-
         App::forgetInstance('translator');
         $t = app('translator');
         $t->replace(Ninja::transformTranslations($invoice->client->getMergedSettings()));
@@ -200,12 +194,12 @@ class ReminderJob implements ShouldQueue
         $invoice->calc()->getInvoice()->save();
         $invoice->fresh();
         $invoice->service()->deletePdf();
-        
+
         /* Refresh the client here to ensure the balance is fresh */
         $client = $invoice->client;
         $client = $client->fresh();
 
-        nlog("adjusting client balance and invoice balance by ". ($invoice->balance - $temp_invoice_balance));
+        nlog('adjusting client balance and invoice balance by '.($invoice->balance - $temp_invoice_balance));
         $client->service()->updateBalance($invoice->balance - $temp_invoice_balance)->save();
         $invoice->ledger()->updateInvoiceBalance($invoice->balance - $temp_invoice_balance, "Late Fee Adjustment for invoice {$invoice->number}");
 
diff --git a/app/Jobs/Util/SchedulerCheck.php b/app/Jobs/Util/SchedulerCheck.php
index d1998263a56e..fa918b900248 100644
--- a/app/Jobs/Util/SchedulerCheck.php
+++ b/app/Jobs/Util/SchedulerCheck.php
@@ -38,15 +38,12 @@ class SchedulerCheck implements ShouldQueue
     {
         set_time_limit(0);
 
-        if(config('ninja.app_version') != base_path('VERSION.txt'))
-        {
-
-             try {
+        if (config('ninja.app_version') != base_path('VERSION.txt')) {
+            try {
                 Artisan::call('migrate', ['--force' => true]);
             } catch (\Exception $e) {
                 nlog("I wasn't able to migrate the data.");
                 nlog($e->getMessage());
-
             }
 
             try {
@@ -58,7 +55,6 @@ class SchedulerCheck implements ShouldQueue
                 nlog($e->getMessage());
             }
 
-
             try {
                 Artisan::call('view:clear');
             } catch (\Exception $e) {
@@ -66,10 +62,7 @@ class SchedulerCheck implements ShouldQueue
                 nlog($e->getMessage());
             }
 
-
-        VersionCheck::dispatch();
-
+            VersionCheck::dispatch();
         }
-
     }
 }
diff --git a/app/Jobs/Util/SendFailedEmails.php b/app/Jobs/Util/SendFailedEmails.php
index d8fbde58a029..96d6e9dfc21b 100644
--- a/app/Jobs/Util/SendFailedEmails.php
+++ b/app/Jobs/Util/SendFailedEmails.php
@@ -63,7 +63,7 @@ class SendFailedEmails implements ShouldQueue
             $invitation = $job_meta_array['entity_name']::where('key', $job_meta_array['invitation_key'])->with('contact')->first();
 
             if ($invitation->invoice) {
-                if (!$invitation->contact->trashed() && $invitation->contact->send_email && $invitation->contact->email) {
+                if (! $invitation->contact->trashed() && $invitation->contact->send_email && $invitation->contact->email) {
                     EmailEntity::dispatch($invitation, $invitation->company, $job_meta_array['reminder_template']);
                 }
             }
diff --git a/app/Jobs/Util/StartMigration.php b/app/Jobs/Util/StartMigration.php
index 0368b37d98fd..6592f3cf9980 100644
--- a/app/Jobs/Util/StartMigration.php
+++ b/app/Jobs/Util/StartMigration.php
@@ -26,10 +26,10 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Storage;
 use ZipArchive;
-use Illuminate\Support\Facades\App;
 
 class StartMigration implements ShouldQueue
 {
@@ -76,8 +76,8 @@ class StartMigration implements ShouldQueue
      */
     public function handle()
     {
-        nlog("Inside Migration Job");
-        
+        nlog('Inside Migration Job');
+
         set_time_limit(0);
 
         MultiDB::setDb($this->company->db);
@@ -116,7 +116,7 @@ class StartMigration implements ShouldQueue
                 throw new NonExistingMigrationFile('Migration file does not exist, or it is corrupted.');
             }
 
-            Import::dispatchNow($file, $this->company, $this->user);
+            (new Import($file, $this->company, $this->user))->handle();
 
             Storage::deleteDirectory(public_path("storage/migrations/{$filename}"));
 
@@ -126,30 +126,26 @@ class StartMigration implements ShouldQueue
             App::forgetInstance('translator');
             $t = app('translator');
             $t->replace(Ninja::transformTranslations($this->company->settings));
-
         } catch (NonExistingMigrationFile | ProcessingMigrationArchiveFailed | ResourceNotAvailableForMigration | MigrationValidatorFailed | ResourceDependencyMissing | \Exception $e) {
-
             $this->company->update_products = $update_product_flag;
             $this->company->save();
 
-            if(Ninja::isHosted())
+            if (Ninja::isHosted()) {
                 app('sentry')->captureException($e);
-            
+            }
+
             Mail::to($this->user->email, $this->user->name())->send(new MigrationFailed($e, $this->company, $e->getMessage()));
 
-            if(Ninja::isHosted()){
-
+            if (Ninja::isHosted()) {
                 $migration_failed = new MigrationFailed($e, $this->company, $e->getMessage());
                 $migration_failed->is_system = true;
-                
-                Mail::to('contact@invoiceninja.com', 'Failed Migration')->send($migration_failed);
 
+                Mail::to('contact@invoiceninja.com', 'Failed Migration')->send($migration_failed);
             }
 
             if (app()->environment() !== 'production') {
                 info($e->getMessage());
             }
-            
         }
 
         //always make sure we unset the migration as running
diff --git a/app/Jobs/Util/StripeUpdatePaymentMethods.php b/app/Jobs/Util/StripeUpdatePaymentMethods.php
index 2569ae04e251..8f27d6977656 100644
--- a/app/Jobs/Util/StripeUpdatePaymentMethods.php
+++ b/app/Jobs/Util/StripeUpdatePaymentMethods.php
@@ -8,6 +8,7 @@
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace App\Jobs\Util;
 
 use App\Libraries\MultiDB;
@@ -19,7 +20,6 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-
 class StripeUpdatePaymentMethods implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
@@ -27,6 +27,7 @@ class StripeUpdatePaymentMethods implements ShouldQueue
     public $company;
 
     private $stripe_keys = ['d14dd26a47cecc30fdd65700bfb67b34', 'd14dd26a37cecc30fdd65700bfb55b23'];
+
     /**
      * Create a new job instance.
      *
@@ -45,24 +46,20 @@ class StripeUpdatePaymentMethods implements ShouldQueue
      */
     public function handle()
     {
+        MultiDB::setDb($this->company->db);
 
-    	MultiDB::setDb($this->company->db);
-
-    	$cgs = CompanyGateway::where('company_id', $this->company->id)
-    						->whereIn('gateway_key', $this->stripe_keys)
-    						->get();
-
-		$cgs->each(function ($company_gateway){
-
-			$company_gateway->driver(new Client)->updateAllPaymentMethods();
-
-		});
+        $cgs = CompanyGateway::where('company_id', $this->company->id)
+                            ->whereIn('gateway_key', $this->stripe_keys)
+                            ->get();
 
+        $cgs->each(function ($company_gateway) {
+            $company_gateway->driver(new Client)->updateAllPaymentMethods();
+        });
     }
 
     public function failed($exception)
     {
-    	nlog("Stripe update payment methods exception");
+        nlog('Stripe update payment methods exception');
         nlog($exception->getMessage());
     }
 }
diff --git a/app/Jobs/Util/SystemLogger.php b/app/Jobs/Util/SystemLogger.php
index b9f5f514ec49..daefb4236afc 100644
--- a/app/Jobs/Util/SystemLogger.php
+++ b/app/Jobs/Util/SystemLogger.php
@@ -49,8 +49,9 @@ class SystemLogger implements ShouldQueue
 
     public function handle() :void
     {
-        if(!$this->company){
-            nlog("SystemLogger:: No company");
+        if (! $this->company) {
+            nlog('SystemLogger:: No company');
+
             return;
         }
 
@@ -58,11 +59,12 @@ class SystemLogger implements ShouldQueue
 
         $client_id = $this->client ? $this->client->id : null;
 
-        if(!$this->client && !$this->company->owner()){
-            nlog("SystemLogger:: could not find client and/or company owner");
+        if (! $this->client && ! $this->company->owner()) {
+            nlog('SystemLogger:: could not find client and/or company owner');
+
             return;
         }
-        
+
         $user_id = $this->client ? $this->client->user_id : $this->company->owner()->id;
 
         $sl = [
@@ -75,8 +77,9 @@ class SystemLogger implements ShouldQueue
             'type_id' => $this->type_id,
         ];
 
-        if(!$this->log){
-            nlog("SystemLogger:: no log to store");
+        if (! $this->log) {
+            nlog('SystemLogger:: no log to store');
+
             return;
         }
 
diff --git a/app/Jobs/Util/UnlinkFile.php b/app/Jobs/Util/UnlinkFile.php
index 1b78d9c9c87f..f45b1d157bbf 100644
--- a/app/Jobs/Util/UnlinkFile.php
+++ b/app/Jobs/Util/UnlinkFile.php
@@ -40,8 +40,9 @@ class UnlinkFile implements ShouldQueue
     public function handle()
     {
         /* Do not delete files if we are on the sync queue*/
-        if(config('queue.default') == 'sync')
+        if (config('queue.default') == 'sync') {
             return;
+        }
 
         Storage::disk($this->disk)->delete($this->file_path);
     }
diff --git a/app/Jobs/Util/UploadFile.php b/app/Jobs/Util/UploadFile.php
index 2b07ea55ecec..6ec31040c5e7 100644
--- a/app/Jobs/Util/UploadFile.php
+++ b/app/Jobs/Util/UploadFile.php
@@ -27,6 +27,7 @@ class UploadFile implements ShouldQueue
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, MakesHash;
 
     const IMAGE = 1;
+
     const DOCUMENT = 2;
 
     const PROPERTIES = [
@@ -39,9 +40,13 @@ class UploadFile implements ShouldQueue
     ];
 
     protected $file;
+
     protected $user;
+
     protected $company;
+
     protected $type;
+
     protected $is_public;
 
     public $entity;
@@ -66,8 +71,9 @@ class UploadFile implements ShouldQueue
      */
     public function handle() : ?Document
     {
-        if(is_array($this->file)) //return early if the payload is just JSON
+        if (is_array($this->file)) { //return early if the payload is just JSON
             return null;
+        }
 
         $path = self::PROPERTIES[$this->type]['path'];
 
@@ -78,7 +84,7 @@ class UploadFile implements ShouldQueue
         $instance = Storage::disk($this->disk)->putFileAs(
             $path,
             $this->file,
-            $this->file->hashName() 
+            $this->file->hashName()
         );
 
         if (in_array($this->file->extension(), ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'tiff', 'psd'])) {
diff --git a/app/Jobs/Util/VersionCheck.php b/app/Jobs/Util/VersionCheck.php
index 022fa7374724..cdb2a280a89c 100644
--- a/app/Jobs/Util/VersionCheck.php
+++ b/app/Jobs/Util/VersionCheck.php
@@ -13,12 +13,12 @@ namespace App\Jobs\Util;
 
 use App\Models\Account;
 use App\Utils\Ninja;
+use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Carbon\Carbon;
 
 class VersionCheck implements ShouldQueue
 {
@@ -43,14 +43,14 @@ class VersionCheck implements ShouldQueue
             Account::whereNotNull('id')->update(['latest_version' => $version_file]);
         }
 
-        if(Ninja::isSelfHost())
-        {
+        if (Ninja::isSelfHost()) {
             $account = Account::first();
 
-            if(!$account)
+            if (! $account) {
                 return;
+            }
 
-            if($account->plan == 'white_label' && $account->plan_expires && Carbon::parse($account->plan_expires)->lt(now())){
+            if ($account->plan == 'white_label' && $account->plan_expires && Carbon::parse($account->plan_expires)->lt(now())) {
                 $account->plan = null;
                 $account->plan_expires = null;
                 $account->save();
diff --git a/app/Jobs/Util/WebhookHandler.php b/app/Jobs/Util/WebhookHandler.php
index 7c5b25adb18f..46ac62d4f713 100644
--- a/app/Jobs/Util/WebhookHandler.php
+++ b/app/Jobs/Util/WebhookHandler.php
@@ -44,6 +44,7 @@ class WebhookHandler implements ShouldQueue
     public $deleteWhenMissingModels = true;
 
     private string $includes;
+
     /**
      * Create a new job instance.
      *
@@ -72,7 +73,6 @@ class WebhookHandler implements ShouldQueue
             return true;
         }
 
-
         $subscriptions = Webhook::where('company_id', $this->company->id)
                                     ->where('event_id', $this->event_id)
                                     ->get();
@@ -80,7 +80,7 @@ class WebhookHandler implements ShouldQueue
         if (! $subscriptions || $subscriptions->count() == 0) {
             return;
         }
-        
+
         $subscriptions->each(function ($subscription) {
             $this->process($subscription);
         });
@@ -89,7 +89,7 @@ class WebhookHandler implements ShouldQueue
     private function process($subscription)
     {
         $this->entity->refresh();
-        
+
         // generate JSON data
         $manager = new Manager();
         $manager->setSerializer(new ArraySerializer());
@@ -115,13 +115,12 @@ class WebhookHandler implements ShouldQueue
         $client = new Client(['headers' => array_merge($base_headers, $headers)]);
 
         try {
-
             $response = $client->post($subscription->target_url, [
                 RequestOptions::JSON => $data, // or 'json' => [...]
             ]);
 
             SystemLogger::dispatch(
-                array_merge((array)$response,$data),
+                array_merge((array) $response, $data),
                 SystemLog::CATEGORY_WEBHOOK,
                 SystemLog::EVENT_WEBHOOK_SUCCESS,
                 SystemLog::TYPE_WEBHOOK_RESPONSE,
@@ -131,13 +130,10 @@ class WebhookHandler implements ShouldQueue
 
             // if ($response->getStatusCode() == 410)
             //      return true; $subscription->delete();
-
-        }
-        catch(\Exception $e){
-
+        } catch (\Exception $e) {
             nlog($e->getMessage());
 
-                SystemLogger::dispatch(
+            SystemLogger::dispatch(
                 $e->getMessage(),
                 SystemLog::CATEGORY_WEBHOOK,
                 SystemLog::EVENT_WEBHOOK_RESPONSE,
@@ -145,15 +141,13 @@ class WebhookHandler implements ShouldQueue
                 $this->resolveClient(),
                 $this->company,
             );
-
         }
-
     }
 
     private function resolveClient()
     {
         //make sure it isn't an instance of the Client Model
-        if((!$this->entity instanceof ClientModel) && $this->entity->client()->exists()){
+        if ((! $this->entity instanceof ClientModel) && $this->entity->client()->exists()) {
             return $this->entity->client;
         }
 
diff --git a/app/Libraries/InApp/StoreKit/Apple.php b/app/Libraries/InApp/StoreKit/Apple.php
index df7760fd76ff..f619bb39dea1 100644
--- a/app/Libraries/InApp/StoreKit/Apple.php
+++ b/app/Libraries/InApp/StoreKit/Apple.php
@@ -19,10 +19,9 @@ use Firebase\JWT\Key;
  */
 class Apple
 {
-
     private string $bundle_id = '';
 
-    private string $issuer_id = '';    
+    private string $issuer_id = '';
 
     private string $key_id = '';
 
@@ -32,10 +31,9 @@ class Apple
 
     public function createJwt()
     {
-
         $this->bundle_id = config('ninja.ninja_apple_bundle_id');
 
-        $this->issuer_id = config('ninja.ninja_apple_issuer_id');    
+        $this->issuer_id = config('ninja.ninja_apple_issuer_id');
 
         $this->key_id = config('ninja.ninja_apple_api_key');
 
@@ -48,7 +46,7 @@ class Apple
         $header = [
             'alg' => $this->alg,
             'kid' => $this->key_id,
-            'typ' => 'JWT'
+            'typ' => 'JWT',
         ];
 
         $payload = [
@@ -57,23 +55,18 @@ class Apple
             'exp'=> $expiration_time,
             'aud'=> 'appstoreconnect-v1',
             'nonce'=> $this->guidv4(),
-            'bid'=> $this->bundle_id
+            'bid'=> $this->bundle_id,
         ];
 
-
         $jwt = JWT::encode($payload, $this->private_key, $this->alg, $header);
 
         $decoded = JWT::decode($jwt, new Key($this->private_key, $this->alg));
 
         return $decoded;
-
-
-
     }
 
     private function guidv4()
     {
         return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex(random_bytes(16)), 4));
     }
-
 }
diff --git a/app/Libraries/MultiDB.php b/app/Libraries/MultiDB.php
index e348746f1443..56f3d1d9ac79 100644
--- a/app/Libraries/MultiDB.php
+++ b/app/Libraries/MultiDB.php
@@ -54,14 +54,16 @@ class MultiDB
 
     public static function checkDomainAvailable($subdomain) : bool
     {
-        if (! config('ninja.db.multi_db_enabled')) 
+        if (! config('ninja.db.multi_db_enabled')) {
             return Company::whereSubdomain($subdomain)->get()->count() == 0;
+        }
 
-        $current_db = config('database.default');  
+        $current_db = config('database.default');
 
         foreach (self::$dbs as $db) {
             if (Company::on($db)->whereSubdomain($subdomain)->exists()) {
                 self::setDb($current_db);
+
                 return false;
             }
         }
@@ -73,14 +75,16 @@ class MultiDB
 
     public static function checkUserEmailExists($email) : bool
     {
-        if (! config('ninja.db.multi_db_enabled')) 
-            return User::where(['email' => $email])->withTrashed()->exists(); // true >= 1 emails found / false -> == emails found
-        
-        $current_db = config('database.default');  
+        if (! config('ninja.db.multi_db_enabled')) {
+            return User::where(['email' => $email])->withTrashed()->exists();
+        } // true >= 1 emails found / false -> == emails found
+
+        $current_db = config('database.default');
 
         foreach (self::$dbs as $db) {
             if (User::on($db)->where(['email' => $email])->withTrashed()->exists()) { // if user already exists, validation will fail
                 self::setDb($current_db);
+
                 return true;
             }
         }
@@ -105,15 +109,17 @@ class MultiDB
      */
     public static function checkUserAndCompanyCoExist($email, $company_key) :bool
     {
-        $current_db = config('database.default');  
+        $current_db = config('database.default');
 
         foreach (self::$dbs as $db) {
-            if (User::on($db)->where(['email' => $email])->withTrashed()->exists()) { 
+            if (User::on($db)->where(['email' => $email])->withTrashed()->exists()) {
                 if (Company::on($db)->where(['company_key' => $company_key])->exists()) {
                     self::setDb($current_db);
+
                     return true;
                 } else {
                     self::setDb($current_db);
+
                     return false;
                 }
             }
@@ -130,18 +136,17 @@ class MultiDB
      */
     public static function hasUser(array $data) : ?User
     {
-        if (! config('ninja.db.multi_db_enabled')) 
+        if (! config('ninja.db.multi_db_enabled')) {
             return User::where($data)->withTrashed()->first();
-        
-        $current_db = config('database.default');  
+        }
+
+        $current_db = config('database.default');
 
         foreach (self::$dbs as $db) {
-
             self::setDB($db);
             if ($user = User::where($data)->withTrashed()->first()) {
                 return $user;
             }
-            
         }
 
         self::setDb($current_db);
@@ -155,22 +160,24 @@ class MultiDB
      */
     public static function hasContact(string $email) : ?ClientContact
     {
-        if (! config('ninja.db.multi_db_enabled')) 
+        if (! config('ninja.db.multi_db_enabled')) {
             return ClientContact::where('email', $email)->withTrashed()->first();
+        }
 
-        $current_db = config('database.default');  
+        $current_db = config('database.default');
 
         foreach (self::$dbs as $db) {
-            
             $user = ClientContact::on($db)->where('email', $email)->withTrashed()->first();
 
             if ($user) {
                 self::setDb($db);
+
                 return $user;
             }
         }
 
         self::setDB($current_db);
+
         return null;
     }
 
@@ -180,33 +187,35 @@ class MultiDB
      */
     public static function findContact(array $search) : ?ClientContact
     {
-        if (! config('ninja.db.multi_db_enabled')) 
+        if (! config('ninja.db.multi_db_enabled')) {
             return ClientContact::where($search)->first();
+        }
 
-        $current_db = config('database.default');  
+        $current_db = config('database.default');
 
         foreach (self::$dbs as $db) {
-            
             $user = ClientContact::on($db)->where($search)->first();
 
             if ($user) {
                 self::setDb($db);
+
                 return $user;
             }
         }
 
         self::setDB($current_db);
+
         return null;
     }
 
-
     public static function contactFindAndSetDb($token) :bool
     {
-        $current_db = config('database.default');  
+        $current_db = config('database.default');
 
         foreach (self::$dbs as $db) {
             if (ClientContact::on($db)->where('token', $token)->exists()) {
                 self::setDb($db);
+
                 return true;
             }
         }
@@ -218,47 +227,48 @@ class MultiDB
 
     public static function userFindAndSetDb($email) : bool
     {
-        $current_db = config('database.default');  
+        $current_db = config('database.default');
 
         //multi-db active
         foreach (self::$dbs as $db) {
-            
-            if (User::on($db)->where('email', $email)->withTrashed()->exists()){ 
+            if (User::on($db)->where('email', $email)->withTrashed()->exists()) {
                 self::setDb($db);
+
                 return true;
             }
-
         }
 
         self::setDB($current_db);
+
         return false;
     }
 
     public static function documentFindAndSetDb($hash) : bool
     {
-        $current_db = config('database.default');  
+        $current_db = config('database.default');
 
         //multi-db active
         foreach (self::$dbs as $db) {
-            
-            if (Document::on($db)->where('hash', $hash)->exists()){ 
+            if (Document::on($db)->where('hash', $hash)->exists()) {
                 self::setDb($db);
+
                 return true;
             }
-
         }
 
         self::setDB($current_db);
+
         return false;
     }
 
     public static function findAndSetDb($token) :bool
     {
-        $current_db = config('database.default');  
+        $current_db = config('database.default');
 
         foreach (self::$dbs as $db) {
             if (CompanyToken::on($db)->where('token', $token)->exists()) {
                 self::setDb($db);
+
                 return true;
             }
         }
@@ -270,11 +280,12 @@ class MultiDB
 
     public static function findAndSetDbByCompanyKey($company_key) :bool
     {
-        $current_db = config('database.default');  
+        $current_db = config('database.default');
 
         foreach (self::$dbs as $db) {
             if (Company::on($db)->where('company_key', $company_key)->exists()) {
                 self::setDb($db);
+
                 return true;
             }
         }
@@ -286,11 +297,12 @@ class MultiDB
 
     public static function findAndSetDbByCompanyId($company_id) :?Company
     {
-        $current_db = config('database.default');  
+        $current_db = config('database.default');
 
         foreach (self::$dbs as $db) {
             if ($company = Company::on($db)->where('id', $company_id)->first()) {
                 self::setDb($db);
+
                 return $company;
             }
         }
@@ -302,11 +314,12 @@ class MultiDB
 
     public static function findAndSetDbByAccountKey($account_key) :bool
     {
-        $current_db = config('database.default');  
+        $current_db = config('database.default');
 
         foreach (self::$dbs as $db) {
             if (Account::on($db)->where('key', $account_key)->exists()) {
                 self::setDb($db);
+
                 return true;
             }
         }
@@ -318,11 +331,12 @@ class MultiDB
 
     public static function findAndSetDbByContactKey($contact_key) :bool
     {
-        $current_db = config('database.default');  
+        $current_db = config('database.default');
 
         foreach (self::$dbs as $db) {
             if (ClientContact::on($db)->where('contact_key', $contact_key)->exists()) {
                 self::setDb($db);
+
                 return true;
             }
         }
@@ -334,11 +348,12 @@ class MultiDB
 
     public static function findAndSetDbByClientHash($client_hash) :bool
     {
-        $current_db = config('database.default');  
+        $current_db = config('database.default');
 
         foreach (self::$dbs as $db) {
             if (Client::on($db)->where('client_hash', $client_hash)->exists()) {
                 self::setDb($db);
+
                 return true;
             }
         }
@@ -350,11 +365,12 @@ class MultiDB
 
     public static function findAndSetDbByClientId($client_id) :?Client
     {
-        $current_db = config('database.default');  
+        $current_db = config('database.default');
 
         foreach (self::$dbs as $db) {
             if ($client = Client::on($db)->where('id', $client_id)->first()) {
                 self::setDb($db);
+
                 return $client;
             }
         }
@@ -366,15 +382,16 @@ class MultiDB
 
     public static function findAndSetDbByDomain($query_array)
     {
+        if (! config('ninja.db.multi_db_enabled')) {
+            return Company::where($query_array)->first();
+        }
 
-        if (! config('ninja.db.multi_db_enabled'))
-            return (Company::where($query_array)->first());
-
-        $current_db = config('database.default');  
+        $current_db = config('database.default');
 
         foreach (self::$dbs as $db) {
             if ($company = Company::on($db)->where($query_array)->first()) {
                 self::setDb($db);
+
                 return $company;
             }
         }
@@ -387,11 +404,12 @@ class MultiDB
     public static function findAndSetDbByInvitation($entity, $invitation_key)
     {
         $class = 'App\Models\\'.ucfirst(Str::camel($entity)).'Invitation';
-        $current_db = config('database.default');  
+        $current_db = config('database.default');
 
         foreach (self::$dbs as $db) {
             if ($invite = $class::on($db)->where('key', $invitation_key)->exists()) {
                 self::setDb($db);
+
                 return true;
             }
         }
@@ -401,34 +419,59 @@ class MultiDB
         return false;
     }
 
+    /**
+     * @param array $data
+     * @return User|null
+     */
+    public static function hasPhoneNumber(string $phone) : bool
+    {
+        if (! config('ninja.db.multi_db_enabled')) 
+            return Account::where('account_sms_verification_number', $phone)->where('account_sms_verified', true)->exists();
+        
+        $current_db = config('database.default');  
+
+        foreach (self::$dbs as $db) {
+
+            self::setDB($db);
+            if ($exists = Account::where('account_sms_verification_number', $phone)->where('account_sms_verified', true)->exists()) {
+                self::setDb($current_db);
+                return true;
+            }
+            
+        }
+
+        self::setDb($current_db);
+
+        return false;
+    }
+
+    
+
     public static function randomSubdomainGenerator()
     {
-        $current_db = config('database.default');  
-              
-            do {
-                $length = 8;
-                $string = '';
-                $vowels = array("a","e","i","o","u");  
-                $consonants = array(
-                    'b', 'c', 'd', 'f', 'g', 'h', 'j', 'k', 'l', 'm', 
-                    'n', 'p', 'r', 's', 't', 'v', 'w', 'x', 'y', 'z'
-                );  
+        $current_db = config('database.default');
 
-                $max = $length / 2;
-                for ($i = 1; $i <= $max; $i++)
-                {
-                    $string .= $consonants[rand(0,19)];
-                    $string .= $vowels[rand(0,4)];
-                }
+        do {
+            $length = 8;
+            $string = '';
+            $vowels = ['a', 'e', 'i', 'o', 'u'];
+            $consonants = [
+                'b', 'c', 'd', 'f', 'g', 'h', 'j', 'k', 'l', 'm',
+                'n', 'p', 'r', 's', 't', 'v', 'w', 'x', 'y', 'z',
+            ];
+
+            $max = $length / 2;
+            for ($i = 1; $i <= $max; $i++) {
+                $string .= $consonants[rand(0, 19)];
+                $string .= $vowels[rand(0, 4)];
             }
-            while(!self::checkDomainAvailable($string));
+        } while (! self::checkDomainAvailable($string));
 
         self::setDb($current_db);
 
         return $string;
     }
 
-
     /**
      * @param $database
      */
diff --git a/app/Libraries/OAuth/OAuth.php b/app/Libraries/OAuth/OAuth.php
index 3abe1e88ab2a..ece6bbf98a1c 100644
--- a/app/Libraries/OAuth/OAuth.php
+++ b/app/Libraries/OAuth/OAuth.php
@@ -24,12 +24,19 @@ class OAuth
      * Socialite Providers.
      */
     const SOCIAL_GOOGLE = 1;
+
     const SOCIAL_FACEBOOK = 2;
+
     const SOCIAL_GITHUB = 3;
+
     const SOCIAL_LINKEDIN = 4;
+
     const SOCIAL_TWITTER = 5;
+
     const SOCIAL_BITBUCKET = 6;
+
     const SOCIAL_MICROSOFT = 7;
+
     const SOCIAL_APPLE = 8;
 
     /**
@@ -56,7 +63,7 @@ class OAuth
     {
         $name = trim($name);
         $last_name = (strpos($name, ' ') === false) ? '' : preg_replace('#.*\s([\w-]*)$#', '$1', $name);
-        $first_name = trim(preg_replace('#' . preg_quote($last_name, '/') . '#', '', $name));
+        $first_name = trim(preg_replace('#'.preg_quote($last_name, '/').'#', '', $name));
 
         return [$first_name, $last_name];
     }
diff --git a/app/Libraries/OFX.php b/app/Libraries/OFX.php
index d132f274e2c6..d06b6969c434 100644
--- a/app/Libraries/OFX.php
+++ b/app/Libraries/OFX.php
@@ -18,9 +18,13 @@ use SimpleXMLElement;
 class OFX
 {
     public $bank;
+
     public $request;
+
     public $response;
+
     public $responseHeader;
+
     public $responseBody;
 
     public function __construct($bank, $request)
@@ -73,9 +77,13 @@ class Finance
 class Bank
 {
     public $logins; // array of class User
+
     public $finance; // the Finance object that hold this Bank object
+
     public $fid;
+
     public $org;
+
     public $url;
 
     public function __construct($finance, $fid, $url, $org)
@@ -90,10 +98,15 @@ class Bank
 class Login
 {
     public $accounts;
+
     public $bank;
+
     public $id;
+
     public $pass;
+
     public $ofxVersion;
+
     public $appVersion;
 
     public function __construct($bank, $id, $pass)
@@ -156,12 +169,19 @@ class Login
 class Account
 {
     public $login;
+
     public $id;
+
     public $type;
+
     public $subType;
+
     public $bankId;
+
     public $ledgerBalance;
+
     public $availableBalance;
+
     public $response;
 
     public function __construct($login, $id, $type, $subType = null, $bankId = null)
diff --git a/app/Listeners/Account/CreateAccountActivity.php b/app/Listeners/Account/CreateAccountActivity.php
index 9f04606fd69b..4aa0b7e21922 100644
--- a/app/Listeners/Account/CreateAccountActivity.php
+++ b/app/Listeners/Account/CreateAccountActivity.php
@@ -45,7 +45,7 @@ class CreateAccountActivity implements ShouldQueue
             $nmo->settings = $event->company->settings;
             $nmo->to_user = $event->user;
 
-            NinjaMailerJob::dispatch($nmo);
+            NinjaMailerJob::dispatch($nmo, true);
         }
     }
 }
diff --git a/app/Listeners/Activity/CreatedExpenseActivity.php b/app/Listeners/Activity/CreatedExpenseActivity.php
index 55faec34dba1..e8cf011b3490 100644
--- a/app/Listeners/Activity/CreatedExpenseActivity.php
+++ b/app/Listeners/Activity/CreatedExpenseActivity.php
@@ -43,7 +43,6 @@ class CreatedExpenseActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-
         $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->expense->user_id;
 
         $fields->expense_id = $event->expense->id;
diff --git a/app/Listeners/Activity/ExpenseArchivedActivity.php b/app/Listeners/Activity/ExpenseArchivedActivity.php
index 0b3d0acddf07..14d7a8668052 100644
--- a/app/Listeners/Activity/ExpenseArchivedActivity.php
+++ b/app/Listeners/Activity/ExpenseArchivedActivity.php
@@ -51,7 +51,7 @@ class ExpenseArchivedActivity implements ShouldQueue
         $fields->user_id = $user_id;
         $fields->company_id = $expense->company_id;
         $fields->activity_type_id = Activity::ARCHIVE_EXPENSE;
-        
+
         $this->activity_repo->save($fields, $expense, $event->event_vars);
     }
 }
diff --git a/app/Listeners/Activity/SubscriptionArchivedActivity.php b/app/Listeners/Activity/SubscriptionArchivedActivity.php
index 308eed78aa20..cdaad692e8bd 100644
--- a/app/Listeners/Activity/SubscriptionArchivedActivity.php
+++ b/app/Listeners/Activity/SubscriptionArchivedActivity.php
@@ -51,7 +51,7 @@ class SubscriptionArchivedActivity implements ShouldQueue
         $fields->user_id = $user_id;
         $fields->company_id = $subscription->company_id;
         $fields->activity_type_id = Activity::ARCHIVE_SUBSCRIPTION;
-        
+
         $this->activity_repo->save($fields, $subscription, $event->event_vars);
     }
 }
diff --git a/app/Listeners/Activity/TaskArchivedActivity.php b/app/Listeners/Activity/TaskArchivedActivity.php
index 1aede2c7e98d..7cc2a86569ff 100644
--- a/app/Listeners/Activity/TaskArchivedActivity.php
+++ b/app/Listeners/Activity/TaskArchivedActivity.php
@@ -51,7 +51,7 @@ class TaskArchivedActivity implements ShouldQueue
         $fields->user_id = $user_id;
         $fields->company_id = $task->company_id;
         $fields->activity_type_id = Activity::ARCHIVE_TASK;
-        
+
         $this->activity_repo->save($fields, $task, $event->event_vars);
     }
 }
diff --git a/app/Listeners/Activity/VendorArchivedActivity.php b/app/Listeners/Activity/VendorArchivedActivity.php
index 7736b031cf4d..9d348babf7ae 100644
--- a/app/Listeners/Activity/VendorArchivedActivity.php
+++ b/app/Listeners/Activity/VendorArchivedActivity.php
@@ -51,7 +51,7 @@ class VendorArchivedActivity implements ShouldQueue
         $fields->user_id = $user_id;
         $fields->company_id = $vendor->company_id;
         $fields->activity_type_id = Activity::ARCHIVE_VENDOR;
-        
+
         $this->activity_repo->save($fields, $vendor, $event->event_vars);
     }
 }
diff --git a/app/Listeners/Credit/CreditCreatedNotification.php b/app/Listeners/Credit/CreditCreatedNotification.php
index 270f5f4bd601..d66e3f7c21ec 100644
--- a/app/Listeners/Credit/CreditCreatedNotification.php
+++ b/app/Listeners/Credit/CreditCreatedNotification.php
@@ -43,7 +43,7 @@ class CreditCreatedNotification implements ShouldQueue
         $credit = $event->credit;
 
         $nmo = new NinjaMailerObject;
-        $nmo->mailable = new NinjaMailer( (new EntityCreatedObject($credit, 'credit'))->build() );
+        $nmo->mailable = new NinjaMailer((new EntityCreatedObject($credit, 'credit'))->build());
         $nmo->company = $credit->company;
         $nmo->settings = $credit->company->settings;
 
@@ -63,11 +63,10 @@ class CreditCreatedNotification implements ShouldQueue
             if (($key = array_search('mail', $methods)) !== false) {
                 unset($methods[$key]);
 
-                
                 $nmo->to_user = $user;
 
                 NinjaMailerJob::dispatch($nmo);
-                
+
                 /* This prevents more than one notification being sent */
                 // $first_notification_sent = false;
             }
@@ -75,7 +74,7 @@ class CreditCreatedNotification implements ShouldQueue
             /* Override the methods in the Notification Class */
             // $notification->method = $methods;
 
-            //  Notify on the alternate channels 
+            //  Notify on the alternate channels
             // $user->notify($notification);
         }
     }
diff --git a/app/Listeners/Credit/CreditEmailedNotification.php b/app/Listeners/Credit/CreditEmailedNotification.php
index 43f736a96d8e..b709b0a5ea27 100644
--- a/app/Listeners/Credit/CreditEmailedNotification.php
+++ b/app/Listeners/Credit/CreditEmailedNotification.php
@@ -45,7 +45,7 @@ class CreditEmailedNotification implements ShouldQueue
         $credit->saveQuietly();
 
         $nmo = new NinjaMailerObject;
-        $nmo->mailable = new NinjaMailer( (new EntitySentObject($event->invitation, 'credit', $event->template))->build() );
+        $nmo->mailable = new NinjaMailer((new EntitySentObject($event->invitation, 'credit', $event->template))->build());
         $nmo->company = $credit->company;
         $nmo->settings = $credit->company->settings;
 
@@ -57,7 +57,7 @@ class CreditEmailedNotification implements ShouldQueue
             $methods = $this->findUserNotificationTypes($event->invitation, $company_user, 'credit', ['all_notifications', 'credit_sent', 'credit_sent_all']);
 
             if (($key = array_search('mail', $methods)) !== false) {
-            // if (($key = array_search('mail', $methods))) {
+                // if (($key = array_search('mail', $methods))) {
                 unset($methods[$key]);
 
                 $nmo->to_user = $user;
diff --git a/app/Listeners/Invoice/CreateInvoicePdf.php b/app/Listeners/Invoice/CreateInvoicePdf.php
index 59b0b3d0136c..db079052dcce 100644
--- a/app/Listeners/Invoice/CreateInvoicePdf.php
+++ b/app/Listeners/Invoice/CreateInvoicePdf.php
@@ -36,26 +36,22 @@ class CreateInvoicePdf implements ShouldQueue
     {
         MultiDB::setDb($event->company->db);
 
-        if(isset($event->invoice))
-        {
+        if (isset($event->invoice)) {
             $event->invoice->invitations->each(function ($invitation) {
-                CreateEntityPdf::dispatch($invitation->load("invoice", "contact.client.company"));
+                CreateEntityPdf::dispatch($invitation->load('invoice', 'contact.client.company'));
             });
         }
 
-        if(isset($event->quote))
-        {
+        if (isset($event->quote)) {
             $event->quote->invitations->each(function ($invitation) {
-                CreateEntityPdf::dispatch($invitation->load("quote", "contact.client.company"));
+                CreateEntityPdf::dispatch($invitation->load('quote', 'contact.client.company'));
             });
         }
 
-        if(isset($event->credit))
-        {
+        if (isset($event->credit)) {
             $event->credit->invitations->each(function ($invitation) {
-                CreateEntityPdf::dispatch($invitation->load("credit", "contact.client.company"));
+                CreateEntityPdf::dispatch($invitation->load('credit', 'contact.client.company'));
             });
         }
-
     }
 }
diff --git a/app/Listeners/Invoice/InvoiceCancelledActivity.php b/app/Listeners/Invoice/InvoiceCancelledActivity.php
index 32ef34394682..adc9c78025c9 100644
--- a/app/Listeners/Invoice/InvoiceCancelledActivity.php
+++ b/app/Listeners/Invoice/InvoiceCancelledActivity.php
@@ -22,7 +22,7 @@ class InvoiceCancelledActivity implements ShouldQueue
     protected $activity_repo;
 
     public $delay = 5;
-    
+
     /**
      * Create the event listener.
      *
diff --git a/app/Listeners/Invoice/InvoiceCreatedNotification.php b/app/Listeners/Invoice/InvoiceCreatedNotification.php
index b77f3a6244ab..f3c71c1b7b53 100644
--- a/app/Listeners/Invoice/InvoiceCreatedNotification.php
+++ b/app/Listeners/Invoice/InvoiceCreatedNotification.php
@@ -25,7 +25,7 @@ class InvoiceCreatedNotification implements ShouldQueue
     use UserNotifies;
 
     public $delay = 5;
-    
+
     public function __construct()
     {
     }
@@ -45,7 +45,7 @@ class InvoiceCreatedNotification implements ShouldQueue
         $invoice = $event->invoice;
 
         $nmo = new NinjaMailerObject;
-        $nmo->mailable = new NinjaMailer( (new EntityCreatedObject($invoice, 'invoice'))->build() );
+        $nmo->mailable = new NinjaMailer((new EntityCreatedObject($invoice, 'invoice'))->build());
         $nmo->company = $invoice->company;
         $nmo->settings = $invoice->company->settings;
 
@@ -55,9 +55,10 @@ class InvoiceCreatedNotification implements ShouldQueue
             /* The User */
             $user = $company_user->user;
 
-            if(!$user)
+            if (! $user) {
                 continue;
-            
+            }
+
             /* This is only here to handle the alternate message channels - ie Slack */
             // $notification = new EntitySentNotification($event->invitation, 'invoice');
 
@@ -67,16 +68,14 @@ class InvoiceCreatedNotification implements ShouldQueue
 
             if (($key = array_search('mail', $methods)) !== false) {
                 unset($methods[$key]);
-                
+
                 $nmo->to_user = $user;
 
                 NinjaMailerJob::dispatch($nmo);
-                
+
                 /* This prevents more than one notification being sent */
                 $first_notification_sent = false;
-
             }
-
         }
     }
 }
diff --git a/app/Listeners/Invoice/InvoiceDeletedActivity.php b/app/Listeners/Invoice/InvoiceDeletedActivity.php
index b5205a0086b7..497445fee94f 100644
--- a/app/Listeners/Invoice/InvoiceDeletedActivity.php
+++ b/app/Listeners/Invoice/InvoiceDeletedActivity.php
@@ -22,7 +22,7 @@ class InvoiceDeletedActivity implements ShouldQueue
     protected $activity_repo;
 
     public $delay = 5;
-    
+
     /**
      * Create the event listener.
      *
diff --git a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php
index d3dac15191a1..122bdc972379 100644
--- a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php
+++ b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php
@@ -22,7 +22,7 @@ class InvoiceEmailFailedActivity implements ShouldQueue
     protected $activity_repo;
 
     public $delay = 5;
-    
+
     /**
      * Create the event listener.
      *
@@ -43,8 +43,9 @@ class InvoiceEmailFailedActivity implements ShouldQueue
     {
         MultiDB::setDb($event->company->db);
 
-        if(strpos($event->message, 'shared/public') !== false)
-            $event->message = "Unable to open attachment file for reading"; 
+        if (strpos($event->message, 'shared/public') !== false) {
+            $event->message = 'Unable to open attachment file for reading';
+        }
 
         $fields = new stdClass;
 
diff --git a/app/Listeners/Invoice/InvoiceEmailedNotification.php b/app/Listeners/Invoice/InvoiceEmailedNotification.php
index 7ce1deb2aa46..8ad713627373 100644
--- a/app/Listeners/Invoice/InvoiceEmailedNotification.php
+++ b/app/Listeners/Invoice/InvoiceEmailedNotification.php
@@ -25,7 +25,7 @@ class InvoiceEmailedNotification implements ShouldQueue
     use UserNotifies;
 
     public $delay = 5;
-    
+
     public function __construct()
     {
     }
@@ -47,11 +47,10 @@ class InvoiceEmailedNotification implements ShouldQueue
         $invoice->saveQuietly();
 
         $nmo = new NinjaMailerObject;
-        $nmo->mailable = new NinjaMailer( (new EntitySentObject($event->invitation, 'invoice', $event->template))->build() );
+        $nmo->mailable = new NinjaMailer((new EntitySentObject($event->invitation, 'invoice', $event->template))->build());
         $nmo->company = $invoice->company;
         $nmo->settings = $invoice->company->settings;
 
-
         /* We loop through each user and determine whether they need to be notified */
         foreach ($event->invitation->company->company_users as $company_user) {
 
@@ -71,7 +70,7 @@ class InvoiceEmailedNotification implements ShouldQueue
                 $nmo->to_user = $user;
 
                 NinjaMailerJob::dispatch($nmo);
-                
+
                 /* This prevents more than one notification being sent */
                 $first_notification_sent = false;
             }
@@ -79,7 +78,7 @@ class InvoiceEmailedNotification implements ShouldQueue
             /* Override the methods in the Notification Class */
             // $notification->method = $methods;
 
-            //  Notify on the alternate channels 
+            //  Notify on the alternate channels
             // $user->notify($notification);
         }
     }
diff --git a/app/Listeners/Invoice/InvoiceFailedEmailNotification.php b/app/Listeners/Invoice/InvoiceFailedEmailNotification.php
index bd78286a6794..92b8d9bef3a7 100644
--- a/app/Listeners/Invoice/InvoiceFailedEmailNotification.php
+++ b/app/Listeners/Invoice/InvoiceFailedEmailNotification.php
@@ -25,7 +25,7 @@ class InvoiceFailedEmailNotification
     use UserNotifies;
 
     public $delay = 5;
-    
+
     public function __construct()
     {
     }
@@ -38,7 +38,6 @@ class InvoiceFailedEmailNotification
      */
     public function handle($event)
     {
-    
         MultiDB::setDb($event->company->db);
 
         $first_notification_sent = true;
@@ -47,7 +46,7 @@ class InvoiceFailedEmailNotification
         $invoice->update(['last_sent_date' => now()]);
 
         $nmo = new NinjaMailerObject;
-        $nmo->mailable = new NinjaMailer( (new EntityFailedSendObject($event->invitation, 'invoice', $event->template, $event->message))->build() );
+        $nmo->mailable = new NinjaMailer((new EntityFailedSendObject($event->invitation, 'invoice', $event->template, $event->message))->build());
         $nmo->company = $invoice->company;
         $nmo->settings = $invoice->company->settings;
 
@@ -65,8 +64,6 @@ class InvoiceFailedEmailNotification
 
                 $first_notification_sent = false;
             }
-
-
         }
     }
 }
diff --git a/app/Listeners/Invoice/InvoiceReminderEmailActivity.php b/app/Listeners/Invoice/InvoiceReminderEmailActivity.php
index b1efe7e08ba7..5a32adcad695 100644
--- a/app/Listeners/Invoice/InvoiceReminderEmailActivity.php
+++ b/app/Listeners/Invoice/InvoiceReminderEmailActivity.php
@@ -21,7 +21,7 @@ class InvoiceReminderEmailActivity implements ShouldQueue
     protected $activity_repo;
 
     public $delay = 5;
-    
+
     /**
      * Create the event listener.
      *
diff --git a/app/Listeners/Invoice/InvoiceRestoredActivity.php b/app/Listeners/Invoice/InvoiceRestoredActivity.php
index dfd7d2371965..2ce059038076 100644
--- a/app/Listeners/Invoice/InvoiceRestoredActivity.php
+++ b/app/Listeners/Invoice/InvoiceRestoredActivity.php
@@ -22,7 +22,7 @@ class InvoiceRestoredActivity implements ShouldQueue
     protected $activity_repo;
 
     public $delay = 5;
-    
+
     /**
      * Create the event listener.
      *
diff --git a/app/Listeners/Invoice/InvoiceReversedActivity.php b/app/Listeners/Invoice/InvoiceReversedActivity.php
index fee3ef9a04ea..8d6d110eb00c 100644
--- a/app/Listeners/Invoice/InvoiceReversedActivity.php
+++ b/app/Listeners/Invoice/InvoiceReversedActivity.php
@@ -22,7 +22,7 @@ class InvoiceReversedActivity implements ShouldQueue
     protected $activity_repo;
 
     public $delay = 5;
-    
+
     /**
      * Create the event listener.
      *
diff --git a/app/Listeners/Invoice/InvoiceViewedActivity.php b/app/Listeners/Invoice/InvoiceViewedActivity.php
index 7ac3170dcd3a..a6ba8af63a96 100644
--- a/app/Listeners/Invoice/InvoiceViewedActivity.php
+++ b/app/Listeners/Invoice/InvoiceViewedActivity.php
@@ -22,7 +22,7 @@ class InvoiceViewedActivity implements ShouldQueue
     protected $activity_repo;
 
     public $delay = 5;
-    
+
     /**
      * Create the event listener.
      *
diff --git a/app/Listeners/Invoice/UpdateInvoiceActivity.php b/app/Listeners/Invoice/UpdateInvoiceActivity.php
index ae38ca460ee8..13cc6106d55b 100644
--- a/app/Listeners/Invoice/UpdateInvoiceActivity.php
+++ b/app/Listeners/Invoice/UpdateInvoiceActivity.php
@@ -22,7 +22,7 @@ class UpdateInvoiceActivity implements ShouldQueue
     protected $activity_repo;
 
     public $delay = 5;
-    
+
     /**
      * Create the event listener.
      *
diff --git a/app/Listeners/Invoice/UpdateInvoiceInvitations.php b/app/Listeners/Invoice/UpdateInvoiceInvitations.php
index 530ef99766b7..38e144cb0f58 100644
--- a/app/Listeners/Invoice/UpdateInvoiceInvitations.php
+++ b/app/Listeners/Invoice/UpdateInvoiceInvitations.php
@@ -16,7 +16,6 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 
 class UpdateInvoiceInvitations implements ShouldQueue
 {
-    
     public $delay = 5;
 
     /**
diff --git a/app/Listeners/Mail/MailSentListener.php b/app/Listeners/Mail/MailSentListener.php
index 863da130ea55..7d52131bb551 100644
--- a/app/Listeners/Mail/MailSentListener.php
+++ b/app/Listeners/Mail/MailSentListener.php
@@ -13,12 +13,11 @@ namespace App\Listeners\Mail;
 
 use App\Libraries\MultiDB;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Support\Facades\Notification;
 use Illuminate\Mail\Events\MessageSent;
+use Illuminate\Support\Facades\Notification;
 
 class MailSentListener implements ShouldQueue
 {
-
     /**
      * Create the event listener.
      *
@@ -36,23 +35,19 @@ class MailSentListener implements ShouldQueue
      */
     public function handle(MessageSent $event)
     {
-        
-        if(property_exists($event->message, 'invitation') && $event->message->invitation){
+        nlog("mail listener");
+        nlog($event);
+        // if (property_exists($event->message, 'invitation') && $event->message->invitation) {
+        //     MultiDB::setDb($event->sent->invitation->company->db);
 
-            MultiDB::setDb($event->message->invitation->company->db);
-
-            if($event->message->getHeaders()->get('x-pm-message-id')){
-
-                $postmark_id = $event->message->getHeaders()->get('x-pm-message-id')->getValue();
-
-                // nlog($postmark_id);
-                $invitation = $event->message->invitation;
-                $invitation->message_id = $postmark_id;
-                $invitation->save();
-
-            }
-
-        }
+        //     if ($event->message->getHeaders()->get('x-pm-message-id')) {
+        //         $postmark_id = $event->sent->getHeaders()->get('x-pm-message-id')->getValue();
 
+        //         // nlog($postmark_id);
+        //         $invitation = $event->sent->invitation;
+        //         $invitation->message_id = $postmark_id;
+        //         $invitation->save();
+        //     }
+        // }
     }
 }
diff --git a/app/Listeners/Misc/InvitationViewedListener.php b/app/Listeners/Misc/InvitationViewedListener.php
index 70275dc4498a..d2a01a620c7e 100644
--- a/app/Listeners/Misc/InvitationViewedListener.php
+++ b/app/Listeners/Misc/InvitationViewedListener.php
@@ -47,23 +47,21 @@ class InvitationViewedListener implements ShouldQueue
         $entity_name = lcfirst(class_basename($event->entity));
         $invitation = $event->invitation;
 
-        if($entity_name == 'recurringInvoice')
+        if ($entity_name == 'recurringInvoice') {
             return;
-        elseif($entity_name == 'purchaseOrder')
+        } elseif ($entity_name == 'purchaseOrder') {
             $entity_name = 'purchase_order';
-        
+        }
+
         $nmo = new NinjaMailerObject;
-        $nmo->mailable = new NinjaMailer( (new EntityViewedObject($invitation, $entity_name))->build() );
+        $nmo->mailable = new NinjaMailer((new EntityViewedObject($invitation, $entity_name))->build());
         $nmo->company = $invitation->company;
         $nmo->settings = $invitation->company->settings;
 
-
         foreach ($invitation->company->company_users as $company_user) {
             $entity_viewed = "{$entity_name}_viewed";
             $entity_viewed_all = "{$entity_name}_viewed_all";
 
-
-
             $methods = $this->findUserNotificationTypes($invitation, $company_user, $entity_name, ['all_notifications', $entity_viewed, $entity_viewed_all]);
 
             if (($key = array_search('mail', $methods)) !== false) {
@@ -71,10 +69,7 @@ class InvitationViewedListener implements ShouldQueue
 
                 $nmo->to_user = $company_user->user;
                 NinjaMailerJob::dispatch($nmo);
-
             }
-
         }
-
     }
 }
diff --git a/app/Listeners/Payment/PaymentEmailFailureActivity.php b/app/Listeners/Payment/PaymentEmailFailureActivity.php
index 78f00154dbb4..110d5e0958a3 100644
--- a/app/Listeners/Payment/PaymentEmailFailureActivity.php
+++ b/app/Listeners/Payment/PaymentEmailFailureActivity.php
@@ -20,7 +20,7 @@ class PaymentEmailFailureActivity implements ShouldQueue
     use UserNotifies;
 
     public $delay = 5;
-    
+
     /**
      * Create the event listener.
      *
diff --git a/app/Listeners/Payment/PaymentEmailedActivity.php b/app/Listeners/Payment/PaymentEmailedActivity.php
index 4c543dc86272..12a0ed4946e5 100644
--- a/app/Listeners/Payment/PaymentEmailedActivity.php
+++ b/app/Listeners/Payment/PaymentEmailedActivity.php
@@ -18,7 +18,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 class PaymentEmailedActivity implements ShouldQueue
 {
     public $delay = 5;
-    
+
     use UserNotifies;
 
     /**
@@ -41,6 +41,5 @@ class PaymentEmailedActivity implements ShouldQueue
         MultiDB::setDb($event->company->db);
 
         $payment = $event->payment;
-        
     }
 }
diff --git a/app/Listeners/Payment/PaymentNotification.php b/app/Listeners/Payment/PaymentNotification.php
index ac9d509f1a60..3e9ccb68c4b8 100644
--- a/app/Listeners/Payment/PaymentNotification.php
+++ b/app/Listeners/Payment/PaymentNotification.php
@@ -46,14 +46,15 @@ class PaymentNotification implements ShouldQueue
     public function handle($event)
     {
         MultiDB::setDb($event->company->db);
-        
-        if ($event->company->is_disabled)
+
+        if ($event->company->is_disabled) {
             return true;
+        }
 
         $payment = $event->payment;
 
         $nmo = new NinjaMailerObject;
-        $nmo->mailable = new NinjaMailer( (new EntityPaidObject($payment))->build() );
+        $nmo->mailable = new NinjaMailer((new EntityPaidObject($payment))->build());
         $nmo->company = $event->company;
         $nmo->settings = $event->company->settings;
 
@@ -62,10 +63,10 @@ class PaymentNotification implements ShouldQueue
             $user = $company_user->user;
 
             $methods = $this->findUserEntityNotificationType($payment, $company_user, [
-                'payment_success', 
-                'payment_success_all', 
-                'payment_success_user', 
-                'all_notifications']
+                'payment_success',
+                'payment_success_all',
+                'payment_success_user',
+                'all_notifications', ]
             );
 
             if (($key = array_search('mail', $methods)) !== false) {
@@ -75,7 +76,6 @@ class PaymentNotification implements ShouldQueue
 
                 NinjaMailerJob::dispatch($nmo);
             }
-
         }
 
         /*Google Analytics Track Revenue*/
@@ -92,9 +92,10 @@ class PaymentNotification implements ShouldQueue
 
         $analytics_id = $company->google_analytics_key;
 
-        if(!strlen($analytics_id) > 2)
+        if (! strlen($analytics_id) > 2) {
             return;
-        
+        }
+
         $client = $payment->client;
         $amount = $payment->amount;
 
@@ -127,7 +128,6 @@ class PaymentNotification implements ShouldQueue
      */
     private function sendAnalytics($data)
     {
-            
         $data = utf8_encode($data);
         $curl = curl_init();
 
diff --git a/app/Listeners/Payment/PaymentRestoredActivity.php b/app/Listeners/Payment/PaymentRestoredActivity.php
index fd6d5b251d01..ad3c1e2527f7 100644
--- a/app/Listeners/Payment/PaymentRestoredActivity.php
+++ b/app/Listeners/Payment/PaymentRestoredActivity.php
@@ -22,7 +22,7 @@ class PaymentRestoredActivity implements ShouldQueue
     protected $activity_repo;
 
     public $delay = 5;
-    
+
     /**
      * Create the event listener.
      *
diff --git a/app/Listeners/PurchaseOrder/PurchaseOrderAcceptedActivity.php b/app/Listeners/PurchaseOrder/PurchaseOrderAcceptedActivity.php
index 6baba48e0914..9e22da186015 100644
--- a/app/Listeners/PurchaseOrder/PurchaseOrderAcceptedActivity.php
+++ b/app/Listeners/PurchaseOrder/PurchaseOrderAcceptedActivity.php
@@ -22,7 +22,7 @@ class PurchaseOrderAcceptedActivity implements ShouldQueue
     protected $activity_repo;
 
     public $delay = 5;
-    
+
     /**
      * Create the event listener.
      *
diff --git a/app/Listeners/PurchaseOrder/PurchaseOrderAcceptedNotification.php b/app/Listeners/PurchaseOrder/PurchaseOrderAcceptedNotification.php
index b7d499c471f9..d65681cc5ec4 100644
--- a/app/Listeners/PurchaseOrder/PurchaseOrderAcceptedNotification.php
+++ b/app/Listeners/PurchaseOrder/PurchaseOrderAcceptedNotification.php
@@ -26,7 +26,7 @@ class PurchaseOrderAcceptedNotification implements ShouldQueue
     use UserNotifies;
 
     public $delay = 5;
-    
+
     public function __construct()
     {
     }
@@ -46,7 +46,7 @@ class PurchaseOrderAcceptedNotification implements ShouldQueue
         $purchase_order = $event->purchase_order;
 
         $nmo = new NinjaMailerObject;
-        $nmo->mailable = new NinjaMailer( (new PurchaseOrderAcceptedObject($purchase_order, $event->company))->build() );
+        $nmo->mailable = new NinjaMailer((new PurchaseOrderAcceptedObject($purchase_order, $event->company))->build());
         $nmo->company = $event->company;
         $nmo->settings = $event->company->settings;
 
@@ -56,8 +56,9 @@ class PurchaseOrderAcceptedNotification implements ShouldQueue
             /* The User */
             $user = $company_user->user;
 
-            if(!$user)
+            if (! $user) {
                 continue;
+            }
 
             /* Returns an array of notification methods */
             $methods = $this->findUserNotificationTypes($purchase_order->invitations()->first(), $company_user, 'purchase_order', ['all_notifications', 'purchase_order_accepted', 'purchase_order_accepted_all']);
@@ -69,11 +70,10 @@ class PurchaseOrderAcceptedNotification implements ShouldQueue
                 $nmo->to_user = $user;
 
                 NinjaMailerJob::dispatch($nmo);
-                
+
                 /* This prevents more than one notification being sent */
                 $first_notification_sent = false;
             }
-
         }
     }
 }
diff --git a/app/Listeners/PurchaseOrder/PurchaseOrderArchivedActivity.php b/app/Listeners/PurchaseOrder/PurchaseOrderArchivedActivity.php
index 09c8eb679726..9bd935160dd3 100644
--- a/app/Listeners/PurchaseOrder/PurchaseOrderArchivedActivity.php
+++ b/app/Listeners/PurchaseOrder/PurchaseOrderArchivedActivity.php
@@ -22,7 +22,7 @@ class PurchaseOrderArchivedActivity implements ShouldQueue
     protected $activity_repo;
 
     public $delay = 5;
-    
+
     /**
      * Create the event listener.
      *
@@ -42,7 +42,7 @@ class PurchaseOrderArchivedActivity implements ShouldQueue
     public function handle($event)
     {
         MultiDB::setDb($event->company->db);
-        
+
         $fields = new stdClass;
 
         $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->purchase_order->user_id;
diff --git a/app/Listeners/PurchaseOrder/PurchaseOrderDeletedActivity.php b/app/Listeners/PurchaseOrder/PurchaseOrderDeletedActivity.php
index 8cfeda8a5ef8..ba9384d5a5f1 100644
--- a/app/Listeners/PurchaseOrder/PurchaseOrderDeletedActivity.php
+++ b/app/Listeners/PurchaseOrder/PurchaseOrderDeletedActivity.php
@@ -22,7 +22,7 @@ class PurchaseOrderDeletedActivity implements ShouldQueue
     protected $activity_repo;
 
     public $delay = 5;
-    
+
     /**
      * Create the event listener.
      *
diff --git a/app/Listeners/PurchaseOrder/PurchaseOrderRestoredActivity.php b/app/Listeners/PurchaseOrder/PurchaseOrderRestoredActivity.php
index 367bf7874da4..84465f034020 100644
--- a/app/Listeners/PurchaseOrder/PurchaseOrderRestoredActivity.php
+++ b/app/Listeners/PurchaseOrder/PurchaseOrderRestoredActivity.php
@@ -22,7 +22,7 @@ class PurchaseOrderRestoredActivity implements ShouldQueue
     protected $activity_repo;
 
     public $delay = 5;
-    
+
     /**
      * Create the event listener.
      *
diff --git a/app/Listeners/PurchaseOrder/PurchaseOrderViewedActivity.php b/app/Listeners/PurchaseOrder/PurchaseOrderViewedActivity.php
index ea9a6a60b67a..b9e39c8a76f1 100644
--- a/app/Listeners/PurchaseOrder/PurchaseOrderViewedActivity.php
+++ b/app/Listeners/PurchaseOrder/PurchaseOrderViewedActivity.php
@@ -22,7 +22,7 @@ class PurchaseOrderViewedActivity implements ShouldQueue
     protected $activity_repo;
 
     public $delay = 5;
-    
+
     /**
      * Create the event listener.
      *
diff --git a/app/Listeners/PurchaseOrder/UpdatePurchaseOrderActivity.php b/app/Listeners/PurchaseOrder/UpdatePurchaseOrderActivity.php
index 2b4b1039e7a7..8e25393d86af 100644
--- a/app/Listeners/PurchaseOrder/UpdatePurchaseOrderActivity.php
+++ b/app/Listeners/PurchaseOrder/UpdatePurchaseOrderActivity.php
@@ -22,7 +22,7 @@ class UpdatePurchaseOrderActivity implements ShouldQueue
     protected $activity_repo;
 
     public $delay = 5;
-    
+
     /**
      * Create the event listener.
      *
diff --git a/app/Listeners/Quote/CreateQuoteInvitation.php b/app/Listeners/Quote/CreateQuoteInvitation.php
index e5ac4c490471..c7736307a876 100644
--- a/app/Listeners/Quote/CreateQuoteInvitation.php
+++ b/app/Listeners/Quote/CreateQuoteInvitation.php
@@ -20,9 +20,9 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 class CreateQuoteInvitation implements ShouldQueue
 {
     use MakesHash;
-    
+
     public $delay = 5;
-    
+
     /**
      * Handle the event.
      *
diff --git a/app/Listeners/Quote/QuoteApprovedActivity.php b/app/Listeners/Quote/QuoteApprovedActivity.php
index 3afef61a4dd2..62375260de51 100644
--- a/app/Listeners/Quote/QuoteApprovedActivity.php
+++ b/app/Listeners/Quote/QuoteApprovedActivity.php
@@ -22,7 +22,7 @@ class QuoteApprovedActivity implements ShouldQueue
     protected $activity_repo;
 
     public $delay = 5;
-    
+
     /**
      * Create the event listener.
      *
diff --git a/app/Listeners/Quote/QuoteApprovedNotification.php b/app/Listeners/Quote/QuoteApprovedNotification.php
index f48ab17784b0..92611258467e 100644
--- a/app/Listeners/Quote/QuoteApprovedNotification.php
+++ b/app/Listeners/Quote/QuoteApprovedNotification.php
@@ -26,7 +26,7 @@ class QuoteApprovedNotification implements ShouldQueue
     use UserNotifies;
 
     public $delay = 5;
-    
+
     public function __construct()
     {
     }
@@ -46,7 +46,7 @@ class QuoteApprovedNotification implements ShouldQueue
         $quote = $event->quote;
 
         $nmo = new NinjaMailerObject;
-        $nmo->mailable = new NinjaMailer( (new QuoteApprovedObject($quote, $event->company))->build() );
+        $nmo->mailable = new NinjaMailer((new QuoteApprovedObject($quote, $event->company))->build());
         $nmo->company = $quote->company;
         $nmo->settings = $quote->company->settings;
 
@@ -56,8 +56,9 @@ class QuoteApprovedNotification implements ShouldQueue
             /* The User */
             $user = $company_user->user;
 
-            if(!$user)
+            if (! $user) {
                 continue;
+            }
 
             /* Returns an array of notification methods */
             $methods = $this->findUserNotificationTypes($quote->invitations()->first(), $company_user, 'quote', ['all_notifications', 'quote_approved', 'quote_approved_all']);
@@ -69,11 +70,10 @@ class QuoteApprovedNotification implements ShouldQueue
                 $nmo->to_user = $user;
 
                 NinjaMailerJob::dispatch($nmo);
-                
+
                 /* This prevents more than one notification being sent */
                 $first_notification_sent = false;
             }
-
         }
     }
 }
diff --git a/app/Listeners/Quote/QuoteApprovedWebhook.php b/app/Listeners/Quote/QuoteApprovedWebhook.php
index 59c5c237d64e..69e85244e57b 100644
--- a/app/Listeners/Quote/QuoteApprovedWebhook.php
+++ b/app/Listeners/Quote/QuoteApprovedWebhook.php
@@ -19,7 +19,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 class QuoteApprovedWebhook implements ShouldQueue
 {
     public $delay = 5;
-    
+
     public function __construct()
     {
     }
@@ -43,6 +43,5 @@ class QuoteApprovedWebhook implements ShouldQueue
         if ($subscriptions) {
             WebhookHandler::dispatch(Webhook::EVENT_APPROVE_QUOTE, $quote, $quote->company);
         }
-
     }
 }
diff --git a/app/Listeners/Quote/QuoteArchivedActivity.php b/app/Listeners/Quote/QuoteArchivedActivity.php
index ccae99d61196..45301a990089 100644
--- a/app/Listeners/Quote/QuoteArchivedActivity.php
+++ b/app/Listeners/Quote/QuoteArchivedActivity.php
@@ -20,7 +20,7 @@ use stdClass;
 class QuoteArchivedActivity implements ShouldQueue
 {
     public $delay = 5;
-        
+
     protected $activity_repo;
 
     /**
diff --git a/app/Listeners/Quote/QuoteCreatedNotification.php b/app/Listeners/Quote/QuoteCreatedNotification.php
index 74fd418c942c..9ae90d50cb0e 100644
--- a/app/Listeners/Quote/QuoteCreatedNotification.php
+++ b/app/Listeners/Quote/QuoteCreatedNotification.php
@@ -23,7 +23,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 class QuoteCreatedNotification implements ShouldQueue
 {
     public $delay = 5;
-        
+
     use UserNotifies;
 
     public function __construct()
@@ -45,7 +45,7 @@ class QuoteCreatedNotification implements ShouldQueue
         $quote = $event->quote;
 
         $nmo = new NinjaMailerObject;
-        $nmo->mailable = new NinjaMailer( (new EntityCreatedObject($quote, 'quote'))->build() );
+        $nmo->mailable = new NinjaMailer((new EntityCreatedObject($quote, 'quote'))->build());
         $nmo->company = $quote->company;
         $nmo->settings = $quote->company->settings;
 
@@ -55,8 +55,9 @@ class QuoteCreatedNotification implements ShouldQueue
             /* The User */
             $user = $company_user->user;
 
-            if(!$user)
+            if (! $user) {
                 continue;
+            }
 
             /* This is only here to handle the alternate message channels - ie Slack */
             // $notification = new EntitySentNotification($event->invitation, 'quote');
@@ -68,11 +69,10 @@ class QuoteCreatedNotification implements ShouldQueue
             if (($key = array_search('mail', $methods)) !== false) {
                 unset($methods[$key]);
 
-                
                 $nmo->to_user = $user;
 
                 NinjaMailerJob::dispatch($nmo);
-                
+
                 /* This prevents more than one notification being sent */
                 $first_notification_sent = false;
             }
@@ -80,7 +80,7 @@ class QuoteCreatedNotification implements ShouldQueue
             /* Override the methods in the Notification Class */
             // $notification->method = $methods;
 
-            //  Notify on the alternate channels 
+            //  Notify on the alternate channels
             // $user->notify($notification);
         }
     }
diff --git a/app/Listeners/Quote/QuoteDeletedActivity.php b/app/Listeners/Quote/QuoteDeletedActivity.php
index b8bd94a0bbab..a86bc7c42635 100644
--- a/app/Listeners/Quote/QuoteDeletedActivity.php
+++ b/app/Listeners/Quote/QuoteDeletedActivity.php
@@ -20,7 +20,7 @@ use stdClass;
 class QuoteDeletedActivity implements ShouldQueue
 {
     public $delay = 5;
-        
+
     protected $activity_repo;
 
     /**
diff --git a/app/Listeners/Quote/QuoteEmailActivity.php b/app/Listeners/Quote/QuoteEmailActivity.php
index 07965e20d61c..0ac41f57dae2 100644
--- a/app/Listeners/Quote/QuoteEmailActivity.php
+++ b/app/Listeners/Quote/QuoteEmailActivity.php
@@ -20,7 +20,7 @@ use stdClass;
 class QuoteEmailActivity implements ShouldQueue
 {
     public $delay = 5;
-        
+
     protected $activity_repo;
 
     /**
@@ -45,7 +45,6 @@ class QuoteEmailActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-
         $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->quote->user_id;
 
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Quote/QuoteEmailedNotification.php b/app/Listeners/Quote/QuoteEmailedNotification.php
index a6f29d45b768..c5abc5ef8af5 100644
--- a/app/Listeners/Quote/QuoteEmailedNotification.php
+++ b/app/Listeners/Quote/QuoteEmailedNotification.php
@@ -22,9 +22,8 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 
 class QuoteEmailedNotification implements ShouldQueue
 {
-
     public $delay = 5;
-        
+
     use UserNotifies;
 
     public function __construct()
@@ -48,11 +47,10 @@ class QuoteEmailedNotification implements ShouldQueue
         $quote->saveQuietly();
 
         $nmo = new NinjaMailerObject;
-        $nmo->mailable = new NinjaMailer( (new EntitySentObject($event->invitation, 'quote', $event->template))->build() );
+        $nmo->mailable = new NinjaMailer((new EntitySentObject($event->invitation, 'quote', $event->template))->build());
         $nmo->company = $quote->company;
         $nmo->settings = $quote->company->settings;
 
-
         foreach ($event->invitation->company->company_users as $company_user) {
             $user = $company_user->user;
 
@@ -63,11 +61,10 @@ class QuoteEmailedNotification implements ShouldQueue
             if (($key = array_search('mail', $methods)) !== false) {
                 unset($methods[$key]);
 
-                
                 $nmo->to_user = $user;
 
                 NinjaMailerJob::dispatch($nmo);
-                
+
                 // $first_notification_sent = false;
             }
 
@@ -76,4 +73,4 @@ class QuoteEmailedNotification implements ShouldQueue
             // $user->notify($notification);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/Listeners/Quote/QuoteRestoredActivity.php b/app/Listeners/Quote/QuoteRestoredActivity.php
index ee4e8f28686a..476a78bf2e89 100644
--- a/app/Listeners/Quote/QuoteRestoredActivity.php
+++ b/app/Listeners/Quote/QuoteRestoredActivity.php
@@ -20,7 +20,7 @@ use stdClass;
 class QuoteRestoredActivity implements ShouldQueue
 {
     public $delay = 5;
-        
+
     protected $activity_repo;
 
     /**
@@ -45,7 +45,6 @@ class QuoteRestoredActivity implements ShouldQueue
 
         $fields = new stdClass;
 
-
         $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->quote->user_id;
 
         $fields->user_id = $user_id;
diff --git a/app/Listeners/Quote/QuoteViewedActivity.php b/app/Listeners/Quote/QuoteViewedActivity.php
index d9d04541c0e4..0a25130e6807 100644
--- a/app/Listeners/Quote/QuoteViewedActivity.php
+++ b/app/Listeners/Quote/QuoteViewedActivity.php
@@ -20,7 +20,7 @@ use stdClass;
 class QuoteViewedActivity implements ShouldQueue
 {
     public $delay = 5;
-        
+
     protected $activity_repo;
 
     /**
diff --git a/app/Listeners/Quote/ReachWorkflowSettings.php b/app/Listeners/Quote/ReachWorkflowSettings.php
index 1ca8dbe06fcc..16bca41c36c5 100644
--- a/app/Listeners/Quote/ReachWorkflowSettings.php
+++ b/app/Listeners/Quote/ReachWorkflowSettings.php
@@ -27,6 +27,6 @@ class ReachWorkflowSettings
     {
         MultiDB::setDb($event->company->db);
 
-        QuoteWorkflowSettings::dispatchNow($event->quote);
+        (new QuoteWorkflowSettings($event->quote))->handle();
     }
 }
diff --git a/app/Listeners/RecurringExpense/CreatedRecurringExpenseActivity.php b/app/Listeners/RecurringExpense/CreatedRecurringExpenseActivity.php
index 3c850525e067..28e1b383b126 100644
--- a/app/Listeners/RecurringExpense/CreatedRecurringExpenseActivity.php
+++ b/app/Listeners/RecurringExpense/CreatedRecurringExpenseActivity.php
@@ -51,7 +51,7 @@ class CreatedRecurringExpenseActivity implements ShouldQueue
         $fields->user_id = $user_id;
         $fields->company_id = $recurring_expense->company_id;
         $fields->activity_type_id = Activity::CREATE_RECURRING_EXPENSE;
-        
+
         $this->activity_repo->save($fields, $recurring_expense, $event->event_vars);
     }
 }
diff --git a/app/Listeners/RecurringExpense/RecurringExpenseArchivedActivity.php b/app/Listeners/RecurringExpense/RecurringExpenseArchivedActivity.php
index 06e9210070d3..8e0ecabd1464 100644
--- a/app/Listeners/RecurringExpense/RecurringExpenseArchivedActivity.php
+++ b/app/Listeners/RecurringExpense/RecurringExpenseArchivedActivity.php
@@ -51,7 +51,7 @@ class RecurringExpenseArchivedActivity implements ShouldQueue
         $fields->user_id = $user_id;
         $fields->company_id = $recurring_expense->company_id;
         $fields->activity_type_id = Activity::ARCHIVE_RECURRING_EXPENSE;
-        
+
         $this->activity_repo->save($fields, $recurring_expense, $event->event_vars);
     }
 }
diff --git a/app/Listeners/RecurringInvoice/RecurringInvoiceArchivedActivity.php b/app/Listeners/RecurringInvoice/RecurringInvoiceArchivedActivity.php
index a533cbb6a17e..65db2c43bfec 100644
--- a/app/Listeners/RecurringInvoice/RecurringInvoiceArchivedActivity.php
+++ b/app/Listeners/RecurringInvoice/RecurringInvoiceArchivedActivity.php
@@ -42,7 +42,7 @@ class RecurringInvoiceArchivedActivity implements ShouldQueue
         MultiDB::setDb($event->company->db);
 
         $event->recurring_invoice->service()->deletePdf();
-        
+
         $fields = new stdClass;
         $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_invoice->user_id;
 
diff --git a/app/Listeners/RecurringQuote/RecurringQuoteArchivedActivity.php b/app/Listeners/RecurringQuote/RecurringQuoteArchivedActivity.php
index fb06d8947268..747e52ce2d98 100644
--- a/app/Listeners/RecurringQuote/RecurringQuoteArchivedActivity.php
+++ b/app/Listeners/RecurringQuote/RecurringQuoteArchivedActivity.php
@@ -42,7 +42,7 @@ class RecurringQuoteArchivedActivity implements ShouldQueue
         MultiDB::setDb($event->company->db);
 
         $event->recurring_quote->service()->deletePdf();
-        
+
         $fields = new stdClass;
         $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->recurring_quote->user_id;
 
diff --git a/app/Listeners/SendVerificationNotification.php b/app/Listeners/SendVerificationNotification.php
index 4640b8a00d13..be6bed60ed8a 100644
--- a/app/Listeners/SendVerificationNotification.php
+++ b/app/Listeners/SendVerificationNotification.php
@@ -23,8 +23,8 @@ use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\App;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\App;
 
 class SendVerificationNotification implements ShouldQueue
 {
@@ -52,9 +52,7 @@ class SendVerificationNotification implements ShouldQueue
 
         $event->user->service()->invite($event->company);
 
-
-        if(Carbon::parse($event->company->created_at)->lt(now()->subDay()))
-        {
+        if (Carbon::parse($event->company->created_at)->lt(now()->subDay())) {
             App::forgetInstance('translator');
             $t = app('translator');
             $t->replace(Ninja::transformTranslations($event->company->settings));
@@ -64,8 +62,7 @@ class SendVerificationNotification implements ShouldQueue
             $nmo->company = $event->company;
             $nmo->settings = $event->company->settings;
             $nmo->to_user = $event->creating_user;
-            NinjaMailerJob::dispatch($nmo);
+            NinjaMailerJob::dispatch($nmo, true);
         }
-
     }
 }
diff --git a/app/Listeners/User/ArchivedUserActivity.php b/app/Listeners/User/ArchivedUserActivity.php
index 04b57b9572a3..6375400dd53c 100644
--- a/app/Listeners/User/ArchivedUserActivity.php
+++ b/app/Listeners/User/ArchivedUserActivity.php
@@ -46,7 +46,7 @@ class ArchivedUserActivity implements ShouldQueue
         $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id;
 
         $fields->user_id = $user_id;
-        $fields->notes = $event->creating_user->present()->name . " Archived User " . $event->user->present()->name();
+        $fields->notes = $event->creating_user->present()->name.' Archived User '.$event->user->present()->name();
 
         $fields->company_id = $event->company->id;
         $fields->activity_type_id = Activity::ARCHIVE_USER;
diff --git a/app/Listeners/User/CreatedUserActivity.php b/app/Listeners/User/CreatedUserActivity.php
index a9c8015cf6b5..fb29a7080691 100644
--- a/app/Listeners/User/CreatedUserActivity.php
+++ b/app/Listeners/User/CreatedUserActivity.php
@@ -46,7 +46,7 @@ class CreatedUserActivity implements ShouldQueue
         $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id;
 
         $fields->user_id = $user_id;
-        $fields->notes = $event->creating_user->present()->name() . " Created the user " . $event->user->present()->name();
+        $fields->notes = $event->creating_user->present()->name().' Created the user '.$event->user->present()->name();
         $fields->company_id = $event->company->id;
         $fields->activity_type_id = Activity::CREATE_USER;
 
diff --git a/app/Listeners/User/DeletedUserActivity.php b/app/Listeners/User/DeletedUserActivity.php
index a9b02983ea2e..f923b33915d4 100644
--- a/app/Listeners/User/DeletedUserActivity.php
+++ b/app/Listeners/User/DeletedUserActivity.php
@@ -52,7 +52,7 @@ class DeletedUserActivity implements ShouldQueue
 
         $fields->user_id = $user_id;
 
-        $fields->notes = $event->creating_user->present()->name() . " Deleted the user " . $event->user->present()->name();
+        $fields->notes = $event->creating_user->present()->name().' Deleted the user '.$event->user->present()->name();
         $fields->company_id = $event->company->id;
         $fields->activity_type_id = Activity::DELETE_USER;
 
diff --git a/app/Listeners/User/RestoredUserActivity.php b/app/Listeners/User/RestoredUserActivity.php
index 72326a1b6379..f551cf9fc2b0 100644
--- a/app/Listeners/User/RestoredUserActivity.php
+++ b/app/Listeners/User/RestoredUserActivity.php
@@ -45,7 +45,7 @@ class RestoredUserActivity implements ShouldQueue
         $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id;
 
         $fields->user_id = $user_id;
-        $fields->notes = $event->creating_user->present()->name() . " Restored user " . $event->user->present()->name();
+        $fields->notes = $event->creating_user->present()->name().' Restored user '.$event->user->present()->name();
 
         $fields->company_id = $event->company->id;
         $fields->activity_type_id = Activity::RESTORE_USER;
diff --git a/app/Listeners/User/UpdateUserLastLogin.php b/app/Listeners/User/UpdateUserLastLogin.php
index f2442fded947..984132df3f99 100644
--- a/app/Listeners/User/UpdateUserLastLogin.php
+++ b/app/Listeners/User/UpdateUserLastLogin.php
@@ -44,7 +44,6 @@ class UpdateUserLastLogin implements ShouldQueue
      */
     public function handle($event)
     {
-        
         MultiDB::setDb($event->company->db);
 
         $user = $event->user;
@@ -54,15 +53,14 @@ class UpdateUserLastLogin implements ShouldQueue
         $event_vars = $event->event_vars;
         $ip = array_key_exists('ip', $event->event_vars) ? $event->event_vars['ip'] : 'IP address not resolved';
 
-        if($user->ip != $ip)
-        {
+        if ($user->ip != $ip) {
             $nmo = new NinjaMailerObject;
             $nmo->mailable = new UserLoggedIn($user, $user->account->companies->first(), $ip);
             $nmo->company = $user->account->companies->first();
             $nmo->settings = $user->account->companies->first()->settings;
             $nmo->to_user = $user;
-            NinjaMailerJob::dispatch($nmo);
-        
+            NinjaMailerJob::dispatch($nmo, true);
+
             $user->ip = $ip;
             $user->save();
         }
@@ -77,6 +75,5 @@ class UpdateUserLastLogin implements ShouldQueue
             null,
             $event->company,
         );
-
     }
 }
diff --git a/app/Listeners/User/UpdatedUserActivity.php b/app/Listeners/User/UpdatedUserActivity.php
index 0dead79984e6..1d2fcbc82e8e 100644
--- a/app/Listeners/User/UpdatedUserActivity.php
+++ b/app/Listeners/User/UpdatedUserActivity.php
@@ -44,8 +44,8 @@ class UpdatedUserActivity implements ShouldQueue
         $fields = new stdClass;
         $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->creating_user->id;
 
-        $fields->user_id = $user_id;   
-        $fields->notes = $event->creating_user->present()->name() . " Updated user " . $event->user->present()->name();
+        $fields->user_id = $user_id;
+        $fields->notes = $event->creating_user->present()->name().' Updated user '.$event->user->present()->name();
 
         $fields->company_id = $event->company->id;
         $fields->activity_type_id = Activity::UPDATE_USER;
diff --git a/app/Mail/Admin/AccountCreatedObject.php b/app/Mail/Admin/AccountCreatedObject.php
index 902dce1598df..1465679e36d7 100644
--- a/app/Mail/Admin/AccountCreatedObject.php
+++ b/app/Mail/Admin/AccountCreatedObject.php
@@ -16,23 +16,18 @@ use Illuminate\Support\Facades\App;
 
 class AccountCreatedObject
 {
-
     public $user;
 
     public $company;
 
-    /**
-     *
-     */
     public function __construct($user, $company)
     {
         $this->user = $user;
-    	$this->company = $company;
+        $this->company = $company;
     }
 
     public function build()
     {
-
         App::forgetInstance('translator');
         /* Init a new copy of the translator*/
         $t = app('translator');
@@ -51,7 +46,6 @@ class AccountCreatedObject
             'logo' => $this->company->present()->logo(),
         ];
 
-
         $mail_obj = new \stdClass;
         $mail_obj->subject = ctrans('texts.new_signup');
         $mail_obj->data = $data;
@@ -60,4 +54,4 @@ class AccountCreatedObject
 
         return $mail_obj;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Mail/Admin/AutoBillingFailureObject.php b/app/Mail/Admin/AutoBillingFailureObject.php
index 9771c24154f0..abbafc45768b 100644
--- a/app/Mail/Admin/AutoBillingFailureObject.php
+++ b/app/Mail/Admin/AutoBillingFailureObject.php
@@ -52,12 +52,10 @@ class AutoBillingFailureObject
         $this->payment_hash = $payment_hash;
 
         $this->company = $company;
-
     }
 
     public function build()
     {
-
         App::forgetInstance('translator');
         /* Init a new copy of the translator*/
         $t = app('translator');
@@ -80,12 +78,11 @@ class AutoBillingFailureObject
 
     private function getAmount()
     {
-       return array_sum(array_column($this->payment_hash->invoices(), 'amount')) + $this->payment_hash->fee_total;
+        return array_sum(array_column($this->payment_hash->invoices(), 'amount')) + $this->payment_hash->fee_total;
     }
 
     private function getSubject()
     {
-
         return
             ctrans(
                 'texts.auto_bill_failed',
diff --git a/app/Mail/Admin/ClientPaymentFailureObject.php b/app/Mail/Admin/ClientPaymentFailureObject.php
index 4cd15830314e..176ee13db233 100644
--- a/app/Mail/Admin/ClientPaymentFailureObject.php
+++ b/app/Mail/Admin/ClientPaymentFailureObject.php
@@ -20,7 +20,7 @@ use stdClass;
 
 class ClientPaymentFailureObject
 {
-     use MakesHash;
+    use MakesHash;
 
     public $client;
 
@@ -51,12 +51,11 @@ class ClientPaymentFailureObject
         $this->payment_hash = $payment_hash;
 
         $this->company = $company;
-
     }
 
     public function build()
     {
-        if(!$this->payment_hash){
+        if (! $this->payment_hash) {
             return;
         }
 
@@ -82,28 +81,25 @@ class ClientPaymentFailureObject
 
     private function getAmount()
     {
-
-       return array_sum(array_column($this->payment_hash->invoices(), 'amount')) + $this->payment_hash->fee_total;
-
+        return array_sum(array_column($this->payment_hash->invoices(), 'amount')) + $this->payment_hash->fee_total;
     }
 
     private function getSubject()
     {
-
         return
             ctrans(
                 'texts.notification_invoice_payment_failed_subject',
-                ['invoice' => implode(",", $this->invoices->pluck('number')->toArray())]
+                ['invoice' => implode(',', $this->invoices->pluck('number')->toArray())]
             );
-
     }
 
     private function getData()
     {
         $invitation = $this->invoices->first()->invitations->first();
 
-        if(!$invitation)
+        if (! $invitation) {
             throw new \Exception('Unable to find invitation for reference');
+        }
 
         $signature = $this->client->getSetting('email_signature');
         $html_variables = (new HtmlEngine($invitation))->makeValues();
@@ -113,11 +109,11 @@ class ClientPaymentFailureObject
             'title' => ctrans(
                 'texts.notification_invoice_payment_failed_subject',
                 [
-                    'invoice' => $this->invoices->first()->number
+                    'invoice' => $this->invoices->first()->number,
                 ]
             ),
             'greeting' => ctrans('texts.email_salutation', ['name' => $this->client->present()->name]),
-            'content' => ctrans('texts.client_payment_failure_body', ['invoice' => implode(",", $this->invoices->pluck('number')->toArray()), 'amount' => $this->getAmount()]),
+            'content' => ctrans('texts.client_payment_failure_body', ['invoice' => implode(',', $this->invoices->pluck('number')->toArray()), 'amount' => $this->getAmount()]),
             'signature' => $signature,
             'logo' => $this->company->present()->logo(),
             'settings' => $this->client->getMergedSettings(),
@@ -130,6 +126,4 @@ class ClientPaymentFailureObject
 
         return $data;
     }
-
-
 }
diff --git a/app/Mail/Admin/EntityCreatedObject.php b/app/Mail/Admin/EntityCreatedObject.php
index b5a4bac5f67e..38555b06d1ec 100644
--- a/app/Mail/Admin/EntityCreatedObject.php
+++ b/app/Mail/Admin/EntityCreatedObject.php
@@ -13,12 +13,11 @@ namespace App\Mail\Admin;
 
 use App\Utils\Ninja;
 use App\Utils\Number;
-use stdClass;
 use Illuminate\Support\Facades\App;
+use stdClass;
 
 class EntityCreatedObject
 {
-
     public $entity_type;
 
     public $entity;
@@ -71,21 +70,21 @@ class EntityCreatedObject
 
         switch ($this->entity_type) {
             case 'invoice':
-                $this->template_subject = "texts.notification_invoice_created_subject";
-                $this->template_body = "texts.notification_invoice_created_body";
+                $this->template_subject = 'texts.notification_invoice_created_subject';
+                $this->template_body = 'texts.notification_invoice_created_body';
                 break;
             case 'quote':
-                $this->template_subject = "texts.notification_quote_created_subject";
-                $this->template_body = "texts.notification_quote_created_body";
+                $this->template_subject = 'texts.notification_quote_created_subject';
+                $this->template_body = 'texts.notification_quote_created_body';
                 break;
             case 'credit':
-                $this->template_subject = "texts.notification_credit_created_subject";
-                $this->template_body = "texts.notification_credit_created_body";
+                $this->template_subject = 'texts.notification_credit_created_subject';
+                $this->template_body = 'texts.notification_credit_created_body';
                 break;
 
             default:
-                $this->template_subject = "texts.notification_invoice_created_subject";
-                $this->template_body = "texts.notification_invoice_created_body";
+                $this->template_subject = 'texts.notification_invoice_created_subject';
+                $this->template_body = 'texts.notification_invoice_created_body';
                 break;
         }
     }
@@ -101,9 +100,9 @@ class EntityCreatedObject
             ctrans(
                 $this->template_subject,
                 [
-                        'client' => $this->client->present()->name(),
-                        'invoice' => $this->entity->number,
-                    ]
+                    'client' => $this->client->present()->name(),
+                    'invoice' => $this->entity->number,
+                ]
             );
     }
 
diff --git a/app/Mail/Admin/EntityFailedSendObject.php b/app/Mail/Admin/EntityFailedSendObject.php
index a348f8967b24..81c9236e5812 100644
--- a/app/Mail/Admin/EntityFailedSendObject.php
+++ b/app/Mail/Admin/EntityFailedSendObject.php
@@ -14,8 +14,8 @@ namespace App\Mail\Admin;
 use App\Utils\HtmlEngine;
 use App\Utils\Ninja;
 use App\Utils\Number;
-use stdClass;
-        use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\App;
+        use stdClass;
 
 class EntityFailedSendObject
 {
@@ -52,7 +52,6 @@ class EntityFailedSendObject
 
     public function build()
     {
-
         App::forgetInstance('translator');
         /* Init a new copy of the translator*/
         $t = app('translator');
@@ -79,36 +78,36 @@ class EntityFailedSendObject
 
         switch ($this->template) {
             case 'invoice':
-                $this->template_subject = "texts.notification_invoice_bounced_subject";
-                $this->template_body = "texts.notification_invoice_bounced";
+                $this->template_subject = 'texts.notification_invoice_bounced_subject';
+                $this->template_body = 'texts.notification_invoice_bounced';
                 break;
             case 'reminder1':
-                $this->template_subject = "texts.notification_invoice_reminder1_sent_subject";
-                $this->template_body = "texts.notification_invoice_sent";
+                $this->template_subject = 'texts.notification_invoice_reminder1_sent_subject';
+                $this->template_body = 'texts.notification_invoice_sent';
                 break;
             case 'reminder2':
-                $this->template_subject = "texts.notification_invoice_reminder2_sent_subject";
-                $this->template_body = "texts.notification_invoice_sent";
+                $this->template_subject = 'texts.notification_invoice_reminder2_sent_subject';
+                $this->template_body = 'texts.notification_invoice_sent';
                 break;
             case 'reminder3':
-                $this->template_subject = "texts.notification_invoice_reminder3_sent_subject";
-                $this->template_body = "texts.notification_invoice_sent";
+                $this->template_subject = 'texts.notification_invoice_reminder3_sent_subject';
+                $this->template_body = 'texts.notification_invoice_sent';
                 break;
             case 'reminder_endless':
-                $this->template_subject = "texts.notification_invoice_reminder_endless_sent_subject";
-                $this->template_body = "texts.notification_invoice_sent";
+                $this->template_subject = 'texts.notification_invoice_reminder_endless_sent_subject';
+                $this->template_body = 'texts.notification_invoice_sent';
                 break;
             case 'quote':
-                $this->template_subject = "texts.notification_quote_bounced_subject";
-                $this->template_body = "texts.notification_quote_sent";
+                $this->template_subject = 'texts.notification_quote_bounced_subject';
+                $this->template_body = 'texts.notification_quote_sent';
                 break;
             case 'credit':
-                $this->template_subject = "texts.notification_credit_bounced_subject";
-                $this->template_body = "texts.notification_credit_bounced";
+                $this->template_subject = 'texts.notification_credit_bounced_subject';
+                $this->template_body = 'texts.notification_credit_bounced';
                 break;
             default:
-                $this->template_subject = "texts.notification_invoice_sent_subject";
-                $this->template_body = "texts.notification_invoice_sent";
+                $this->template_subject = 'texts.notification_invoice_sent_subject';
+                $this->template_body = 'texts.notification_invoice_sent';
                 break;
         }
     }
@@ -124,9 +123,9 @@ class EntityFailedSendObject
             ctrans(
                 $this->template_subject,
                 [
-                        'client' => $this->contact->present()->name(),
-                        'invoice' => $this->entity->number,
-                    ]
+                    'client' => $this->contact->present()->name(),
+                    'invoice' => $this->entity->number,
+                ]
             );
     }
 
diff --git a/app/Mail/Admin/EntityNotificationMailer.php b/app/Mail/Admin/EntityNotificationMailer.php
index 57c424615d5a..8f2718de6eb9 100644
--- a/app/Mail/Admin/EntityNotificationMailer.php
+++ b/app/Mail/Admin/EntityNotificationMailer.php
@@ -34,11 +34,10 @@ class EntityNotificationMailer extends Mailable
      */
     public function build()
     {
-
         return $this->from(config('mail.from.address'), config('mail.from.name'))
                     ->subject($this->mail_obj->subject)
                     ->markdown($this->mail_obj->markdown, $this->mail_obj->data)
-                    ->withSwiftMessage(function ($message) {
+                    ->withSymfonyMessage(function ($message) {
                         $message->getHeaders()->addTextHeader('Tag', $this->mail_obj->tag);
                     });
     }
diff --git a/app/Mail/Admin/EntityPaidObject.php b/app/Mail/Admin/EntityPaidObject.php
index a289556228bd..732464b70db1 100644
--- a/app/Mail/Admin/EntityPaidObject.php
+++ b/app/Mail/Admin/EntityPaidObject.php
@@ -37,7 +37,6 @@ class EntityPaidObject
 
     public function build()
     {
-
         App::forgetInstance('translator');
         /* Init a new copy of the translator*/
         $t = app('translator');
@@ -94,9 +93,9 @@ class EntityPaidObject
             'content' => ctrans(
                 'texts.notification_payment_paid',
                 ['amount' => $amount,
-                'client' => $this->payment->client->present()->name(),
-                'invoice' => $invoice_texts,
-            ]
+                    'client' => $this->payment->client->present()->name(),
+                    'invoice' => $invoice_texts,
+                ]
             ),
             'url' => config('ninja.app_url'),
             'button' => ctrans('texts.view_payment'),
@@ -114,7 +113,7 @@ class EntityPaidObject
         $html_variables = (new PaymentEmailEngine($this->payment, $this->payment->client->primary_contact()->first()))->makeValues();
 
         $signature = str_replace(array_keys($html_variables), array_values($html_variables), $settings->email_signature);
-        
+
         return $signature;
     }
 }
diff --git a/app/Mail/Admin/EntitySentObject.php b/app/Mail/Admin/EntitySentObject.php
index 8019646f43d4..b960270ad717 100644
--- a/app/Mail/Admin/EntitySentObject.php
+++ b/app/Mail/Admin/EntitySentObject.php
@@ -13,8 +13,8 @@ namespace App\Mail\Admin;
 
 use App\Utils\Ninja;
 use App\Utils\Number;
-use stdClass;
 use Illuminate\Support\Facades\App;
+use stdClass;
 
 class EntitySentObject
 {
@@ -48,7 +48,6 @@ class EntitySentObject
 
     public function build()
     {
-
         App::forgetInstance('translator');
         /* Init a new copy of the translator*/
         $t = app('translator');
@@ -75,37 +74,37 @@ class EntitySentObject
 
         switch ($this->template) {
             case 'invoice':
-                $this->template_subject = "texts.notification_invoice_sent_subject";
-                $this->template_body = "texts.notification_invoice_sent";
+                $this->template_subject = 'texts.notification_invoice_sent_subject';
+                $this->template_body = 'texts.notification_invoice_sent';
                 break;
             case 'reminder1':
-                $this->template_subject = "texts.notification_invoice_reminder1_sent_subject";
-                $this->template_body = "texts.notification_invoice_sent";
+                $this->template_subject = 'texts.notification_invoice_reminder1_sent_subject';
+                $this->template_body = 'texts.notification_invoice_sent';
                 break;
             case 'reminder2':
-                $this->template_subject = "texts.notification_invoice_reminder2_sent_subject";
-                $this->template_body = "texts.notification_invoice_sent";
+                $this->template_subject = 'texts.notification_invoice_reminder2_sent_subject';
+                $this->template_body = 'texts.notification_invoice_sent';
                 break;
             case 'reminder3':
-                $this->template_subject = "texts.notification_invoice_reminder3_sent_subject";
-                $this->template_body = "texts.notification_invoice_sent";
+                $this->template_subject = 'texts.notification_invoice_reminder3_sent_subject';
+                $this->template_body = 'texts.notification_invoice_sent';
                 break;
             case 'reminder_endless':
-                $this->template_subject = "texts.notification_invoice_reminder_endless_sent_subject";
-                $this->template_body = "texts.notification_invoice_sent";
+                $this->template_subject = 'texts.notification_invoice_reminder_endless_sent_subject';
+                $this->template_body = 'texts.notification_invoice_sent';
                 break;
             case 'quote':
-                $this->template_subject = "texts.notification_quote_sent_subject";
-                $this->template_body = "texts.notification_quote_sent";
+                $this->template_subject = 'texts.notification_quote_sent_subject';
+                $this->template_body = 'texts.notification_quote_sent';
                 break;
             case 'credit':
-                $this->template_subject = "texts.notification_credit_sent_subject";
-                $this->template_body = "texts.notification_credit_sent";
+                $this->template_subject = 'texts.notification_credit_sent_subject';
+                $this->template_body = 'texts.notification_credit_sent';
                 break;
 
             default:
-                $this->template_subject = "texts.notification_invoice_sent_subject";
-                $this->template_body = "texts.notification_invoice_sent";
+                $this->template_subject = 'texts.notification_invoice_sent_subject';
+                $this->template_body = 'texts.notification_invoice_sent';
                 break;
         }
     }
@@ -121,9 +120,9 @@ class EntitySentObject
             ctrans(
                 $this->template_subject,
                 [
-                        'client' => $this->contact->client->present()->name(),
-                        'invoice' => $this->entity->number,
-                    ]
+                    'client' => $this->contact->client->present()->name(),
+                    'invoice' => $this->entity->number,
+                ]
             );
     }
 
diff --git a/app/Mail/Admin/EntityViewedObject.php b/app/Mail/Admin/EntityViewedObject.php
index 85e4d827c34c..29624f2e4bce 100644
--- a/app/Mail/Admin/EntityViewedObject.php
+++ b/app/Mail/Admin/EntityViewedObject.php
@@ -13,8 +13,8 @@ namespace App\Mail\Admin;
 
 use App\Utils\Ninja;
 use App\Utils\Number;
-use stdClass;
 use Illuminate\Support\Facades\App;
+use stdClass;
 
 class EntityViewedObject
 {
@@ -41,9 +41,9 @@ class EntityViewedObject
 
     public function build()
     {
-
-        if(!$this->entity)
+        if (! $this->entity) {
             return;
+        }
 
         App::forgetInstance('translator');
         /* Init a new copy of the translator*/
@@ -65,10 +65,11 @@ class EntityViewedObject
 
     private function getAmount()
     {
-        if($this->entity->client)
+        if ($this->entity->client) {
             $currency_entity = $this->entity->client;
-        else
+        } else {
             $currency_entity = $this->company;
+        }
 
         return Number::formatMoney($this->entity->amount, $currency_entity);
     }
@@ -79,18 +80,19 @@ class EntityViewedObject
             ctrans(
                 "texts.notification_{$this->entity_type}_viewed_subject",
                 [
-                        'client' => $this->contact->present()->name(),
-                        'invoice' => $this->entity->number,
-                    ]
+                    'client' => $this->contact->present()->name(),
+                    'invoice' => $this->entity->number,
+                ]
             );
     }
 
     private function getData()
     {
-        if($this->entity->client)
+        if ($this->entity->client) {
             $settings = $this->entity->client->getMergedSettings();
-        else
-            $settings = $this->company->settings; 
+        } else {
+            $settings = $this->company->settings;
+        }
 
         $data = [
             'title' => $this->getSubject(),
diff --git a/app/Mail/Admin/InventoryNotificationObject.php b/app/Mail/Admin/InventoryNotificationObject.php
index e752c5acf909..5d372ac2cd95 100644
--- a/app/Mail/Admin/InventoryNotificationObject.php
+++ b/app/Mail/Admin/InventoryNotificationObject.php
@@ -22,7 +22,6 @@ use stdClass;
 
 class InventoryNotificationObject
 {
-
     public Product $product;
 
     public Company $company;
@@ -40,7 +39,6 @@ class InventoryNotificationObject
 
     public function build()
     {
-
         App::forgetInstance('translator');
         /* Init a new copy of the translator*/
         $t = app('translator');
@@ -69,20 +67,19 @@ class InventoryNotificationObject
         return
             ctrans(
                 'texts.inventory_notification_subject',
-                ['product' => $this->product->product_key . ": " . $this->product->notes]
+                ['product' => $this->product->product_key.': '.$this->product->notes]
             );
     }
 
     private function getData()
     {
-
         $data = [
             'title' => $this->getSubject(),
             'content' => ctrans(
                 'texts.inventory_notification_body',
                 ['amount' => $this->getAmount(),
-                'product' => $this->product->product_key . ": " . $this->product->notes,
-            ]
+                    'product' => $this->product->product_key.': '.$this->product->notes,
+                ]
             ),
             'url' => config('ninja.app_url'),
             'button' => ctrans('texts.login'),
@@ -94,6 +91,4 @@ class InventoryNotificationObject
 
         return $data;
     }
-
-
 }
diff --git a/app/Mail/Admin/PaymentFailureObject.php b/app/Mail/Admin/PaymentFailureObject.php
index cc6e0ed84a26..c5005fc69788 100644
--- a/app/Mail/Admin/PaymentFailureObject.php
+++ b/app/Mail/Admin/PaymentFailureObject.php
@@ -57,12 +57,10 @@ class PaymentFailureObject
         $this->company = $company;
 
         $this->payment_hash = $payment_hash;
-
     }
 
     public function build()
     {
-
         App::forgetInstance('translator');
         /* Init a new copy of the translator*/
         $t = app('translator');
@@ -70,7 +68,7 @@ class PaymentFailureObject
         App::setLocale($this->company->getLocale());
         /* Set customized translations _NOW_ */
         $t->replace(Ninja::transformTranslations($this->company->settings));
-        
+
         $mail_obj = new stdClass;
         $mail_obj->amount = $this->getAmount();
         $mail_obj->subject = $this->getSubject();
@@ -83,20 +81,16 @@ class PaymentFailureObject
 
     private function getAmount()
     {
-
-       return $this->amount;
-
+        return $this->amount;
     }
 
     private function getSubject()
     {
-
         return
             ctrans(
                 'texts.payment_failed_subject',
                 ['client' => $this->client->present()->name()]
             );
-
     }
 
     private function getData()
@@ -107,7 +101,7 @@ class PaymentFailureObject
             'title' => ctrans(
                 'texts.payment_failed_subject',
                 [
-                    'client' => $this->client->present()->name()
+                    'client' => $this->client->present()->name(),
                 ]
             ),
             'content' => ctrans(
@@ -115,7 +109,7 @@ class PaymentFailureObject
                 [
                     'client' => $this->client->present()->name(),
                     'invoice' => $this->getDescription(),
-                    'amount' => Number::formatMoney($this->amount, $this->client)
+                    'amount' => Number::formatMoney($this->amount, $this->client),
                 ]),
             'signature' => $signature,
             'logo' => $this->company->present()->logo(),
@@ -123,20 +117,18 @@ class PaymentFailureObject
             'whitelabel' => $this->company->account->isPaid() ? true : false,
             'url' => config('ninja.app_url'),
             'button' => ctrans('texts.login'),
-            'additional_info' => $this->error
+            'additional_info' => $this->error,
         ];
 
         return $data;
     }
 
-
     public function getDescription(bool $abbreviated = false)
     {
-        if(!$this->payment_hash)
-            return "";
+        if (! $this->payment_hash) {
+            return '';
+        }
 
         return \implode(', ', collect($this->payment_hash->invoices())->pluck('invoice_number')->toArray());
-
     }
-
 }
diff --git a/app/Mail/Admin/PurchaseOrderAcceptedObject.php b/app/Mail/Admin/PurchaseOrderAcceptedObject.php
index 431a1da549a9..07aaa331d30c 100644
--- a/app/Mail/Admin/PurchaseOrderAcceptedObject.php
+++ b/app/Mail/Admin/PurchaseOrderAcceptedObject.php
@@ -21,7 +21,6 @@ use stdClass;
 
 class PurchaseOrderAcceptedObject
 {
-
     public $purchase_order;
 
     public $company;
@@ -38,8 +37,9 @@ class PurchaseOrderAcceptedObject
     {
         MultiDB::setDb($this->company->db);
 
-        if(!$this->purchase_order)
+        if (! $this->purchase_order) {
             return;
+        }
 
         App::forgetInstance('translator');
         /* Init a new copy of the translator*/
@@ -68,11 +68,11 @@ class PurchaseOrderAcceptedObject
     {
         return
             ctrans(
-                "texts.notification_purchase_order_accepted_subject",
+                'texts.notification_purchase_order_accepted_subject',
                 [
-                        'vendor' => $this->purchase_order->vendor->present()->name(),
-                        'purchase_order' => $this->purchase_order->number,
-                    ]
+                    'vendor' => $this->purchase_order->vendor->present()->name(),
+                    'purchase_order' => $this->purchase_order->number,
+                ]
             );
     }
 
@@ -83,7 +83,7 @@ class PurchaseOrderAcceptedObject
         $data = [
             'title' => $this->getSubject(),
             'message' => ctrans(
-                "texts.notification_purchase_order_accepted",
+                'texts.notification_purchase_order_accepted',
                 [
                     'amount' => $this->getAmount(),
                     'vendor' => $this->purchase_order->vendor->present()->name(),
@@ -91,7 +91,7 @@ class PurchaseOrderAcceptedObject
                 ]
             ),
             'url' => $this->purchase_order->invitations->first()->getAdminLink(),
-            'button' => ctrans("texts.view_purchase_order"),
+            'button' => ctrans('texts.view_purchase_order'),
             'signature' => $settings->email_signature,
             'logo' => $this->company->present()->logo(),
             'settings' => $settings,
diff --git a/app/Mail/Admin/QuoteApprovedObject.php b/app/Mail/Admin/QuoteApprovedObject.php
index d089a4050e23..3626f861b053 100644
--- a/app/Mail/Admin/QuoteApprovedObject.php
+++ b/app/Mail/Admin/QuoteApprovedObject.php
@@ -21,7 +21,6 @@ use stdClass;
 
 class QuoteApprovedObject
 {
-
     public $quote;
 
     public $company;
@@ -38,8 +37,9 @@ class QuoteApprovedObject
     {
         MultiDB::setDb($this->company->db);
 
-        if(!$this->quote)
+        if (! $this->quote) {
             return;
+        }
 
         App::forgetInstance('translator');
         /* Init a new copy of the translator*/
@@ -68,11 +68,11 @@ class QuoteApprovedObject
     {
         return
             ctrans(
-                "texts.notification_quote_approved_subject",
+                'texts.notification_quote_approved_subject',
                 [
-                        'client' => $this->quote->client->present()->name(),
-                        'invoice' => $this->quote->number,
-                    ]
+                    'client' => $this->quote->client->present()->name(),
+                    'invoice' => $this->quote->number,
+                ]
             );
     }
 
@@ -83,7 +83,7 @@ class QuoteApprovedObject
         $data = [
             'title' => $this->getSubject(),
             'message' => ctrans(
-                "texts.notification_quote_approved",
+                'texts.notification_quote_approved',
                 [
                     'amount' => $this->getAmount(),
                     'client' => $this->quote->client->present()->name(),
@@ -91,7 +91,7 @@ class QuoteApprovedObject
                 ]
             ),
             'url' => $this->quote->invitations->first()->getAdminLink(),
-            'button' => ctrans("texts.view_quote"),
+            'button' => ctrans('texts.view_quote'),
             'signature' => $settings->email_signature,
             'logo' => $this->company->present()->logo(),
             'settings' => $settings,
diff --git a/app/Mail/Admin/ResetPasswordObject.php b/app/Mail/Admin/ResetPasswordObject.php
index 1d4aecdeb82b..6d75c2da4b13 100644
--- a/app/Mail/Admin/ResetPasswordObject.php
+++ b/app/Mail/Admin/ResetPasswordObject.php
@@ -16,15 +16,12 @@ use Illuminate\Support\Facades\App;
 
 class ResetPasswordObject
 {
-
     public $user;
 
     public $token;
 
     public $company;
-    /**
-     *
-     */
+
     public function __construct($token, $user, $company)
     {
         $this->token = $token;
@@ -34,7 +31,6 @@ class ResetPasswordObject
 
     public function build()
     {
-
         App::forgetInstance('translator');
         /* Init a new copy of the translator*/
         $t = app('translator');
@@ -61,4 +57,4 @@ class ResetPasswordObject
 
         return $mail_obj;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Mail/Admin/VerifyUserObject.php b/app/Mail/Admin/VerifyUserObject.php
index 34ba2ad84b1c..8804e012a635 100644
--- a/app/Mail/Admin/VerifyUserObject.php
+++ b/app/Mail/Admin/VerifyUserObject.php
@@ -17,25 +17,20 @@ use Illuminate\Support\Facades\App;
 
 class VerifyUserObject
 {
-
     use MakesHash;
 
     public $user;
 
     public $company;
 
-    /**
-     *
-     */
     public function __construct($user, $company)
     {
         $this->user = $user;
-    	$this->company = $company;
+        $this->company = $company;
     }
 
     public function build()
     {
-
         App::forgetInstance('translator');
         /* Init a new copy of the translator*/
         $t = app('translator');
@@ -44,8 +39,8 @@ class VerifyUserObject
         /* Set customized translations _NOW_ */
         $t->replace(Ninja::transformTranslations($this->company->settings));
 
-    	$this->user->confirmation_code = $this->createDbHash($this->company->db);
-    	$this->user->save();
+        $this->user->confirmation_code = $this->createDbHash($this->company->db);
+        $this->user->save();
 
         $data = [
             'title' => ctrans('texts.confirmation_subject'),
@@ -54,17 +49,16 @@ class VerifyUserObject
             'button' => ctrans('texts.button_confirmation_message'),
             'settings' => $this->company->settings,
             'logo' => $this->company->present()->logo(),
-			'signature' => $this->company->settings->email_signature,
+            'signature' => $this->company->settings->email_signature,
         ];
 
-
         $mail_obj = new \stdClass;
         $mail_obj->subject = ctrans('texts.confirmation_subject');
         $mail_obj->data = $data;
         $mail_obj->markdown = 'email.admin.generic';
         $mail_obj->tag = $this->company->company_key;
         $mail_obj->text_view = 'email.admin.verify_user_text';
-        
+
         return $mail_obj;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Mail/BouncedEmail.php b/app/Mail/BouncedEmail.php
index 75e152d1cbdc..8189f22f69ce 100644
--- a/app/Mail/BouncedEmail.php
+++ b/app/Mail/BouncedEmail.php
@@ -18,9 +18,8 @@ use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\App;
 
-class BouncedEmail extends Mailable 
+class BouncedEmail extends Mailable
 {
-
     public $invitation;
 
     public function __construct($invitation)
@@ -40,12 +39,10 @@ class BouncedEmail extends Mailable
         $entity_type = class_basename(lcfirst($this->invitation->getEntityType()));
 
         $subject = ctrans("texts.notification_{$entity_type}_bounced_subject", ['invoice' => $this->invitation->invoice->number]);
-        
+
         return
             $this->from(config('mail.from.address'), config('mail.from.name'))
                 ->text('bounced mail')
                 ->subject($subject);
-
     }
-    
 }
diff --git a/app/Mail/ClientContact/ClientContactResetPasswordObject.php b/app/Mail/ClientContact/ClientContactResetPasswordObject.php
index 677adf628c87..52562bd820c0 100644
--- a/app/Mail/ClientContact/ClientContactResetPasswordObject.php
+++ b/app/Mail/ClientContact/ClientContactResetPasswordObject.php
@@ -16,16 +16,12 @@ use Illuminate\Support\Facades\App;
 
 class ClientContactResetPasswordObject
 {
-
     public $client_contact;
 
     public $token;
 
     private $company;
-    
-    /**
-     *
-     */
+
     public function __construct($token, $client_contact)
     {
         $this->token = $token;
@@ -35,7 +31,6 @@ class ClientContactResetPasswordObject
 
     public function build()
     {
-
         $settings = $this->client_contact->client->getMergedSettings();
         App::forgetInstance('translator');
         $t = app('translator');
@@ -55,10 +50,11 @@ class ClientContactResetPasswordObject
 
         $email_from_name = config('mail.from.name');
 
-        if(property_exists($settings, 'email_from_name') && strlen($settings->email_from_name) > 1)
+        if (property_exists($settings, 'email_from_name') && strlen($settings->email_from_name) > 1) {
             $email_from_name = $settings->email_from_name;
-        else
+        } else {
             $email_from_name = $this->company->present()->name();
+        }
 
         $mail_obj = new \stdClass;
         $mail_obj->subject = ctrans('texts.your_password_reset_link');
diff --git a/app/Mail/Company/CompanyDeleted.php b/app/Mail/Company/CompanyDeleted.php
index 5a536f6e0cbb..0ddb15b12013 100644
--- a/app/Mail/Company/CompanyDeleted.php
+++ b/app/Mail/Company/CompanyDeleted.php
@@ -29,6 +29,7 @@ class CompanyDeleted extends Mailable
     public $user;
 
     public $settings;
+
     /**
      * Create a new message instance.
      *
diff --git a/app/Mail/ContactPasswordlessLogin.php b/app/Mail/ContactPasswordlessLogin.php
index 489269553a97..9bbfd100532f 100644
--- a/app/Mail/ContactPasswordlessLogin.php
+++ b/app/Mail/ContactPasswordlessLogin.php
@@ -53,7 +53,6 @@ class ContactPasswordlessLogin extends Mailable
      */
     public function build()
     {
-        
         App::setLocale($this->company->getLocale());
 
         return $this
diff --git a/app/Mail/DownloadBackup.php b/app/Mail/DownloadBackup.php
index a5156976b176..82f7ff476b44 100644
--- a/app/Mail/DownloadBackup.php
+++ b/app/Mail/DownloadBackup.php
@@ -20,7 +20,6 @@ use Illuminate\Support\Facades\App;
 
 class DownloadBackup extends Mailable
 {
-
     public $file_path;
 
     public $company;
@@ -38,13 +37,13 @@ class DownloadBackup extends Mailable
     public function build()
     {
         App::setLocale($this->company->getLocale());
-        
+
         $company = Company::where('company_key', $this->company->company_key)->first();
 
         return $this->from(config('mail.from.address'), config('mail.from.name'))
             ->subject(ctrans('texts.download_backup_subject', ['company' => $company->present()->name()]))
-            ->text('email.admin.download_files_text',[
-               'url' => $this->file_path,
+            ->text('email.admin.download_files_text', [
+                'url' => $this->file_path,
             ])
             ->view('email.admin.download_files', [
                 'url' => $this->file_path,
diff --git a/app/Mail/DownloadCredits.php b/app/Mail/DownloadCredits.php
index c0904045c707..49fc2684cc77 100644
--- a/app/Mail/DownloadCredits.php
+++ b/app/Mail/DownloadCredits.php
@@ -37,7 +37,6 @@ class DownloadCredits extends Mailable
      */
     public function build()
     {
-
         App::setLocale($this->company->getLocale());
 
         return $this->from(config('mail.from.address'), config('mail.from.name'))
diff --git a/app/Mail/DownloadDocuments.php b/app/Mail/DownloadDocuments.php
index 6443a30636fe..5fa890d7db70 100644
--- a/app/Mail/DownloadDocuments.php
+++ b/app/Mail/DownloadDocuments.php
@@ -37,7 +37,6 @@ class DownloadDocuments extends Mailable
      */
     public function build()
     {
-
         App::setLocale($this->company->getLocale());
 
         return $this->from(config('mail.from.address'), config('mail.from.name'))
diff --git a/app/Mail/DownloadInvoices.php b/app/Mail/DownloadInvoices.php
index adc98d373c79..179b44e52f59 100644
--- a/app/Mail/DownloadInvoices.php
+++ b/app/Mail/DownloadInvoices.php
@@ -37,7 +37,6 @@ class DownloadInvoices extends Mailable
      */
     public function build()
     {
-
         App::setLocale($this->company->getLocale());
 
         return $this->from(config('mail.from.address'), config('mail.from.name'))
diff --git a/app/Mail/DownloadPurchaseOrders.php b/app/Mail/DownloadPurchaseOrders.php
index 27fcd51a7bff..ad0b73b3b5fb 100644
--- a/app/Mail/DownloadPurchaseOrders.php
+++ b/app/Mail/DownloadPurchaseOrders.php
@@ -37,7 +37,6 @@ class DownloadPurchaseOrders extends Mailable
      */
     public function build()
     {
-
         App::setLocale($this->company->getLocale());
 
         return $this->from(config('mail.from.address'), config('mail.from.name'))
diff --git a/app/Mail/DownloadQuotes.php b/app/Mail/DownloadQuotes.php
index 4c971c7213d1..9739640a9fdd 100644
--- a/app/Mail/DownloadQuotes.php
+++ b/app/Mail/DownloadQuotes.php
@@ -37,7 +37,6 @@ class DownloadQuotes extends Mailable
      */
     public function build()
     {
-
         App::setLocale($this->company->getLocale());
 
         return $this->from(config('mail.from.address'), config('mail.from.name'))
diff --git a/app/Mail/DownloadReport.php b/app/Mail/DownloadReport.php
index 0037b6b498f9..8743b0713702 100644
--- a/app/Mail/DownloadReport.php
+++ b/app/Mail/DownloadReport.php
@@ -8,6 +8,7 @@
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace App\Mail;
 
 use App\Models\Company;
@@ -22,7 +23,9 @@ class DownloadReport extends Mailable
     use Queueable, SerializesModels;
 
     protected Company $company;
+
     protected $csv;
+
     protected string $file_name;
 
     /**
diff --git a/app/Mail/Engine/BaseEmailEngine.php b/app/Mail/Engine/BaseEmailEngine.php
index df0dd8110e9a..02d19395e965 100644
--- a/app/Mail/Engine/BaseEmailEngine.php
+++ b/app/Mail/Engine/BaseEmailEngine.php
@@ -32,7 +32,7 @@ class BaseEmailEngine implements EngineInterface
     public $text;
 
     public $invitation;
-    
+
     public $text_body;
 
     public $text_footer;
@@ -68,7 +68,7 @@ class BaseEmailEngine implements EngineInterface
 
         return $this;
     }
-    
+
     public function setBody($body)
     {
         if (! empty($this->variables)) {
@@ -80,7 +80,7 @@ class BaseEmailEngine implements EngineInterface
 
         return $this;
     }
-    
+
     public function setTemplate($template_style)
     {
         $this->template_style = $template_style;
@@ -94,21 +94,21 @@ class BaseEmailEngine implements EngineInterface
 
         return $this;
     }
-    
+
     public function setViewLink($link)
     {
         $this->link = $link;
 
         return $this;
     }
-    
+
     public function setViewText($text)
     {
         $this->text = $text;
 
         return $this;
     }
-    
+
     public function setTextBody($text)
     {
         $this->text_body = $text;
@@ -120,7 +120,7 @@ class BaseEmailEngine implements EngineInterface
     {
         return $this->subject;
     }
-    
+
     public function getBody()
     {
         return $this->body;
@@ -130,12 +130,12 @@ class BaseEmailEngine implements EngineInterface
     {
         return $this->attachments;
     }
-    
+
     public function getFooter()
     {
         return $this->footer;
     }
-    
+
     public function getTemplate()
     {
         return $this->template_style;
@@ -145,13 +145,12 @@ class BaseEmailEngine implements EngineInterface
     {
         return $this->link;
     }
-    
 
     public function getViewText()
     {
         return $this->text;
     }
-    
+
     public function build()
     {
     }
@@ -192,4 +191,3 @@ class BaseEmailEngine implements EngineInterface
         return str_replace($find, $replace, $content);
     }
 }
-
diff --git a/app/Mail/Engine/CreditEmailEngine.php b/app/Mail/Engine/CreditEmailEngine.php
index ec7b18f032bc..12a12e600d88 100644
--- a/app/Mail/Engine/CreditEmailEngine.php
+++ b/app/Mail/Engine/CreditEmailEngine.php
@@ -45,14 +45,15 @@ class CreditEmailEngine extends BaseEmailEngine
     public function build()
     {
         App::forgetInstance('translator');
-        
+
         $t = app('translator');
         $t->replace(Ninja::transformTranslations($this->client->getMergedSettings()));
-        
-        if($this->reminder_template == 'endless_reminder')
+
+        if ($this->reminder_template == 'endless_reminder') {
             $this->reminder_template = 'reminder_endless';
-        
-        if (is_array($this->template_data) &&  array_key_exists('body', $this->template_data) && strlen($this->template_data['body']) > 0) {
+        }
+
+        if (is_array($this->template_data) && array_key_exists('body', $this->template_data) && strlen($this->template_data['body']) > 0) {
             $body_template = $this->template_data['body'];
         } else {
             $body_template = $this->client->getSetting('email_template_'.$this->reminder_template);
@@ -72,10 +73,9 @@ class CreditEmailEngine extends BaseEmailEngine
             );
 
             $body_template .= '<div class="center">$view_button</div>';
-
         }
 
-        if (is_array($this->template_data) &&  array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) {
+        if (is_array($this->template_data) && array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) {
             $subject_template = $this->template_data['subject'];
         } else {
             $subject_template = $this->client->getSetting('email_subject_'.$this->reminder_template);
@@ -103,7 +103,7 @@ class CreditEmailEngine extends BaseEmailEngine
                 null,
                 $this->client->locale()
 
-            ) . "\n\n" . $this->invitation->getLink();
+            )."\n\n".$this->invitation->getLink();
 
         $this->setTemplate($this->client->getSetting('email_style'))
             ->setContact($this->contact)
@@ -117,26 +117,24 @@ class CreditEmailEngine extends BaseEmailEngine
             ->setTextBody($text_body);
 
         if ($this->client->getSetting('pdf_email_attachment') !== false && $this->credit->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) {
-
-            if(Ninja::isHosted())
+            if (Ninja::isHosted()) {
                 $this->setAttachments([$this->credit->pdf_file_path($this->invitation, 'url', true)]);
-            else
+            } else {
                 $this->setAttachments([$this->credit->pdf_file_path($this->invitation)]);
-            
+            }
         }
 
         //attach third party documents
-        if($this->client->getSetting('document_email_attachment') !== false && $this->credit->company->account->hasFeature(Account::FEATURE_DOCUMENTS)){
+        if ($this->client->getSetting('document_email_attachment') !== false && $this->credit->company->account->hasFeature(Account::FEATURE_DOCUMENTS)) {
 
             // Storage::url
-            foreach($this->credit->documents as $document){
-                $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => $document->type]]);
+            foreach ($this->credit->documents as $document) {
+                $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => null]]);
             }
 
-            foreach($this->credit->company->documents as $document){
-                $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => $document->type]]);
+            foreach ($this->credit->company->documents as $document) {
+                $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => null]]);
             }
-
         }
 
         return $this;
diff --git a/app/Mail/Engine/EngineInterface.php b/app/Mail/Engine/EngineInterface.php
index 3840eb893ce9..e8dcfb0ebf81 100644
--- a/app/Mail/Engine/EngineInterface.php
+++ b/app/Mail/Engine/EngineInterface.php
@@ -30,9 +30,9 @@ interface EngineInterface
     public function setViewLink($link);
 
     public function setViewText($text);
-    
+
     public function getSubject();
-    
+
     public function getBody();
 
     public function getAttachments();
@@ -48,5 +48,4 @@ interface EngineInterface
     public function build();
 
     public function getTextBody();
-
 }
diff --git a/app/Mail/Engine/InvoiceEmailEngine.php b/app/Mail/Engine/InvoiceEmailEngine.php
index 8ac9f89472bb..66007e9f4ed5 100644
--- a/app/Mail/Engine/InvoiceEmailEngine.php
+++ b/app/Mail/Engine/InvoiceEmailEngine.php
@@ -51,15 +51,15 @@ class InvoiceEmailEngine extends BaseEmailEngine
 
     public function build()
     {
-
         App::forgetInstance('translator');
         $t = app('translator');
         $t->replace(Ninja::transformTranslations($this->client->getMergedSettings()));
 
-        if($this->reminder_template == 'endless_reminder')
+        if ($this->reminder_template == 'endless_reminder') {
             $this->reminder_template = 'reminder_endless';
+        }
 
-        if (is_array($this->template_data) &&  array_key_exists('body', $this->template_data) && strlen($this->template_data['body']) > 0) {
+        if (is_array($this->template_data) && array_key_exists('body', $this->template_data) && strlen($this->template_data['body']) > 0) {
             $body_template = $this->template_data['body'];
         } elseif (strlen($this->client->getSetting('email_template_'.$this->reminder_template)) > 0) {
             $body_template = $this->client->getSetting('email_template_'.$this->reminder_template);
@@ -81,7 +81,6 @@ class InvoiceEmailEngine extends BaseEmailEngine
             );
 
             $body_template .= '<div class="center">$view_button</div>';
-
         }
 
         $text_body = trans(
@@ -93,16 +92,16 @@ class InvoiceEmailEngine extends BaseEmailEngine
                 ],
                 null,
                 $this->client->locale()
-            ) . "\n\n" . $this->invitation->getLink();
+            )."\n\n".$this->invitation->getLink();
 
-        if (is_array($this->template_data) &&  array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) {
+        if (is_array($this->template_data) && array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) {
             $subject_template = $this->template_data['subject'];
-            nlog("subject = template data");
+            nlog('subject = template data');
         } elseif (strlen($this->client->getSetting('email_subject_'.$this->reminder_template)) > 0) {
             $subject_template = $this->client->getSetting('email_subject_'.$this->reminder_template);
-            nlog("subject = settings var");
+            nlog('subject = settings var');
         } else {
-            nlog("subject = default template " . 'email_subject_'.$this->reminder_template);
+            nlog('subject = default template '.'email_subject_'.$this->reminder_template);
             $subject_template = EmailTemplateDefaults::getDefaultTemplate('email_subject_'.$this->reminder_template, $this->client->locale());
             // $subject_template = $this->client->getSetting('email_subject_'.$this->reminder_template);
         }
@@ -131,80 +130,63 @@ class InvoiceEmailEngine extends BaseEmailEngine
             ->setTextBody($text_body);
 
         if ($this->client->getSetting('pdf_email_attachment') !== false && $this->invoice->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) {
-
-            if(Ninja::isHosted())
+            if (Ninja::isHosted()) {
                 $this->setAttachments([$this->invoice->pdf_file_path($this->invitation, 'url', true)]);
-            else
+            } else {
                 $this->setAttachments([$this->invoice->pdf_file_path($this->invitation)]);
-
+            }
         }
 
         //attach third party documents
-        if($this->client->getSetting('document_email_attachment') !== false && $this->invoice->company->account->hasFeature(Account::FEATURE_DOCUMENTS)){
+        if ($this->client->getSetting('document_email_attachment') !== false && $this->invoice->company->account->hasFeature(Account::FEATURE_DOCUMENTS)) {
 
             // Storage::url
-            foreach($this->invoice->documents as $document){
-                $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => $document->type]]);
+            foreach ($this->invoice->documents as $document) {
+                $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => NULL]]);
             }
 
-            foreach($this->invoice->company->documents as $document){
-                $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => $document->type]]);
+            foreach ($this->invoice->company->documents as $document) {
+                $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => NULL]]);
             }
 
             $line_items = $this->invoice->line_items;
-            
-
-            foreach($line_items as $item)
-            {
 
+            foreach ($line_items as $item) {
                 $expense_ids = [];
 
-                if(property_exists($item, 'expense_id'))
-                {
+                if (property_exists($item, 'expense_id')) {
                     $expense_ids[] = $item->expense_id;
                 }
 
-                if(count($expense_ids) > 0){
-
+                if (count($expense_ids) > 0) {
                     $expenses = Expense::whereIn('id', $this->transformKeys($expense_ids))
                                        ->where('invoice_documents', 1)
                                        ->cursor()
-                                       ->each(function ($expense){
-
-                                            foreach($expense->documents as $document)
-                                            {
-                                                $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => $document->type]]);
-                                            }
-
+                                       ->each(function ($expense) {
+                                           foreach ($expense->documents as $document) {
+                                               $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => NULL]]);
+                                           }
                                        });
                 }
 
                 $task_ids = [];
 
-                if(property_exists($item, 'task_id'))
-                {
+                if (property_exists($item, 'task_id')) {
                     $task_ids[] = $item->task_id;
                 }
 
-                if(count($task_ids) > 0 && $this->invoice->company->invoice_task_documents){
-                    
+                if (count($task_ids) > 0 && $this->invoice->company->invoice_task_documents) {
                     $tasks = Task::whereIn('id', $this->transformKeys($task_ids))
                                        ->cursor()
-                                       ->each(function ($task){
-
-                                            foreach($task->documents as $document)
-                                            {
-                                                $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => $document->type]]);
-                                            }
-
+                                       ->each(function ($task) {
+                                           foreach ($task->documents as $document) {
+                                               $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => NULL]]);
+                                           }
                                        });
                 }
-
             }
-
-
         }
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php
index 37228a9f2e50..5c617935b87c 100644
--- a/app/Mail/Engine/PaymentEmailEngine.php
+++ b/app/Mail/Engine/PaymentEmailEngine.php
@@ -62,7 +62,7 @@ class PaymentEmailEngine extends BaseEmailEngine
 
         $this->resolvePaymentTemplate();
 
-        if (is_array($this->template_data) &&  array_key_exists('body', $this->template_data) && strlen($this->template_data['body']) > 0) {
+        if (is_array($this->template_data) && array_key_exists('body', $this->template_data) && strlen($this->template_data['body']) > 0) {
             $body_template = $this->template_data['body'];
         } elseif (strlen($this->client->getSetting($this->payment_template_body)) > 0) {
             $body_template = $this->client->getSetting($this->payment_template_body);
@@ -70,7 +70,7 @@ class PaymentEmailEngine extends BaseEmailEngine
             $body_template = EmailTemplateDefaults::getDefaultTemplate($this->payment_template_body, $this->client->locale());
         }
 
-        if (is_array($this->template_data) &&  array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) {
+        if (is_array($this->template_data) && array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) {
             $subject_template = $this->template_data['subject'];
         } elseif (strlen($this->client->getSetting($this->payment_template_subject)) > 0) {
             $subject_template = $this->client->getSetting($this->payment_template_subject);
@@ -88,16 +88,13 @@ class PaymentEmailEngine extends BaseEmailEngine
             ->setViewText('');
 
         if ($this->client->getSetting('pdf_email_attachment') !== false && $this->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) {
-
-            $this->payment->invoices->each(function ($invoice){
-                
-                if(Ninja::isHosted())
+            $this->payment->invoices->each(function ($invoice) {
+                if (Ninja::isHosted()) {
                     $this->setAttachments([$invoice->pdf_file_path($invoice->invitations->first(), 'url', true)]);
-                else
+                } else {
                     $this->setAttachments([$invoice->pdf_file_path($invoice->invitations->first())]);
-
+                }
             });
-
         }
 
         return $this;
@@ -107,36 +104,30 @@ class PaymentEmailEngine extends BaseEmailEngine
      * Helper method to resolve which payment template
      * to use. We need to check the invoice balances to
      * determine if this is a partial payment, or full payment.
-     *     
+     *
      * @return $this
      */
-    private function resolvePaymentTemplate() 
+    private function resolvePaymentTemplate()
     {
-
-        $partial = $this->payment->invoices->contains(function ($invoice){
-
+        $partial = $this->payment->invoices->contains(function ($invoice) {
             return $invoice->balance > 0;
-
         });
 
-        if($partial){
-            $this->payment_template_body = "email_template_payment_partial";
-            $this->payment_template_subject = "email_subject_payment_partial";
-        }
-        else {
-            $this->payment_template_body = "email_template_payment";
-            $this->payment_template_subject = "email_subject_payment";
+        if ($partial) {
+            $this->payment_template_body = 'email_template_payment_partial';
+            $this->payment_template_subject = 'email_subject_payment_partial';
+        } else {
+            $this->payment_template_body = 'email_template_payment';
+            $this->payment_template_subject = 'email_subject_payment';
         }
 
         return $this;
     }
 
-
     public function makePaymentVariables()
     {
         $data = [];
 
-
         $data['$from'] = ['value' => '', 'label' => ctrans('texts.from')];
         $data['$to'] = ['value' => '', 'label' => ctrans('texts.to')];
         $data['$number'] = ['value' => $this->payment->number ?: '&nbsp;', 'label' => ctrans('texts.payment_number')];
@@ -193,7 +184,7 @@ class PaymentEmailEngine extends BaseEmailEngine
 
         $data['$contact.full_name'] = ['value' => isset($this->contact) ? $this->contact->present()->name() : '', 'label' => ctrans('texts.name')];
         $data['$contact.email'] = ['value' => isset($this->contact) ? $this->contact->email : '', 'label' => ctrans('texts.email')];
-        $data['$contact.phone'] = ['value' => isset($this->contact) ? $this->contact->phone: '', 'label' => ctrans('texts.phone')];
+        $data['$contact.phone'] = ['value' => isset($this->contact) ? $this->contact->phone : '', 'label' => ctrans('texts.phone')];
 
         $data['$contact.name'] = ['value' => isset($this->contact) ? $this->contact->present()->name() : 'no contact name on record', 'label' => ctrans('texts.contact_name')];
         $data['$contact.first_name'] = ['value' => isset($this->contact) ? $this->contact->first_name : '', 'label' => ctrans('texts.first_name')];
@@ -233,7 +224,7 @@ class PaymentEmailEngine extends BaseEmailEngine
         $data['$view_button'] = &$data['$view_link'];
         $data['$viewLink'] = &$data['$view_link'];
         $data['$paymentLink'] = &$data['$view_link'];
-        $data['$portalButton'] = ['value' => "<a href='{$this->payment->getPortalLink()}'>".ctrans('texts.login')."</a>", 'label' =>''];
+        $data['$portalButton'] = ['value' => "<a href='{$this->payment->getPortalLink()}'>".ctrans('texts.login').'</a>', 'label' =>''];
         $data['$portal_url'] = &$data['$portalButton'];
 
         $data['$view_url'] = ['value' => $this->payment->getLink(), 'label' => ctrans('texts.view_payment')];
@@ -249,7 +240,7 @@ class PaymentEmailEngine extends BaseEmailEngine
 
         $arrKeysLength = array_map('strlen', array_keys($data));
         array_multisort($arrKeysLength, SORT_DESC, $data);
-        
+
         return $data;
     }
 
@@ -257,8 +248,9 @@ class PaymentEmailEngine extends BaseEmailEngine
     {
         $invoice = '';
 
-        if($this->payment->invoices()->exists())
-            $invoice = ctrans('texts.invoice_number_short') . implode(",", $this->payment->invoices->pluck('number')->toArray());
+        if ($this->payment->invoices()->exists()) {
+            $invoice = ctrans('texts.invoice_number_short').implode(',', $this->payment->invoices->pluck('number')->toArray());
+        }
 
         return $invoice;
     }
@@ -267,8 +259,9 @@ class PaymentEmailEngine extends BaseEmailEngine
     {
         $invoice = '';
 
-        if($this->payment->invoices()->exists())
-            $invoice = ctrans('texts.po_number_short') . implode(",", $this->payment->invoices->pluck('po_number')->toArray());
+        if ($this->payment->invoices()->exists()) {
+            $invoice = ctrans('texts.po_number_short').implode(',', $this->payment->invoices->pluck('po_number')->toArray());
+        }
 
         return $invoice;
     }
@@ -278,7 +271,7 @@ class PaymentEmailEngine extends BaseEmailEngine
         $invoice_list = '<br><br>';
 
         foreach ($this->payment->invoices as $invoice) {
-            $invoice_list .= ctrans('texts.invoice_number_short') . " {$invoice->number} - " . Number::formatMoney($invoice->pivot->amount, $this->client) . "<br>";
+            $invoice_list .= ctrans('texts.invoice_number_short')." {$invoice->number} - ".Number::formatMoney($invoice->pivot->amount, $this->client).'<br>';
         }
 
         return $invoice_list;
@@ -286,21 +279,17 @@ class PaymentEmailEngine extends BaseEmailEngine
 
     private function formatInvoiceReferences()
     {
-
         $invoice_list = '<br><br>';
 
         foreach ($this->payment->invoices as $invoice) {
-            
-            $invoice_list .= ctrans('texts.po_number'). " {$invoice->po_number} <br>";
-            $invoice_list .= ctrans('texts.invoice_number_short') . " {$invoice->number} <br>";
-            $invoice_list .= ctrans('texts.invoice_amount') ." ". Number::formatMoney($invoice->pivot->amount, $this->client) . "<br>";
-            $invoice_list .= ctrans('texts.invoice_balance') ." ". Number::formatMoney($invoice->fresh()->balance, $this->client) . "<br>";
-            $invoice_list .= "-----<br>";
-
+            $invoice_list .= ctrans('texts.po_number')." {$invoice->po_number} <br>";
+            $invoice_list .= ctrans('texts.invoice_number_short')." {$invoice->number} <br>";
+            $invoice_list .= ctrans('texts.invoice_amount').' '.Number::formatMoney($invoice->pivot->amount, $this->client).'<br>';
+            $invoice_list .= ctrans('texts.invoice_balance').' '.Number::formatMoney($invoice->fresh()->balance, $this->client).'<br>';
+            $invoice_list .= '-----<br>';
         }
 
         return $invoice_list;
-
     }
 
     public function makeValues() :array
diff --git a/app/Mail/Engine/PurchaseOrderEmailEngine.php b/app/Mail/Engine/PurchaseOrderEmailEngine.php
index d3b2fcbad5bd..fa6477c38c34 100644
--- a/app/Mail/Engine/PurchaseOrderEmailEngine.php
+++ b/app/Mail/Engine/PurchaseOrderEmailEngine.php
@@ -55,12 +55,11 @@ class PurchaseOrderEmailEngine extends BaseEmailEngine
 
     public function build()
     {
-
         App::forgetInstance('translator');
         $t = app('translator');
         $t->replace(Ninja::transformTranslations($this->vendor->company->settings));
 
-        if (is_array($this->template_data) &&  array_key_exists('body', $this->template_data) && strlen($this->template_data['body']) > 0) {
+        if (is_array($this->template_data) && array_key_exists('body', $this->template_data) && strlen($this->template_data['body']) > 0) {
             $body_template = $this->template_data['body'];
         } elseif (strlen($this->vendor->getSetting('email_template_'.$this->reminder_template)) > 0) {
             $body_template = $this->vendor->getSetting('email_template_'.$this->reminder_template);
@@ -82,7 +81,6 @@ class PurchaseOrderEmailEngine extends BaseEmailEngine
             );
 
             $body_template .= '<div class="center">$view_button</div>';
-
         }
         $text_body = trans(
                 'texts.purchase_order_message',
@@ -93,15 +91,14 @@ class PurchaseOrderEmailEngine extends BaseEmailEngine
                 ],
                 null,
                 $this->vendor->company->locale()
-            ) . "\n\n" . $this->invitation->getLink();
+            )."\n\n".$this->invitation->getLink();
 
-        if (is_array($this->template_data) &&  array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) {
+        if (is_array($this->template_data) && array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) {
             $subject_template = $this->template_data['subject'];
         } elseif (strlen($this->vendor->getSetting('email_subject_'.$this->reminder_template)) > 0) {
             $subject_template = $this->vendor->getSetting('email_subject_'.$this->reminder_template);
         } else {
             $subject_template = EmailTemplateDefaults::getDefaultTemplate('email_subject_'.$this->reminder_template, $this->vendor->company->locale());
-
         }
 
         if (iconv_strlen($subject_template) == 0) {
@@ -128,80 +125,27 @@ class PurchaseOrderEmailEngine extends BaseEmailEngine
             ->setTextBody($text_body);
 
         if ($this->vendor->getSetting('pdf_email_attachment') !== false && $this->purchase_order->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) {
-
-            if(Ninja::isHosted())
+            if (Ninja::isHosted()) {
                 $this->setAttachments([$this->purchase_order->pdf_file_path($this->invitation, 'url', true)]);
-            else
+            } else {
                 $this->setAttachments([$this->purchase_order->pdf_file_path($this->invitation)]);
-
+            }
         }
 
         //attach third party documents
-        if($this->vendor->getSetting('document_email_attachment') !== false && $this->purchase_order->company->account->hasFeature(Account::FEATURE_DOCUMENTS)){
+        if ($this->vendor->getSetting('document_email_attachment') !== false && $this->purchase_order->company->account->hasFeature(Account::FEATURE_DOCUMENTS)) {
 
             // Storage::url
-            foreach($this->purchase_order->documents as $document){
-                $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => $document->type]]);
+            foreach ($this->purchase_order->documents as $document) {
+                $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => null]]);
             }
 
-            foreach($this->purchase_order->company->documents as $document){
-                $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => $document->type]]);
+            foreach ($this->purchase_order->company->documents as $document) {
+                $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => null]]);
             }
 
-            // $line_items = $this->purchase_order->line_items;
-            
-
-            // foreach($line_items as $item)
-            // {
-
-            //     $expense_ids = [];
-
-            //     if(property_exists($item, 'expense_id'))
-            //     {
-            //         $expense_ids[] = $item->expense_id;
-            //     }
-
-            //     if(count($expense_ids) > 0){
-
-            //         $expenses = Expense::whereIn('id', $this->transformKeys($expense_ids))
-            //                            ->where('invoice_documents', 1)
-            //                            ->cursor()
-            //                            ->each(function ($expense){
-
-            //                                 foreach($expense->documents as $document)
-            //                                 {
-            //                                     $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => $document->type]]);
-            //                                 }
-
-            //                            });
-            //     }
-
-            //     $task_ids = [];
-
-            //     if(property_exists($item, 'task_id'))
-            //     {
-            //         $task_ids[] = $item->task_id;
-            //     }
-
-            //     if(count($task_ids) > 0 && $this->purchase_order->company->purchase_order_task_documents){
-                    
-            //         $tasks = Task::whereIn('id', $this->transformKeys($task_ids))
-            //                            ->cursor()
-            //                            ->each(function ($task){
-
-            //                                 foreach($task->documents as $document)
-            //                                 {
-            //                                     $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => $document->type]]);
-            //                                 }
-
-            //                            });
-            //     }
-
-            // }
-
-
         }
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Mail/Engine/QuoteEmailEngine.php b/app/Mail/Engine/QuoteEmailEngine.php
index c005557ff50a..8b692c2f3e5d 100644
--- a/app/Mail/Engine/QuoteEmailEngine.php
+++ b/app/Mail/Engine/QuoteEmailEngine.php
@@ -44,15 +44,15 @@ class QuoteEmailEngine extends BaseEmailEngine
 
     public function build()
     {
-
         App::forgetInstance('translator');
         $t = app('translator');
         $t->replace(Ninja::transformTranslations($this->client->getMergedSettings()));
 
-        if($this->reminder_template == 'endless_reminder')
-            $this->reminder_template = 'reminder_endless';        
-        
-        if (is_array($this->template_data) &&  array_key_exists('body', $this->template_data) && strlen($this->template_data['body']) > 0) {
+        if ($this->reminder_template == 'endless_reminder') {
+            $this->reminder_template = 'reminder_endless';
+        }
+
+        if (is_array($this->template_data) && array_key_exists('body', $this->template_data) && strlen($this->template_data['body']) > 0) {
             $body_template = $this->template_data['body'];
         } else {
             $body_template = $this->client->getSetting('email_template_'.$this->reminder_template);
@@ -60,7 +60,6 @@ class QuoteEmailEngine extends BaseEmailEngine
 
         /* Use default translations if a custom message has not been set*/
         if (iconv_strlen($body_template) == 0) {
-
             $body_template = trans(
                 'texts.quote_message',
                 [
@@ -75,8 +74,7 @@ class QuoteEmailEngine extends BaseEmailEngine
             $body_template .= '<div class="center">$view_button</div>';
         }
 
-
-        if (is_array($this->template_data) &&  array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) {
+        if (is_array($this->template_data) && array_key_exists('subject', $this->template_data) && strlen($this->template_data['subject']) > 0) {
             $subject_template = $this->template_data['subject'];
         } else {
             $subject_template = $this->client->getSetting('email_subject_'.$this->reminder_template);
@@ -104,7 +102,7 @@ class QuoteEmailEngine extends BaseEmailEngine
                 null,
                 $this->client->locale()
 
-            ) . "\n\n" . $this->invitation->getLink();
+            )."\n\n".$this->invitation->getLink();
 
         $this->setTemplate($this->client->getSetting('email_style'))
             ->setContact($this->contact)
@@ -118,28 +116,26 @@ class QuoteEmailEngine extends BaseEmailEngine
             ->setTextBody($text_body);
 
         if ($this->client->getSetting('pdf_email_attachment') !== false && $this->quote->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) {
-
-            if(Ninja::isHosted())
+            if (Ninja::isHosted()) {
                 $this->setAttachments([$this->quote->pdf_file_path($this->invitation, 'url', true)]);
-            else
+            } else {
                 $this->setAttachments([$this->quote->pdf_file_path($this->invitation)]);
-
+            }
         }
 
         //attach third party documents
-        if($this->client->getSetting('document_email_attachment') !== false && $this->quote->company->account->hasFeature(Account::FEATURE_DOCUMENTS)){
+        if ($this->client->getSetting('document_email_attachment') !== false && $this->quote->company->account->hasFeature(Account::FEATURE_DOCUMENTS)) {
 
             // Storage::url
-            foreach($this->quote->documents as $document){
-                $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => $document->type]]);
+            foreach ($this->quote->documents as $document) {
+                $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => null]]);
             }
 
-            foreach($this->quote->company->documents as $document){
-                $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => $document->type]]);
+            foreach ($this->quote->company->documents as $document) {
+                $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => null]]);
             }
-
         }
-        
+
         return $this;
     }
 }
diff --git a/app/Mail/ExistingMigration.php b/app/Mail/ExistingMigration.php
index d03d4b4fc2bb..40cd325fcbfe 100644
--- a/app/Mail/ExistingMigration.php
+++ b/app/Mail/ExistingMigration.php
@@ -37,7 +37,7 @@ class ExistingMigration extends Mailable
     public function build()
     {
         App::setLocale($this->company->getLocale());
-        
+
         $this->settings = $this->company->settings;
         $this->logo = $this->company->present()->logo();
         $this->company_name = $this->company->present()->name();
diff --git a/app/Mail/Import/CompanyImportFailure.php b/app/Mail/Import/CompanyImportFailure.php
index 4de1089d9217..b53a1262f61a 100644
--- a/app/Mail/Import/CompanyImportFailure.php
+++ b/app/Mail/Import/CompanyImportFailure.php
@@ -33,7 +33,7 @@ class CompanyImportFailure extends Mailable
     public $whitelabel;
 
     public $user_message;
-    
+
     /**
      * Create a new message instance.
      *
diff --git a/app/Mail/Import/ImportCompleted.php b/app/Mail/Import/ImportCompleted.php
index fbf7234bbbbe..5f83b34a05ed 100644
--- a/app/Mail/Import/ImportCompleted.php
+++ b/app/Mail/Import/ImportCompleted.php
@@ -47,7 +47,6 @@ class ImportCompleted extends Mailable
      */
     public function build()
     {
-
         App::forgetInstance('translator');
         App::setLocale($this->company->getLocale());
 
diff --git a/app/Mail/MigrationCompleted.php b/app/Mail/MigrationCompleted.php
index 52aafec22291..d8dfb3ed8e50 100644
--- a/app/Mail/MigrationCompleted.php
+++ b/app/Mail/MigrationCompleted.php
@@ -35,18 +35,17 @@ class MigrationCompleted extends Mailable
      */
     public function build()
     {
-
         App::forgetInstance('translator');
         $t = app('translator');
         $t->replace(Ninja::transformTranslations($this->company->settings));
         App::setLocale($this->company->getLocale());
-        
+
         $data['settings'] = $this->company->settings;
         $data['company'] = $this->company->fresh();
         $data['whitelabel'] = $this->company->account->isPaid() ? true : false;
         $data['check_data'] = $this->check_data ?: '';
         $data['logo'] = $this->company->present()->logo();
-        
+
         $data = array_merge($data, [
             'logo' => $this->company->present()->logo(),
             'settings' => $this->company->settings,
diff --git a/app/Mail/MigrationFailed.php b/app/Mail/MigrationFailed.php
index b6a2337fe030..3932108ee4d8 100644
--- a/app/Mail/MigrationFailed.php
+++ b/app/Mail/MigrationFailed.php
@@ -37,7 +37,7 @@ class MigrationFailed extends Mailable
     public function build()
     {
         App::setLocale($this->company->getLocale());
-        
+
         return $this
             ->from(config('mail.from.address'), config('mail.from.name'))
             ->text('email.migration.failed_text')
diff --git a/app/Mail/Ninja/EmailQuotaExceeded.php b/app/Mail/Ninja/EmailQuotaExceeded.php
index e590a27a50d7..43cf875d11aa 100644
--- a/app/Mail/Ninja/EmailQuotaExceeded.php
+++ b/app/Mail/Ninja/EmailQuotaExceeded.php
@@ -18,7 +18,6 @@ use Illuminate\Support\Facades\App;
 
 class EmailQuotaExceeded extends Mailable
 {
-
     public $company;
 
     public $settings;
diff --git a/app/Mail/Ninja/GmailTokenInvalid.php b/app/Mail/Ninja/GmailTokenInvalid.php
index 77a8c1414bd6..2781105b7c95 100644
--- a/app/Mail/Ninja/GmailTokenInvalid.php
+++ b/app/Mail/Ninja/GmailTokenInvalid.php
@@ -18,7 +18,6 @@ use Illuminate\Support\Facades\App;
 
 class GmailTokenInvalid extends Mailable
 {
-
     public $company;
 
     public $settings;
diff --git a/app/Mail/RecurringInvoice/ClientContactRequestCancellationObject.php b/app/Mail/RecurringInvoice/ClientContactRequestCancellationObject.php
index f7d180ec108b..a0c5bdca62ad 100644
--- a/app/Mail/RecurringInvoice/ClientContactRequestCancellationObject.php
+++ b/app/Mail/RecurringInvoice/ClientContactRequestCancellationObject.php
@@ -16,16 +16,12 @@ use Illuminate\Support\Facades\App;
 
 class ClientContactRequestCancellationObject
 {
-
     public $recurring_invoice;
 
     public $client_contact;
 
     private $company;
 
-    /**
-     *
-     */
     public function __construct($recurring_invoice, $client_contact)
     {
         $this->recurring_invoice = $recurring_invoice;
@@ -35,7 +31,6 @@ class ClientContactRequestCancellationObject
 
     public function build()
     {
-
         App::forgetInstance('translator');
         App::setLocale($this->company->getLocale());
 
@@ -52,7 +47,6 @@ class ClientContactRequestCancellationObject
             'logo' => $this->company->present()->logo(),
         ];
 
-
         $mail_obj = new \stdClass;
         $mail_obj->subject = ctrans('texts.recurring_cancellation_request', ['contact' => $this->client_contact->present()->name()]);
         $mail_obj->data = $data;
@@ -62,4 +56,4 @@ class ClientContactRequestCancellationObject
 
         return $mail_obj;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Mail/SupportMessageSent.php b/app/Mail/SupportMessageSent.php
index 7332628533c2..9d91ba9fd06d 100644
--- a/app/Mail/SupportMessageSent.php
+++ b/app/Mail/SupportMessageSent.php
@@ -11,7 +11,7 @@ use SplFileObject;
 
 class SupportMessageSent extends Mailable
 {
- //   use Queueable, SerializesModels;
+    //   use Queueable, SerializesModels;
 
     public $data;
 
@@ -46,8 +46,8 @@ class SupportMessageSent extends Mailable
 
             $log_file->seek(PHP_INT_MAX);
             $last_line = $log_file->key();
-            
-            $lines = new LimitIterator($log_file, max(0,$last_line - 100), $last_line);
+
+            $lines = new LimitIterator($log_file, max(0, $last_line - 100), $last_line);
             $log_lines = iterator_to_array($lines);
         }
 
@@ -57,24 +57,26 @@ class SupportMessageSent extends Mailable
         $plan = $account->plan ?: 'customer support';
         $plan = ucfirst($plan);
 
-        if(strlen($account->plan) > 1)
+        if (strlen($account->plan) > 1) {
             $priority = '[PRIORITY] ';
+        }
 
         $company = auth()->user()->company();
         $user = auth()->user();
-        $db = str_replace("db-ninja-", "", $company->db);
-        $is_large = $company->is_large ? "L" : "S";
-        $platform = array_key_exists('platform', $this->data) ? $this->data['platform'] : "U";
-        $migrated = strlen($company->company_key) == 32 ? "M" : ""; 
-        $trial = $account->isTrial() ? "T" : "";
-        $plan = str_replace("_", " ", $plan);
-        
-        if(Ninja::isHosted())
-            $subject = "{$priority}Hosted-{$db}-{$is_large}{$platform}{$migrated}{$trial} :: {$plan} :: ".date('M jS, g:ia');
-        else
-            $subject = "{$priority}Self Hosted :: {$plan} :: {$is_large}{$platform}{$migrated} :: ".date('M jS, g:ia');
+        $db = str_replace('db-ninja-', '', $company->db);
+        $is_large = $company->is_large ? 'L' : 'S';
+        $platform = array_key_exists('platform', $this->data) ? $this->data['platform'] : 'U';
+        $migrated = strlen($company->company_key) == 32 ? 'M' : '';
+        $trial = $account->isTrial() ? 'T' : '';
+        $plan = str_replace('_', ' ', $plan);
 
-        return $this->from(config('mail.from.address'), $user->present()->name()) 
+        if (Ninja::isHosted()) {
+            $subject = "{$priority}Hosted-{$db}-{$is_large}{$platform}{$migrated}{$trial} :: {$plan} :: ".date('M jS, g:ia');
+        } else {
+            $subject = "{$priority}Self Hosted :: {$plan} :: {$is_large}{$platform}{$migrated} :: ".date('M jS, g:ia');
+        }
+
+        return $this->from(config('mail.from.address'), $user->present()->name())
                 ->replyTo($user->email, $user->present()->name())
                 ->subject($subject)
                 ->view('email.support.message', [
@@ -82,7 +84,7 @@ class SupportMessageSent extends Mailable
                     'system_info' => $system_info,
                     'laravel_log' => $log_lines,
                     'logo' => $company->present()->logo(),
-                    'settings' => $company->settings
+                    'settings' => $company->settings,
                 ]);
     }
 }
diff --git a/app/Mail/TemplateEmail.php b/app/Mail/TemplateEmail.php
index a8879c0511cd..941cbc8a9637 100644
--- a/app/Mail/TemplateEmail.php
+++ b/app/Mail/TemplateEmail.php
@@ -11,6 +11,7 @@
 
 namespace App\Mail;
 
+use App\Jobs\Entity\CreateEntityPdf;
 use App\Jobs\Invoice\CreateUbl;
 use App\Models\Account;
 use App\Models\Client;
@@ -23,10 +24,10 @@ use App\Utils\TemplateEngine;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Storage;
 
 class TemplateEmail extends Mailable
 {
-
     private $build_email;
 
     private $client;
@@ -52,14 +53,13 @@ class TemplateEmail extends Mailable
 
     public function build()
     {
-        
         $template_name = 'email.template.'.$this->build_email->getTemplate();
 
         if ($this->build_email->getTemplate() == 'light' || $this->build_email->getTemplate() == 'dark') {
             $template_name = 'email.template.client';
         }
 
-        if($this->build_email->getTemplate() == 'custom') {
+        if ($this->build_email->getTemplate() == 'custom') {
             $this->build_email->setBody(str_replace('$body', $this->build_email->getBody(), $this->client->getSetting('email_style_custom')));
         }
 
@@ -73,30 +73,28 @@ class TemplateEmail extends Mailable
 
         $company = $this->client->company;
 
-        if($this->invitation)
-        {
+        if ($this->invitation) {
             $html_variables = (new HtmlEngine($this->invitation))->makeValues();
             $signature = str_replace(array_keys($html_variables), array_values($html_variables), $settings->email_signature);
-        }
-        else
+        } else {
             $signature = $settings->email_signature;
+        }
 
-        if(property_exists($settings, 'email_from_name') && strlen($settings->email_from_name) > 1)
+        if (property_exists($settings, 'email_from_name') && strlen($settings->email_from_name) > 1) {
             $email_from_name = $settings->email_from_name;
-        else
+        } else {
             $email_from_name = $this->company->present()->name();
+        }
 
         $this->from(config('mail.from.address'), $email_from_name);
 
-        if (strlen($settings->bcc_email) > 1){
-
-            if(Ninja::isHosted()){
-                $bccs = explode(",",str_replace(" ", "", $settings->bcc_email));
-                $this->bcc(reset($bccs));//remove whitespace if any has been inserted.
-            }
-            else
-                $this->bcc(explode(",",str_replace(" ", "", $settings->bcc_email)));//remove whitespace if any has been inserted.
-
+        if (strlen($settings->bcc_email) > 1) {
+            if (Ninja::isHosted()) {
+                $bccs = explode(',', str_replace(' ', '', $settings->bcc_email));
+                $this->bcc(reset($bccs)); //remove whitespace if any has been inserted.
+            } else {
+                $this->bcc(explode(',', str_replace(' ', '', $settings->bcc_email)));
+            }//remove whitespace if any has been inserted.
         }
 
         $this->subject($this->build_email->getSubject())
@@ -118,31 +116,54 @@ class TemplateEmail extends Mailable
                 'whitelabel' => $this->client->user->account->isPaid() ? true : false,
                 'logo' => $this->company->present()->logo($settings),
             ])
-            ->withSwiftMessage(function ($message) use($company){
+            ->withSymfonyMessage(function ($message) use ($company) {
                 $message->getHeaders()->addTextHeader('Tag', $company->company_key);
                 $message->invitation = $this->invitation;
-            });
+            })
+            ->tag($company->company_key);
 
-            /*In the hosted platform we need to slow things down a little for Storage to catch up.*/
-            if(Ninja::isHosted())
-                sleep(1);
+        /*In the hosted platform we need to slow things down a little for Storage to catch up.*/
 
-            foreach ($this->build_email->getAttachments() as $file) {
+        if(Ninja::isHosted() && $this->invitation){
 
-                if(is_string($file))
-                    $this->attach($file);
-                elseif(is_array($file))
-                    $this->attach($file['path'], ['as' => $file['name'], 'mime' => $file['mime']]);
+            $path = false;
+
+            if($this->invitation->invoice)
+                $path = $this->client->invoice_filepath($this->invitation).$this->invitation->invoice->numberFormatter().'.pdf';
+            elseif($this->invitation->quote)
+                $path = $this->client->quote_filepath($this->invitation).$this->invitation->quote->numberFormatter().'.pdf';
+            elseif($this->invitation->credit)
+                $path = $this->client->credit_filepath($this->invitation).$this->invitation->credit->numberFormatter().'.pdf';
+
+            sleep(1);
+
+            if($path && !Storage::disk(config('filesystems.default'))->exists($path)){
+
+                sleep(2);
+
+                if(!Storage::disk(config('filesystems.default'))->exists($path)) {
+                    (new CreateEntityPdf($this->invitation))->handle();
+                    sleep(2);
+                }
 
             }
 
-        if($this->invitation && $this->invitation->invoice && $settings->ubl_email_attachment && $this->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)){
+        }
 
-            $ubl_string = CreateUbl::dispatchNow($this->invitation->invoice);
-            
-            if($ubl_string)
+        foreach ($this->build_email->getAttachments() as $file) {
+            if (is_string($file)) {
+                $this->attach($file);
+            } elseif (is_array($file)) {
+                $this->attach($file['path'], ['as' => $file['name'], 'mime' => null]);
+            }
+        }
+
+        if ($this->invitation && $this->invitation->invoice && $settings->ubl_email_attachment && $this->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) {
+            $ubl_string = (new CreateUbl($this->invitation->invoice))->handle();
+
+            if ($ubl_string) {
                 $this->attachData($ubl_string, $this->invitation->invoice->getFileName('xml'));
-            
+            }
         }
 
         return $this;
diff --git a/app/Mail/TestMailServer.php b/app/Mail/TestMailServer.php
index b20b19926a8f..93ff3b545ecd 100644
--- a/app/Mail/TestMailServer.php
+++ b/app/Mail/TestMailServer.php
@@ -17,7 +17,7 @@ use Illuminate\Queue\SerializesModels;
 
 class TestMailServer extends Mailable
 {
- //   use Queueable, SerializesModels;
+    //   use Queueable, SerializesModels;
 
     public $support_messages;
 
@@ -29,7 +29,6 @@ class TestMailServer extends Mailable
         $this->from_email = $from_email;
     }
 
-
     /**
      * Test Server mail.
      *
@@ -37,9 +36,8 @@ class TestMailServer extends Mailable
      */
     public function build()
     {
-
         $settings = new \stdClass;
-        $settings->primary_color = "#4caf50";
+        $settings->primary_color = '#4caf50';
         $settings->email_style = 'dark';
 
         return $this->from(config('mail.from.address'), config('mail.from.name'))
diff --git a/app/Mail/User/UserLoggedIn.php b/app/Mail/User/UserLoggedIn.php
index 530902018cf4..1c70a6899644 100644
--- a/app/Mail/User/UserLoggedIn.php
+++ b/app/Mail/User/UserLoggedIn.php
@@ -50,9 +50,9 @@ class UserLoggedIn extends Mailable
 
         return $this->from(config('mail.from.address'), config('mail.from.name'))
             ->subject(ctrans('texts.new_login_detected'))
-            ->text('email.admin.generic_text',[
+            ->text('email.admin.generic_text', [
                 'title' => ctrans('texts.new_login_detected'),
-                'body' => strip_tags(ctrans('texts.new_login_description', ['email' => $this->user->email, 'ip' => $this->ip, 'time' => now()]))
+                'body' => strip_tags(ctrans('texts.new_login_description', ['email' => $this->user->email, 'ip' => $this->ip, 'time' => now()])),
             ])
             ->view('email.admin.notification')
             ->with([
diff --git a/app/Mail/User/UserNotificationMailer.php b/app/Mail/User/UserNotificationMailer.php
index 39722440b565..6d04e0bf01b9 100644
--- a/app/Mail/User/UserNotificationMailer.php
+++ b/app/Mail/User/UserNotificationMailer.php
@@ -37,12 +37,12 @@ class UserNotificationMailer extends Mailable
     {
         return $this->from(config('mail.from.address'), config('mail.from.name'))
             ->subject($this->mail_obj->subject)
-            ->text('email.admin.generic_text',[
+            ->text('email.admin.generic_text', [
                 'title' => $this->mail_obj->data['title'],
                 'body' => $this->mail_obj->data['message'],
             ])
             ->view($this->mail_obj->markdown, $this->mail_obj->data)
-            ->withSwiftMessage(function ($message) {
+            ->withSymfonyMessage(function ($message) {
                 $message->getHeaders()->addTextHeader('Tag', $this->mail_obj->tag);
             });
     }
diff --git a/app/Mail/VendorTemplateEmail.php b/app/Mail/VendorTemplateEmail.php
index 2612f90c6209..94ff1319376d 100644
--- a/app/Mail/VendorTemplateEmail.php
+++ b/app/Mail/VendorTemplateEmail.php
@@ -12,6 +12,7 @@
 namespace App\Mail;
 
 use App\Jobs\Invoice\CreateUbl;
+use App\Jobs\Vendor\CreatePurchaseOrderPdf;
 use App\Models\Account;
 use App\Models\Client;
 use App\Models\User;
@@ -24,10 +25,10 @@ use App\Utils\VendorHtmlEngine;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Storage;
 
 class VendorTemplateEmail extends Mailable
 {
-
     private $build_email;
 
     private $vendor;
@@ -53,14 +54,13 @@ class VendorTemplateEmail extends Mailable
 
     public function build()
     {
-        
         $template_name = 'email.template.'.$this->build_email->getTemplate();
 
         if ($this->build_email->getTemplate() == 'light' || $this->build_email->getTemplate() == 'dark') {
             $template_name = 'email.template.client';
         }
 
-        if($this->build_email->getTemplate() == 'custom') {
+        if ($this->build_email->getTemplate() == 'custom') {
             $this->build_email->setBody(str_replace('$body', $this->build_email->getBody(), $this->client->getSetting('email_style_custom')));
         }
 
@@ -72,23 +72,24 @@ class VendorTemplateEmail extends Mailable
             );
         }
 
-        if($this->invitation)
-        {
+        if ($this->invitation) {
             $html_variables = (new VendorHtmlEngine($this->invitation))->makeValues();
             $signature = str_replace(array_keys($html_variables), array_values($html_variables), $settings->email_signature);
-        }
-        else
+        } else {
             $signature = $settings->email_signature;
+        }
 
-        if(property_exists($settings, 'email_from_name') && strlen($settings->email_from_name) > 1)
+        if (property_exists($settings, 'email_from_name') && strlen($settings->email_from_name) > 1) {
             $email_from_name = $settings->email_from_name;
-        else
+        } else {
             $email_from_name = $this->company->present()->name();
+        }
 
         $this->from(config('mail.from.address'), $email_from_name);
 
-        if (strlen($settings->bcc_email) > 1)
-            $this->bcc(explode(",",str_replace(" ", "", $settings->bcc_email)));//remove whitespace if any has been inserted.
+        if (strlen($settings->bcc_email) > 1) {
+            $this->bcc(explode(',', str_replace(' ', '', $settings->bcc_email)));
+        }//remove whitespace if any has been inserted.
 
         $this->subject($this->build_email->getSubject())
             ->text('email.template.text', [
@@ -109,24 +110,42 @@ class VendorTemplateEmail extends Mailable
                 'whitelabel' => $this->vendor->user->account->isPaid() ? true : false,
                 'logo' => $this->company->present()->logo($settings),
             ])
-            ->withSwiftMessage(function ($message) {
+            ->withSymfonyMessage(function ($message) {
                 $message->getHeaders()->addTextHeader('Tag', $this->company->company_key);
                 $message->invitation = $this->invitation;
-            });
+            })
+            ->tag($this->company->company_key);
 
-            /*In the hosted platform we need to slow things down a little for Storage to catch up.*/
-            if(Ninja::isHosted())
-                sleep(1);
+        if(Ninja::isHosted() && $this->invitation){
 
-            foreach ($this->build_email->getAttachments() as $file) {
+            $path = false;
 
-                if(is_string($file))
-                    $this->attach($file);
-                elseif(is_array($file))
-                    $this->attach($file['path'], ['as' => $file['name'], 'mime' => $file['mime']]);
+            if($this->invitation->purchase_order)
+                $path = $this->vendor->purchase_order_filepath($this->invitation).$this->invitation->purchase_order->numberFormatter().'.pdf';
+
+            sleep(1);
+
+            if($path && !Storage::disk(config('filesystems.default'))->exists($path)){
+
+                sleep(2);
+
+                if(!Storage::disk(config('filesystems.default'))->exists($path)) {
+                    (new CreatePurchaseOrderPdf($this->invitation))->handle();
+                    sleep(2);
+                }
 
             }
 
+        }
+
+        foreach ($this->build_email->getAttachments() as $file) {
+            if (is_string($file)) {
+                $this->attach($file);
+            } elseif (is_array($file)) {
+                $this->attach($file['path'], ['as' => $file['name'], 'mime' => null]);
+            }
+        }
+
         return $this;
     }
 }
diff --git a/app/Models/Account.php b/app/Models/Account.php
index 3e08838b44db..b75a7ce327df 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -427,7 +427,7 @@ class Account extends BaseModel
                     $nmo->company = $this->companies()->first();
                     $nmo->settings = $this->companies()->first()->settings;
                     $nmo->to_user = $this->companies()->first()->owner();
-                    NinjaMailerJob::dispatch($nmo);
+                    NinjaMailerJob::dispatch($nmo, true);
 
                     Cache::put("throttle_notified:{$this->key}", true, 60 * 24);
 
@@ -467,7 +467,7 @@ class Account extends BaseModel
                 $nmo->company = $this->companies()->first();
                 $nmo->settings = $this->companies()->first()->settings;
                 $nmo->to_user = $this->companies()->first()->owner();
-                NinjaMailerJob::dispatch($nmo);
+                NinjaMailerJob::dispatch($nmo, true);
 
                 Cache::put("gmail_credentials_notified:{$this->key}", true, 60 * 24);
 
diff --git a/app/Models/Activity.php b/app/Models/Activity.php
index 570fc16eda91..5a7d3f8d7ca7 100644
--- a/app/Models/Activity.php
+++ b/app/Models/Activity.php
@@ -18,106 +18,187 @@ class Activity extends StaticModel
     use MakesHash;
 
     const CREATE_CLIENT = 1; //
+
     const ARCHIVE_CLIENT = 2; //
+
     const DELETE_CLIENT = 3; //
+
     const CREATE_INVOICE = 4; //
+
     const UPDATE_INVOICE = 5; //
+
     const EMAIL_INVOICE = 6; //
+
     const VIEW_INVOICE = 7; //
+
     const ARCHIVE_INVOICE = 8; //
+
     const DELETE_INVOICE = 9; //
+
     const CREATE_PAYMENT = 10; //
+
     const UPDATE_PAYMENT = 11; //
+
     const ARCHIVE_PAYMENT = 12; //
+
     const DELETE_PAYMENT = 13; //
+
     const CREATE_CREDIT = 14; //
+
     const UPDATE_CREDIT = 15; //
+
     const ARCHIVE_CREDIT = 16; //
+
     const DELETE_CREDIT = 17; //
+
     const CREATE_QUOTE = 18; //
+
     const UPDATE_QUOTE = 19; //
+
     const EMAIL_QUOTE = 20; //
+
     const VIEW_QUOTE = 21; //
+
     const ARCHIVE_QUOTE = 22; //
+
     const DELETE_QUOTE = 23; //
+
     const RESTORE_QUOTE = 24; //
+
     const RESTORE_INVOICE = 25; //
+
     const RESTORE_CLIENT = 26; //
+
     const RESTORE_PAYMENT = 27; //
+
     const RESTORE_CREDIT = 28; //
+
     const APPROVE_QUOTE = 29; //
+
     const CREATE_VENDOR = 30; //
-    const ARCHIVE_VENDOR = 31;//
-    const DELETE_VENDOR = 32;//
-    const RESTORE_VENDOR = 33;//
-    const CREATE_EXPENSE = 34;//
-    const ARCHIVE_EXPENSE = 35;//
-    const DELETE_EXPENSE = 36;//
-    const RESTORE_EXPENSE = 37;//
+
+    const ARCHIVE_VENDOR = 31; //
+
+    const DELETE_VENDOR = 32; //
+
+    const RESTORE_VENDOR = 33; //
+
+    const CREATE_EXPENSE = 34; //
+
+    const ARCHIVE_EXPENSE = 35; //
+
+    const DELETE_EXPENSE = 36; //
+
+    const RESTORE_EXPENSE = 37; //
 
     const VOIDED_PAYMENT = 39; //
-    const REFUNDED_PAYMENT = 40; //
-    const FAILED_PAYMENT = 41;
-    const CREATE_TASK = 42; //
-    const UPDATE_TASK = 43; //
-    const ARCHIVE_TASK = 44; //
-    const DELETE_TASK = 45; //
-    const RESTORE_TASK = 46; //
-    const UPDATE_EXPENSE = 47;//
 
-    const CREATE_USER = 48; 
+    const REFUNDED_PAYMENT = 40; //
+
+    const FAILED_PAYMENT = 41;
+
+    const CREATE_TASK = 42; //
+
+    const UPDATE_TASK = 43; //
+
+    const ARCHIVE_TASK = 44; //
+
+    const DELETE_TASK = 45; //
+
+    const RESTORE_TASK = 46; //
+
+    const UPDATE_EXPENSE = 47; //
+
+    const CREATE_USER = 48;
+
     const UPDATE_USER = 49;
-    const ARCHIVE_USER = 50; 
-    const DELETE_USER = 51; 
-    const RESTORE_USER = 52; 
-    
+
+    const ARCHIVE_USER = 50;
+
+    const DELETE_USER = 51;
+
+    const RESTORE_USER = 52;
+
     const MARK_SENT_INVOICE = 53; // not needed?
+
     const PAID_INVOICE = 54; //
+
     const EMAIL_INVOICE_FAILED = 57;
+
     const REVERSED_INVOICE = 58; //
+
     const CANCELLED_INVOICE = 59; //
+
     const VIEW_CREDIT = 60; //
+
     const UPDATE_CLIENT = 61; //
+
     const UPDATE_VENDOR = 62; //
 
     const INVOICE_REMINDER1_SENT = 63;
+
     const INVOICE_REMINDER2_SENT = 64;
+
     const INVOICE_REMINDER3_SENT = 65;
+
     const INVOICE_REMINDER_ENDLESS_SENT = 66;
 
     const CREATE_SUBSCRIPTION = 80;
+
     const UPDATE_SUBSCRIPTION = 81;
+
     const ARCHIVE_SUBSCRIPTION = 82;
+
     const DELETE_SUBSCRIPTION = 83;
+
     const RESTORE_SUBSCRIPTION = 84;
-    
+
     const CREATE_RECURRING_INVOICE = 100;
-    const UPDATE_RECURRING_INVOICE = 101; 
-    const ARCHIVE_RECURRING_INVOICE = 102; 
-    const DELETE_RECURRING_INVOICE = 103; 
-    const RESTORE_RECURRING_INVOICE = 104; 
+
+    const UPDATE_RECURRING_INVOICE = 101;
+
+    const ARCHIVE_RECURRING_INVOICE = 102;
+
+    const DELETE_RECURRING_INVOICE = 103;
+
+    const RESTORE_RECURRING_INVOICE = 104;
 
     const CREATE_RECURRING_QUOTE = 110;
-    const UPDATE_RECURRING_QUOTE = 111; 
-    const ARCHIVE_RECURRING_QUOTE = 112; 
-    const DELETE_RECURRING_QUOTE = 113; 
-    const RESTORE_RECURRING_QUOTE = 114; 
+
+    const UPDATE_RECURRING_QUOTE = 111;
+
+    const ARCHIVE_RECURRING_QUOTE = 112;
+
+    const DELETE_RECURRING_QUOTE = 113;
+
+    const RESTORE_RECURRING_QUOTE = 114;
 
     const CREATE_RECURRING_EXPENSE = 120;
-    const UPDATE_RECURRING_EXPENSE = 121; 
-    const ARCHIVE_RECURRING_EXPENSE = 122; 
-    const DELETE_RECURRING_EXPENSE = 123; 
-    const RESTORE_RECURRING_EXPENSE = 124; 
+
+    const UPDATE_RECURRING_EXPENSE = 121;
+
+    const ARCHIVE_RECURRING_EXPENSE = 122;
+
+    const DELETE_RECURRING_EXPENSE = 123;
+
+    const RESTORE_RECURRING_EXPENSE = 124;
 
     const CREATE_PURCHASE_ORDER = 130;
+
     const UPDATE_PURCHASE_ORDER = 131;
-    const ARCHIVE_PURCHASE_ORDER = 132; 
-    const DELETE_PURCHASE_ORDER = 133; 
+
+    const ARCHIVE_PURCHASE_ORDER = 132;
+
+    const DELETE_PURCHASE_ORDER = 133;
+
     const RESTORE_PURCHASE_ORDER = 134;
-    const EMAIL_PURCHASE_ORDER = 135; 
+
+    const EMAIL_PURCHASE_ORDER = 135;
+
     const VIEW_PURCHASE_ORDER = 136;
+
     const ACCEPT_PURCHASE_ORDER = 137;
-    
+
     protected $casts = [
         'is_system' => 'boolean',
         'updated_at' => 'timestamp',
@@ -137,7 +218,7 @@ class Activity extends StaticModel
     {
         return $this->encodePrimaryKey($this->id);
     }
-    
+
     public function getEntityType()
     {
         return self::class;
@@ -224,7 +305,6 @@ class Activity extends StaticModel
         return $this->belongsTo(Task::class)->withTrashed();
     }
 
-
     public function company()
     {
         return $this->belongsTo(Company::class);
diff --git a/app/Models/Backup.php b/app/Models/Backup.php
index 78e91bd11294..2ddc96a685ae 100644
--- a/app/Models/Backup.php
+++ b/app/Models/Backup.php
@@ -28,41 +28,36 @@ class Backup extends BaseModel
 
     public function storeRemotely(?string $html, Client $client)
     {
-
-        if(!$html || strlen($html) == 0)
+        if (! $html || strlen($html) == 0) {
             return;
+        }
 
-        $path = $client->backup_path() . "/";
-        $filename = now()->format('Y_m_d'). "_" . md5(time()) . ".html";
-        $file_path = $path . $filename;
+        $path = $client->backup_path().'/';
+        $filename = now()->format('Y_m_d').'_'.md5(time()).'.html';
+        $file_path = $path.$filename;
 
         Storage::disk(config('filesystems.default'))->makeDirectory($path, 0775);
-    
+
         Storage::disk(config('filesystems.default'))->put($file_path, $html);
 
-        if(Storage::disk(config('filesystems.default'))->exists($file_path)){
+        if (Storage::disk(config('filesystems.default'))->exists($file_path)) {
             $this->html_backup = '';
             $this->filename = $file_path;
             $this->save();
         }
-
     }
 
     public function deleteFile()
     {
+        nlog('deleting => '.$this->filename);
 
-        nlog("deleting => ". $this->filename);
-        
-        try{
+        if(!$this->filename)
+            return;
 
+        try {
             Storage::disk(config('filesystems.default'))->delete($this->filename);
-        
-        }
-        catch(\Exception $e){
-
-            nlog("BACKUPEXCEPTION deleting backup file with error ". $e->getMessage());
-
+        } catch (\Exception $e) {
+            nlog('BACKUPEXCEPTION deleting backup file with error '.$e->getMessage());
         }
     }
-
 }
diff --git a/app/Models/BankAccount.php b/app/Models/BankAccount.php
index b8c95288a1a1..8b8e0c77b4be 100644
--- a/app/Models/BankAccount.php
+++ b/app/Models/BankAccount.php
@@ -26,8 +26,6 @@ class BankAccount extends BaseModel
     /**
      * @var array
      */
-    protected $dates = ['deleted_at'];
-
     /**
      * @var array
      */
diff --git a/app/Models/BankSubaccount.php b/app/Models/BankSubaccount.php
index d17320f0467c..131886b41376 100644
--- a/app/Models/BankSubaccount.php
+++ b/app/Models/BankSubaccount.php
@@ -20,11 +20,10 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 class BankSubaccount extends BaseModel
 {
     use SoftDeletes;
+
     /**
      * @var array
      */
-    protected $dates = ['deleted_at'];
-
     /**
      * @return BelongsTo
      */
diff --git a/app/Models/Client.php b/app/Models/Client.php
index 8c703661d4f9..1962fda33806 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -263,22 +263,22 @@ class Client extends BaseModel implements HasLocalePreference
 
     public function language()
     {
-
         $languages = Cache::get('languages');
 
-        if(!$languages)
+        if (! $languages) {
             $this->buildCache(true);
+        }
 
         return $languages->filter(function ($item) {
             return $item->id == $this->getSetting('language_id');
         })->first();
-
     }
 
     public function locale()
     {
-        if(!$this->language())
+        if (! $this->language()) {
             return 'en';
+        }
 
         return $this->language()->locale ?: 'en';
     }
@@ -287,9 +287,10 @@ class Client extends BaseModel implements HasLocalePreference
     {
         $date_formats = Cache::get('date_formats');
 
-        if(!$date_formats)
+        if (! $date_formats) {
             $this->buildCache(true);
-        
+        }
+
         return $date_formats->filter(function ($item) {
             return $item->id == $this->getSetting('date_format_id');
         })->first()->format;
@@ -299,8 +300,9 @@ class Client extends BaseModel implements HasLocalePreference
     {
         $currencies = Cache::get('currencies');
 
-        if(!$currencies)
+        if (! $currencies) {
             $this->buildCache(true);
+        }
 
         return $currencies->filter(function ($item) {
             return $item->id == $this->getSetting('currency_id');
@@ -366,8 +368,7 @@ class Client extends BaseModel implements HasLocalePreference
             /*need to catch empty string here*/
             if (is_string($this->settings->{$setting}) && (iconv_strlen($this->settings->{$setting}) >= 1)) {
                 return $this->settings->{$setting};
-            }
-            elseif(is_bool($this->settings->{$setting})){
+            } elseif (is_bool($this->settings->{$setting})) {
                 return $this->settings->{$setting};
             }
         }
@@ -380,9 +381,7 @@ class Client extends BaseModel implements HasLocalePreference
         /*Company Settings*/
         elseif ((property_exists($this->company->settings, $setting) != false) && (isset($this->company->settings->{$setting}) !== false)) {
             return $this->company->settings->{$setting};
-        }
-
-        elseif( property_exists(CompanySettings::defaults(), $setting) ) {
+        } elseif (property_exists(CompanySettings::defaults(), $setting)) {
             return CompanySettings::defaults()->{$setting};
         }
 
@@ -431,32 +430,26 @@ class Client extends BaseModel implements HasLocalePreference
      */
     public function getCreditCardGateway() :?CompanyGateway
     {
-
         $pms = $this->service()->getPaymentMethods(-1);
 
-            foreach($pms as $pm)
-            {
-
-                if($pm['gateway_type_id'] == GatewayType::CREDIT_CARD)
-                {
-                    $cg = CompanyGateway::find($pm['company_gateway_id']);
-
-                    if($cg && !property_exists($cg->fees_and_limits, GatewayType::CREDIT_CARD)){
-                        $fees_and_limits = $cg->fees_and_limits;
-                        $fees_and_limits->{GatewayType::CREDIT_CARD} = new FeesAndLimits;
-                        $cg->fees_and_limits = $fees_and_limits;
-                        $cg->save();
-                    }
-
-                    if($cg && $cg->fees_and_limits->{GatewayType::CREDIT_CARD}->is_enabled)
-                        return $cg;
+        foreach ($pms as $pm) {
+            if ($pm['gateway_type_id'] == GatewayType::CREDIT_CARD) {
+                $cg = CompanyGateway::find($pm['company_gateway_id']);
 
+                if ($cg && ! property_exists($cg->fees_and_limits, GatewayType::CREDIT_CARD)) {
+                    $fees_and_limits = $cg->fees_and_limits;
+                    $fees_and_limits->{GatewayType::CREDIT_CARD} = new FeesAndLimits;
+                    $cg->fees_and_limits = $fees_and_limits;
+                    $cg->save();
+                }
+
+                if ($cg && $cg->fees_and_limits->{GatewayType::CREDIT_CARD}->is_enabled) {
+                    return $cg;
                 }
-            
             }
+        }
 
-            return null;
-
+        return null;
     }
 
     //todo refactor this  - it is only searching for existing tokens
@@ -464,41 +457,35 @@ class Client extends BaseModel implements HasLocalePreference
     {
         $pms = $this->service()->getPaymentMethods(-1);
 
-        if($this->currency()->code == 'USD' && in_array(GatewayType::BANK_TRANSFER, array_column($pms, 'gateway_type_id'))){
-
-            foreach($pms as $pm){
-
-                if($pm['gateway_type_id'] == GatewayType::BANK_TRANSFER)
-                {
+        if ($this->currency()->code == 'USD' && in_array(GatewayType::BANK_TRANSFER, array_column($pms, 'gateway_type_id'))) {
+            foreach ($pms as $pm) {
+                if ($pm['gateway_type_id'] == GatewayType::BANK_TRANSFER) {
                     $cg = CompanyGateway::find($pm['company_gateway_id']);
 
-                    if($cg && !property_exists($cg->fees_and_limits, GatewayType::BANK_TRANSFER)){
+                    if ($cg && ! property_exists($cg->fees_and_limits, GatewayType::BANK_TRANSFER)) {
                         $fees_and_limits = $cg->fees_and_limits;
                         $fees_and_limits->{GatewayType::BANK_TRANSFER} = new FeesAndLimits;
                         $cg->fees_and_limits = $fees_and_limits;
                         $cg->save();
                     }
 
-                        if($cg && $cg->fees_and_limits->{GatewayType::BANK_TRANSFER}->is_enabled)
-                            return $cg;
+                    if ($cg && $cg->fees_and_limits->{GatewayType::BANK_TRANSFER}->is_enabled) {
+                        return $cg;
+                    }
                 }
             }
-
         }
 
-        if($this->currency()->code == 'EUR' && (in_array(GatewayType::BANK_TRANSFER, array_column($pms, 'gateway_type_id')) || in_array(GatewayType::SEPA, array_column($pms, 'gateway_type_id'))) ){
-        
-            foreach($pms as $pm){
-                
-                if($pm['gateway_type_id'] == GatewayType::SEPA)
-                {
+        if ($this->currency()->code == 'EUR' && (in_array(GatewayType::BANK_TRANSFER, array_column($pms, 'gateway_type_id')) || in_array(GatewayType::SEPA, array_column($pms, 'gateway_type_id')))) {
+            foreach ($pms as $pm) {
+                if ($pm['gateway_type_id'] == GatewayType::SEPA) {
                     $cg = CompanyGateway::find($pm['company_gateway_id']);
 
-                        if($cg && $cg->fees_and_limits->{GatewayType::SEPA}->is_enabled)
-                            return $cg;
+                    if ($cg && $cg->fees_and_limits->{GatewayType::SEPA}->is_enabled) {
+                        return $cg;
+                    }
                 }
             }
-
         }
 
         if ($this->country && $this->country->iso_3166_3 == 'GBR' && in_array(GatewayType::DIRECT_DEBIT, array_column($pms, 'gateway_type_id'))) {
@@ -514,12 +501,10 @@ class Client extends BaseModel implements HasLocalePreference
         }
 
         return null;
-
     }
 
     public function getBankTransferMethodType()
     {
-
         if ($this->currency()->code == 'USD') {
             return GatewayType::BANK_TRANSFER;
         }
@@ -565,9 +550,10 @@ class Client extends BaseModel implements HasLocalePreference
     {
         $languages = Cache::get('languages');
 
-        if(!$languages)
+        if (! $languages) {
             $this->buildCache(true);
-        
+        }
+
         return $languages->filter(function ($item) {
             return $item->id == $this->getSetting('language_id');
         })->first()->locale;
@@ -578,28 +564,31 @@ class Client extends BaseModel implements HasLocalePreference
         return $this->company->company_key.'/'.$this->client_hash.'/backups';
     }
 
-
     public function invoice_filepath($invitation)
-    {   
+    {
         $contact_key = $invitation->contact->contact_key;
+
         return $this->company->company_key.'/'.$this->client_hash.'/'.$contact_key.'/invoices/';
     }
 
     public function quote_filepath($invitation)
     {
         $contact_key = $invitation->contact->contact_key;
+
         return $this->company->company_key.'/'.$this->client_hash.'/'.$contact_key.'/quotes/';
     }
 
     public function credit_filepath($invitation)
     {
         $contact_key = $invitation->contact->contact_key;
+
         return $this->company->company_key.'/'.$this->client_hash.'/'.$contact_key.'/credits/';
     }
 
     public function recurring_invoice_filepath($invitation)
     {
         $contact_key = $invitation->contact->contact_key;
+
         return $this->company->company_key.'/'.$this->client_hash.'/'.$contact_key.'/recurring_invoices/';
     }
 
@@ -647,14 +636,15 @@ class Client extends BaseModel implements HasLocalePreference
 
         $entity_send_time = $this->getSetting('entity_send_time');
 
-        if($entity_send_time == 0)
+        if ($entity_send_time == 0) {
             return 0;
+        }
 
         $timezone = $this->company->timezone();
 
         $offset -= $timezone->utc_offset;
         $offset += ($entity_send_time * 3600);
-        
+
         return $offset;
     }
 
@@ -663,10 +653,10 @@ class Client extends BaseModel implements HasLocalePreference
         $client = $this->fresh();
 
         return [
-            'client_id' => $client->id, 
-            'client_balance' => $client->balance ?: 0, 
+            'client_id' => $client->id,
+            'client_balance' => $client->balance ?: 0,
             'client_paid_to_date' => $client->paid_to_date ?: 0,
-            'client_credit_balance' => $client->credit_balance ?: 0
+            'client_credit_balance' => $client->credit_balance ?: 0,
         ];
     }
 
diff --git a/app/Models/ClientContact.php b/app/Models/ClientContact.php
index f6f256798488..891270640892 100644
--- a/app/Models/ClientContact.php
+++ b/app/Models/ClientContact.php
@@ -31,8 +31,6 @@ use Laracasts\Presenter\PresentableTrait;
  * Class ClientContact
  *
  * @method scope() static
- *
- * @package App\Models
  */
 class ClientContact extends Authenticatable implements HasLocalePreference
 {
@@ -52,10 +50,6 @@ class ClientContact extends Authenticatable implements HasLocalePreference
 
     protected $presenter = ClientContactPresenter::class;
 
-    protected $dates = [
-        'deleted_at',
-    ];
-
     protected $appends = [
         'hashed_id',
     ];
@@ -111,25 +105,25 @@ class ClientContact extends Authenticatable implements HasLocalePreference
         'email',
     ];
 
-	/*
-	V2 type of scope
-	 */
-	public function scopeCompany($query)
-	{
-		$query->where('company_id', auth()->user()->companyId());
+    /*
+    V2 type of scope
+     */
+    public function scopeCompany($query)
+    {
+        $query->where('company_id', auth()->user()->companyId());
 
-		return $query;
-	}
+        return $query;
+    }
 
-	/*
-	 V1 type of scope
-	 */
-	public function scopeScope($query)
-	{
-		$query->where($this->getTable().'.company_id', '=', auth()->user()->company()->id);
+    /*
+     V1 type of scope
+     */
+    public function scopeScope($query)
+    {
+        $query->where($this->getTable().'.company_id', '=', auth()->user()->company()->id);
 
-		return $query;
-	}
+        return $query;
+    }
 
     public function getEntityType()
     {
@@ -198,7 +192,6 @@ class ClientContact extends Authenticatable implements HasLocalePreference
 
     public function sendPasswordResetNotification($token)
     {
-
         $this->token = $token;
         $this->save();
 
@@ -216,9 +209,10 @@ class ClientContact extends Authenticatable implements HasLocalePreference
     {
         $languages = Cache::get('languages');
 
-        if(!$languages)
+        if (! $languages) {
             $this->buildCache(true);
-        
+        }
+
         return $languages->filter(function ($item) {
             return $item->id == $this->client->getSetting('language_id');
         })->first()->locale;
@@ -265,6 +259,6 @@ class ClientContact extends Authenticatable implements HasLocalePreference
     {
         $domain = isset($this->company->portal_domain) ? $this->company->portal_domain : $this->company->domain();
 
-        return $domain . '/client/key_login/' . $this->contact_key;
+        return $domain.'/client/key_login/'.$this->contact_key;
     }
 }
diff --git a/app/Models/Company.php b/app/Models/Company.php
index 10977900fe42..15c9b94336e7 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -38,16 +38,27 @@ class Company extends BaseModel
     use \Awobaz\Compoships\Compoships;
 
     const ENTITY_RECURRING_INVOICE = 'recurring_invoice';
+
     const ENTITY_CREDIT = 'credit';
+
     const ENTITY_QUOTE = 'quote';
+
     const ENTITY_TASK = 'task';
+
     const ENTITY_EXPENSE = 'expense';
+
     const ENTITY_PROJECT = 'project';
+
     const ENTITY_VENDOR = 'vendor';
+
     const ENTITY_TICKET = 'ticket';
+
     const ENTITY_PROPOSAL = 'proposal';
+
     const ENTITY_RECURRING_EXPENSE = 'recurring_expense';
+
     const ENTITY_RECURRING_TASK = 'task';
+
     const ENTITY_RECURRING_QUOTE = 'recurring_quote';
 
     protected $presenter = CompanyPresenter::class;
@@ -107,7 +118,8 @@ class Company extends BaseModel
         'enable_applying_payments',
         'track_inventory',
         'inventory_notification_threshold',
-        'stock_notification'
+        'stock_notification',
+        'enabled_expense_tax_rates',
     ];
 
     protected $hidden = [
@@ -187,7 +199,7 @@ class Company extends BaseModel
     {
         return $this->hasMany(ExpenseCategory::class)->withTrashed();
     }
-    
+
     public function subscriptions()
     {
         return $this->hasMany(Subscription::class)->withTrashed();
@@ -207,6 +219,7 @@ class Company extends BaseModel
     {
         return $this->hasMany(Client::class)->withTrashed();
     }
+
     /**
      * @return HasMany
      */
@@ -241,7 +254,6 @@ class Company extends BaseModel
         return $this->hasMany(Activity::class);
     }
 
-
     public function activities()
     {
         return $this->hasMany(Activity::class)->orderBy('id', 'DESC')->take(50);
@@ -329,8 +341,21 @@ class Company extends BaseModel
      */
     public function country()
     {
+        $companies = Cache::get('countries');
+
+        if (! $companies) {
+            $this->buildCache(true);
+
+            $companies = Cache::get('countries');
+
+        }
+
+        return $companies->filter(function ($item) {
+            return $item->id == $this->getSetting('country_id');
+        })->first();
+
 //        return $this->belongsTo(Country::class);
-        return Country::find($this->settings->country_id);
+        // return Country::find($this->settings->country_id);
     }
 
     public function group_settings()
@@ -340,11 +365,11 @@ class Company extends BaseModel
 
     public function timezone()
     {
-
         $timezones = Cache::get('timezones');
 
-        if(!$timezones)
+        if (! $timezones) {
             $this->buildCache(true);
+        }
 
         return $timezones->filter(function ($item) {
             return $item->id == $this->settings->timezone_id;
@@ -378,17 +403,16 @@ class Company extends BaseModel
      */
     public function language()
     {
-        
         $languages = Cache::get('languages');
 
-        if(!$languages)
+        if (! $languages) {
             $this->buildCache(true);
+        }
 
         return $languages->filter(function ($item) {
             return $item->id == $this->settings->language_id;
         })->first();
 
-
         // return Language::find($this->settings->language_id);
     }
 
@@ -495,7 +519,7 @@ class Company extends BaseModel
 
     public function owner()
     {
-        return $this->company_users()->withTrashed()->where('is_owner', true)->first()->user;
+        return $this->company_users()->withTrashed()->where('is_owner', true)->first()?->user;
     }
 
     public function resolveRouteBinding($value, $field = null)
@@ -506,11 +530,11 @@ class Company extends BaseModel
     public function domain()
     {
         if (Ninja::isHosted()) {
-
-            if($this->portal_mode == 'domain' && strlen($this->portal_domain) > 3)
+            if ($this->portal_mode == 'domain' && strlen($this->portal_domain) > 3) {
                 return $this->portal_domain;
+            }
 
-            return "https://{$this->subdomain}." . config('ninja.app_domain');
+            return "https://{$this->subdomain}.".config('ninja.app_domain');
         }
 
         return config('ninja.app_url');
@@ -550,7 +574,6 @@ class Company extends BaseModel
         return $data;
     }
 
-
     private function createRBit($type, $source, $properties)
     {
         $data = new \stdClass;
@@ -575,12 +598,12 @@ class Company extends BaseModel
     {
         $date_formats = Cache::get('date_formats');
 
-        if(!$date_formats)
+        if (! $date_formats) {
             $this->buildCache(true);
-        
+        }
+
         return $date_formats->filter(function ($item) {
             return $item->id == $this->getSetting('date_format_id');
         })->first()->format;
     }
-
 }
diff --git a/app/Models/CompanyToken.php b/app/Models/CompanyToken.php
index 70856e052ab0..def681f67ab6 100644
--- a/app/Models/CompanyToken.php
+++ b/app/Models/CompanyToken.php
@@ -25,7 +25,7 @@ class CompanyToken extends BaseModel
 
     protected $with = [
         'company',
-        'user'
+        'user',
     ];
 
     protected $touches = [];
@@ -62,6 +62,5 @@ class CompanyToken extends BaseModel
         return $this->hasOne(CompanyUser::class, 'user_id', 'user_id')
             ->where('company_id', $this->company_id)
             ->where('user_id', $this->user_id);
-            
     }
 }
diff --git a/app/Models/CompanyUser.php b/app/Models/CompanyUser.php
index 8e8fe5e7ac8f..0de42bb71ce3 100644
--- a/app/Models/CompanyUser.php
+++ b/app/Models/CompanyUser.php
@@ -52,7 +52,7 @@ class CompanyUser extends Pivot
 
     protected $touches = ['user'];
 
-    protected $with = ['user','account'];
+    protected $with = ['user', 'account'];
 
     public function getEntityType()
     {
diff --git a/app/Models/Credit.php b/app/Models/Credit.php
index 3999f538c7e4..f1aac09e2aff 100644
--- a/app/Models/Credit.php
+++ b/app/Models/Credit.php
@@ -37,7 +37,7 @@ class Credit extends BaseModel
     use PresentableTrait;
     use MakesInvoiceValues;
     use MakesReminders;
-    
+
     protected $presenter = CreditPresenter::class;
 
     protected $fillable = [
@@ -97,8 +97,11 @@ class Credit extends BaseModel
     protected $touches = [];
 
     const STATUS_DRAFT = 1;
+
     const STATUS_SENT = 2;
+
     const STATUS_PARTIAL = 3;
+
     const STATUS_APPLIED = 4;
 
     public function getEntityType()
@@ -247,6 +250,7 @@ class Credit extends BaseModel
         if ($this->balance == 0) {
             $this->status_id = self::STATUS_APPLIED;
             $this->save();
+
             return;
         }
 
@@ -262,34 +266,36 @@ class Credit extends BaseModel
     public function pdf_file_path($invitation = null, string $type = 'path', bool $portal = false)
     {
         if (! $invitation) {
-
-            if($this->invitations()->exists())
+            if ($this->invitations()->exists()) {
                 $invitation = $this->invitations()->first();
-            else{
+            } else {
                 $this->service()->createInvitations();
                 $invitation = $this->invitations()->first();
             }
-
         }
 
-        if(!$invitation)
+        if (! $invitation) {
             throw new \Exception('Hard fail, could not create an invitation - is there a valid contact?');
+        }
 
         $file_path = $this->client->credit_filepath($invitation).$this->numberFormatter().'.pdf';
 
-        if(Ninja::isHosted() && $portal && Storage::disk(config('filesystems.default'))->exists($file_path)){
+        if (Ninja::isHosted() && $portal && Storage::disk(config('filesystems.default'))->exists($file_path)) {
             return Storage::disk(config('filesystems.default'))->{$type}($file_path);
-        }
-        elseif(Ninja::isHosted() && $portal){
-            $file_path = CreateEntityPdf::dispatchNow($invitation,config('filesystems.default'));
-            return Storage::disk(config('filesystems.default'))->{$type}($file_path);
-        }
-        
-        if(Storage::disk('public')->exists($file_path))
-            return Storage::disk('public')->{$type}($file_path);
+        } elseif (Ninja::isHosted() && $portal) {
+            $file_path = (new CreateEntityPdf($invitation, config('filesystems.default')))->handle();
 
-        $file_path = CreateEntityPdf::dispatchNow($invitation);
+            return Storage::disk(config('filesystems.default'))->{$type}($file_path);
+        }
+
+        if (Storage::disk('public')->exists($file_path)) {
             return Storage::disk('public')->{$type}($file_path);
+        }
+
+
+        $file_path = (new CreateEntityPdf($invitation))->handle();
+
+        return Storage::disk('public')->{$type}($file_path);
     }
 
     public function markInvitationsSent()
@@ -304,13 +310,12 @@ class Credit extends BaseModel
 
     public function transaction_event()
     {
-
         $credit = $this->fresh();
 
         return [
-            'credit_id' => $credit->id, 
-            'credit_amount' => $credit->amount ?: 0, 
-            'credit_balance' => $credit->balance ?: 0, 
+            'credit_id' => $credit->id,
+            'credit_amount' => $credit->amount ?: 0,
+            'credit_balance' => $credit->balance ?: 0,
             'credit_status' => $credit->status_id ?: 1,
         ];
     }
@@ -336,7 +341,7 @@ class Credit extends BaseModel
                 return ctrans('texts.applied');
                 break;
             default:
-                return "";
+                return '';
                 break;
         }
     }
diff --git a/app/Models/CreditInvitation.php b/app/Models/CreditInvitation.php
index b21554f8e3fa..bcb3daa1d4b8 100644
--- a/app/Models/CreditInvitation.php
+++ b/app/Models/CreditInvitation.php
@@ -129,8 +129,8 @@ class CreditInvitation extends BaseModel
         $storage_path = Storage::url($this->credit->client->quote_filepath($this).$this->credit->numberFormatter().'.pdf');
 
         if (! Storage::exists($this->credit->client->credit_filepath($this).$this->credit->numberFormatter().'.pdf')) {
-            event(new CreditWasUpdated($this, $this->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
-            CreateEntityPdf::dispatchNow($this);
+            event(new CreditWasUpdated($this->credit, $this->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
+            (new CreateEntityPdf($this))->handle();
         }
 
         return $storage_path;
diff --git a/app/Models/DateFormat.php b/app/Models/DateFormat.php
index 0145ae1cf277..ec261fb3a8b5 100644
--- a/app/Models/DateFormat.php
+++ b/app/Models/DateFormat.php
@@ -7,32 +7,31 @@ namespace App\Models;
  */
 class DateFormat extends StaticModel
 {
-    
     protected $fillable = ['translated_format'];
 
     public static $days_of_the_week = [
-      0 => 'sunday',
-      1 => 'monday',
-      2 => 'tuesday',
-      3 => 'wednesday',
-      4 => 'thursday',
-      5 => 'friday',
-      6 => 'saturday',
+        0 => 'sunday',
+        1 => 'monday',
+        2 => 'tuesday',
+        3 => 'wednesday',
+        4 => 'thursday',
+        5 => 'friday',
+        6 => 'saturday',
     ];
 
     public static $months_of_the_years = [
-      0 => 'january',
-      1 => 'february',
-      2 => 'march',
-      3 => 'april',
-      4 => 'may',
-      5 => 'june',
-      6 => 'july',
-      7 => 'august',
-      8 => 'september',
-      9 => 'october',
-      10 => 'november',
-      11 => 'december',
+        0 => 'january',
+        1 => 'february',
+        2 => 'march',
+        3 => 'april',
+        4 => 'may',
+        5 => 'june',
+        6 => 'july',
+        7 => 'august',
+        8 => 'september',
+        9 => 'october',
+        10 => 'november',
+        11 => 'december',
     ];
 
     /**
diff --git a/app/Models/Expense.php b/app/Models/Expense.php
index e79c0fb4c0f0..335fe29ee4d6 100644
--- a/app/Models/Expense.php
+++ b/app/Models/Expense.php
@@ -131,5 +131,5 @@ class Expense extends BaseModel
     public function project()
     {
         return $this->belongsTo(Project::class);
-    }    
+    }
 }
diff --git a/app/Models/Gateway.php b/app/Models/Gateway.php
index 2c74e118500a..1fc248c0b61e 100644
--- a/app/Models/Gateway.php
+++ b/app/Models/Gateway.php
@@ -68,10 +68,8 @@ class Gateway extends StaticModel
         }
 
         return $link;
-
     }
 
-
     /**
      * Returns an array of methods and the gatewaytypes possible
      *
@@ -84,10 +82,10 @@ class Gateway extends StaticModel
                 return [GatewayType::CREDIT_CARD => ['refund' => true, 'token_billing' => true]]; //Authorize.net
                 break;
             case 3:
-                return [GatewayType::CREDIT_CARD => ['refund' => false, 'token_billing' => true]];//eWay
+                return [GatewayType::CREDIT_CARD => ['refund' => false, 'token_billing' => true]]; //eWay
                 break;
             case 11:
-                return [GatewayType::CREDIT_CARD => ['refund' => false, 'token_billing' => true]];//Payfast
+                return [GatewayType::CREDIT_CARD => ['refund' => false, 'token_billing' => true]]; //Payfast
                 break;
             case 7:
                 return [
@@ -99,13 +97,13 @@ class Gateway extends StaticModel
                 ];
             case 15:
                 return [
-                    GatewayType::PAYPAL => ['refund' => false, 'token_billing' => false]
+                    GatewayType::PAYPAL => ['refund' => false, 'token_billing' => false],
                 ]; //Paypal
                 break;
             case 20:
                 return [
                     GatewayType::CREDIT_CARD => ['refund' => true, 'token_billing' => true],
-                    GatewayType::BANK_TRANSFER => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable','charge.succeeded','payment_intent.succeeded','charge.failed','payment_intent.payment_failed']],
+                    GatewayType::BANK_TRANSFER => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded', 'payment_intent.succeeded', 'charge.failed', 'payment_intent.payment_failed']],
                     GatewayType::ALIPAY => ['refund' => false, 'token_billing' => false],
                     GatewayType::APPLE_PAY => ['refund' => false, 'token_billing' => false],
                     GatewayType::SOFORT => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']], //Stripe
@@ -117,7 +115,7 @@ class Gateway extends StaticModel
                     GatewayType::BECS => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']],
                     GatewayType::IDEAL => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']],
                     GatewayType::ACSS => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']],
-                    GatewayType::FPX => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']]];
+                    GatewayType::FPX => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']], ];
             case 39:
                 return [GatewayType::CREDIT_CARD => ['refund' => true, 'token_billing' => true, 'webhooks' => [' ']]]; //Checkout
                 break;
@@ -126,8 +124,8 @@ class Gateway extends StaticModel
             case 49:
                 return [
                     GatewayType::CREDIT_CARD => ['refund' => true, 'token_billing' => true],
-                    GatewayType::BANK_TRANSFER => ['refund' => true, 'token_billing' => true, 'webhooks' => [' ']]
-                    ]; //WePay
+                    GatewayType::BANK_TRANSFER => ['refund' => true, 'token_billing' => true, 'webhooks' => [' ']],
+                ]; //WePay
                 break;
             case 50:
                 return [
@@ -139,18 +137,18 @@ class Gateway extends StaticModel
             case 56:
                 return [
                     GatewayType::CREDIT_CARD => ['refund' => true, 'token_billing' => true, 'webhooks' => ['payment_intent.succeeded']],
-                    GatewayType::BANK_TRANSFER => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable','charge.succeeded']],
+                    GatewayType::BANK_TRANSFER => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']],
                     GatewayType::ALIPAY => ['refund' => false, 'token_billing' => false],
                     GatewayType::APPLE_PAY => ['refund' => false, 'token_billing' => false],
-                    GatewayType::SOFORT => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']], //Stripe
-                    GatewayType::SEPA => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']],
-                    GatewayType::PRZELEWY24 => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']],
-                    GatewayType::GIROPAY => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']],
-                    GatewayType::EPS => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']],
-                    GatewayType::BANCONTACT => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']],
-                    GatewayType::BECS => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']],
-                    GatewayType::IDEAL => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']],
-                    GatewayType::ACSS => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']],
+                    GatewayType::SOFORT => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded', 'payment_intent.succeeded']], //Stripe
+                    GatewayType::SEPA => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded', 'payment_intent.succeeded']],
+                    GatewayType::PRZELEWY24 => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded', 'payment_intent.succeeded']],
+                    GatewayType::GIROPAY => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded', 'payment_intent.succeeded']],
+                    GatewayType::EPS => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded', 'payment_intent.succeeded']],
+                    GatewayType::BANCONTACT => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded', 'payment_intent.succeeded']],
+                    GatewayType::BECS => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded', 'payment_intent.succeeded']],
+                    GatewayType::IDEAL => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded', 'payment_intent.succeeded']],
+                    GatewayType::ACSS => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded', 'payment_intent.succeeded']],
                     GatewayType::FPX => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']],
                 ];
                 break;
@@ -169,7 +167,7 @@ class Gateway extends StaticModel
                 break;
             case 58:
                 return [
-                    GatewayType::HOSTED_PAGE => ['refund' => false, 'token_billing' => false, 'webhooks' => [' ']] // Razorpay
+                    GatewayType::HOSTED_PAGE => ['refund' => false, 'token_billing' => false, 'webhooks' => [' ']], // Razorpay
                 ];
                 break;
             case 59:
diff --git a/app/Models/GatewayType.php b/app/Models/GatewayType.php
index d2b6f3b561a0..a3e1bc4fd2e6 100644
--- a/app/Models/GatewayType.php
+++ b/app/Models/GatewayType.php
@@ -18,26 +18,47 @@ class GatewayType extends StaticModel
     public $timestamps = false;
 
     const CREDIT_CARD = 1;
+
     const BANK_TRANSFER = 2;
+
     const PAYPAL = 3;
+
     const CRYPTO = 4;
+
     const CUSTOM = 5;
+
     const ALIPAY = 6;
+
     const SOFORT = 7;
+
     const APPLE_PAY = 8;
+
     const SEPA = 9;
+
     const CREDIT = 10;
+
     const KBC = 11;
+
     const BANCONTACT = 12;
+
     const IDEAL = 13;
+
     const HOSTED_PAGE = 14; // For gateways that contain multiple methods.
+
     const GIROPAY = 15;
+
     const PRZELEWY24 = 16;
+
     const EPS = 17;
+
     const DIRECT_DEBIT = 18;
+
     const ACSS = 19;
+
     const BECS = 20;
+
     const INSTANT_BANK_PAY = 21;
+
     const FPX = 22;
 
     public function gateway()
diff --git a/app/Models/GroupSetting.php b/app/Models/GroupSetting.php
index 4e240d4e0d0c..fccae8b01cbc 100644
--- a/app/Models/GroupSetting.php
+++ b/app/Models/GroupSetting.php
@@ -42,7 +42,7 @@ class GroupSetting extends StaticModel
     {
         return $this->encodePrimaryKey($this->id);
     }
-    
+
     protected $touches = [];
 
     public function company()
@@ -64,7 +64,7 @@ class GroupSetting extends StaticModel
     {
         return $this->morphMany(Document::class, 'documentable');
     }
-    
+
     /**
      * Retrieve the model for a bound value.
      *
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 503fb89fb669..6740f6c9ecd2 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -93,7 +93,7 @@ class Invoice extends BaseModel
         'subscription_id',
         'auto_bill_enabled',
         'uses_inclusive_taxes',
-        'vendor_id'
+        'vendor_id',
     ];
 
     protected $casts = [
@@ -117,13 +117,19 @@ class Invoice extends BaseModel
     ];
 
     const STATUS_DRAFT = 1;
+
     const STATUS_SENT = 2;
+
     const STATUS_PARTIAL = 3;
+
     const STATUS_PAID = 4;
+
     const STATUS_CANCELLED = 5;
+
     const STATUS_REVERSED = 6;
 
     const STATUS_OVERDUE = -1; //status < 4 || < 3 && !is_deleted && !trashed() && due_date < now()
+
     const STATUS_UNPAID = -2; //status < 4 || < 3 && !is_deleted && !trashed()
 
     public function getEntityType()
@@ -245,6 +251,7 @@ class Invoice extends BaseModel
     {
         return $this->hasOne(Expense::class);
     }
+
     /**
      * Service entry points.
      */
@@ -282,7 +289,6 @@ class Invoice extends BaseModel
 
     public function isPayable(): bool
     {
-
         if ($this->status_id == self::STATUS_DRAFT && $this->is_deleted == false) {
             return true;
         } elseif ($this->status_id == self::STATUS_SENT && $this->is_deleted == false) {
@@ -414,55 +420,50 @@ class Invoice extends BaseModel
     public function pdf_file_path($invitation = null, string $type = 'path', bool $portal = false)
     {
         if (! $invitation) {
-
-            if($this->invitations()->exists())
+            if ($this->invitations()->exists()) {
                 $invitation = $this->invitations()->first();
-            else{
+            } else {
                 $this->service()->createInvitations();
                 $invitation = $this->invitations()->first();
             }
-
         }
 
-        if(!$invitation)
+        if (! $invitation) {
             throw new \Exception('Hard fail, could not create an invitation - is there a valid contact?');
+        }
 
         $file_path = $this->client->invoice_filepath($invitation).$this->numberFormatter().'.pdf';
 
         $file_exists = false;
 
         /* Flysystem throws an exception if the path is "corrupted" so lets wrap it in a try catch and return a bool  06/01/2022*/
-        try{
+        try {
             $file_exists = Storage::disk(config('filesystems.default'))->exists($file_path);
-        }
-        catch(\Exception $e){
-
+        } catch (\Exception $e) {
             nlog($e->getMessage());
-
         }
 
-        if(Ninja::isHosted() && $portal && $file_exists){
+        if (Ninja::isHosted() && $portal && $file_exists) {
             return Storage::disk(config('filesystems.default'))->{$type}($file_path);
-        }
-        elseif(Ninja::isHosted()){
-            $file_path = CreateEntityPdf::dispatchNow($invitation, config('filesystems.default'));
+        } elseif (Ninja::isHosted()) {
+            $file_path = (new CreateEntityPdf($invitation, config('filesystems.default')))->handle();
+
             return Storage::disk(config('filesystems.default'))->{$type}($file_path);
         }
 
-        try{
+        try {
             $file_exists = Storage::disk('public')->exists($file_path);
-        }
-        catch(\Exception $e){
-
+        } catch (\Exception $e) {
             nlog($e->getMessage());
-
         }
 
-        if($file_exists)
+        if ($file_exists) {
             return Storage::disk('public')->{$type}($file_path);
+        }
 
-        $file_path = CreateEntityPdf::dispatchNow($invitation);
-            return Storage::disk('public')->{$type}($file_path);
+        $file_path = (new CreateEntityPdf($invitation))->handle();
+
+        return Storage::disk('public')->{$type}($file_path);
     }
 
     public function markInvitationsSent()
@@ -514,14 +515,17 @@ class Invoice extends BaseModel
 
     public function getPayableAmount()
     {
-        if($this->partial > 0)
+        if ($this->partial > 0) {
             return $this->partial;
+        }
 
-        if($this->balance > 0)
+        if ($this->balance > 0) {
             return $this->balance;
+        }
 
-        if($this->status_id = 1)
+        if ($this->status_id = 1) {
             return $this->amount;
+        }
 
         return 0;
     }
@@ -545,14 +549,13 @@ class Invoice extends BaseModel
                 event(new InvoiceReminderWasEmailed($invitation, $invitation->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null), Activity::INVOICE_REMINDER_ENDLESS_SENT));
                 break;
             default:
-                # code...
+                // code...
                 break;
         }
     }
 
     public function transaction_event()
     {
-
         $invoice = $this->fresh();
 
         return [
diff --git a/app/Models/InvoiceInvitation.php b/app/Models/InvoiceInvitation.php
index 062e02a47a56..c724f417ebc7 100644
--- a/app/Models/InvoiceInvitation.php
+++ b/app/Models/InvoiceInvitation.php
@@ -112,7 +112,7 @@ class InvoiceInvitation extends BaseModel
 
         if (! Storage::exists($this->invoice->client->invoice_filepath($this).$this->invoice->numberFormatter().'.pdf')) {
             event(new InvoiceWasUpdated($this->invoice, $this->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
-            CreateEntityPdf::dispatchNow($this);
+            (new CreateEntityPdf($this))->handle();
         }
 
         return $storage_path;
diff --git a/app/Models/Payment.php b/app/Models/Payment.php
index 622cacb2972d..153f9b551e37 100644
--- a/app/Models/Payment.php
+++ b/app/Models/Payment.php
@@ -33,27 +33,45 @@ class Payment extends BaseModel
     use SoftDeletes;
     use Refundable;
     use Inviteable;
-    
+
     const STATUS_PENDING = 1;
+
     const STATUS_CANCELLED = 2;
+
     const STATUS_FAILED = 3;
+
     const STATUS_COMPLETED = 4;
+
     const STATUS_PARTIALLY_REFUNDED = 5;
+
     const STATUS_REFUNDED = 6;
 
     const TYPE_CREDIT_CARD = 1;
+
     const TYPE_BANK_TRANSFER = 2;
+
     const TYPE_PAYPAL = 3;
+
     const TYPE_CRYPTO = 4;
+
     const TYPE_DWOLLA = 5;
+
     const TYPE_CUSTOM1 = 6;
+
     const TYPE_ALIPAY = 7;
+
     const TYPE_SOFORT = 8;
+
     const TYPE_SEPA = 9;
+
     const TYPE_GOCARDLESS = 10;
+
     const TYPE_APPLE_PAY = 11;
+
     const TYPE_CUSTOM2 = 12;
+
     const TYPE_CUSTOM3 = 13;
+
     const TYPE_TOKEN = 'token';
 
     protected $fillable = [
@@ -172,11 +190,11 @@ class Payment extends BaseModel
 
     public function translatedType()
     {
-        if(!$this->type)
+        if (! $this->type) {
             return '';
+        }
 
         return ctrans('texts.payment_type_'.$this->type->name);
-
     }
 
     public function gateway_type()
@@ -259,7 +277,6 @@ class Payment extends BaseModel
         }
     }
 
-
     public function ledger()
     {
         return new LedgerService($this);
@@ -357,17 +374,13 @@ class Payment extends BaseModel
 
     public function getLink() :string
     {
-
-        if(Ninja::isHosted()){
+        if (Ninja::isHosted()) {
             $domain = isset($this->company->portal_domain) ? $this->company->portal_domain : $this->company->domain();
-        }
-        else
+        } else {
             $domain = config('ninja.app_url');
+        }
 
-        return $domain.'/client/payment/'. $this->client->contacts()->first()->contact_key .'/'. $this->hashed_id."?next=/client/payments/".$this->hashed_id;
-
-        
-
+        return $domain.'/client/payment/'.$this->client->contacts()->first()->contact_key.'/'.$this->hashed_id.'?next=/client/payments/'.$this->hashed_id;
     }
 
     public function transaction_event()
@@ -375,10 +388,10 @@ class Payment extends BaseModel
         $payment = $this->fresh();
 
         return [
-            'payment_id' => $payment->id, 
-            'payment_amount' => $payment->amount ?: 0, 
-            'payment_applied' => $payment->applied ?: 0, 
-            'payment_refunded' => $payment->refunded ?: 0, 
+            'payment_id' => $payment->id,
+            'payment_amount' => $payment->amount ?: 0,
+            'payment_applied' => $payment->applied ?: 0,
+            'payment_refunded' => $payment->refunded ?: 0,
             'payment_status' => $payment->status_id ?: 1,
             'paymentables' => $payment->paymentables->toArray(),
             'payment_request' => request() ? request()->all() : [],
diff --git a/app/Models/PaymentHash.php b/app/Models/PaymentHash.php
index 90d41ba53b31..e880f0b580c7 100644
--- a/app/Models/PaymentHash.php
+++ b/app/Models/PaymentHash.php
@@ -20,7 +20,7 @@ class PaymentHash extends Model
     protected $casts = [
         'data' => 'object',
     ];
-    
+
     public function invoices()
     {
         return $this->data->invoices;
diff --git a/app/Models/PaymentTerm.php b/app/Models/PaymentTerm.php
index a69af4e6f07d..c69ee8eb424a 100644
--- a/app/Models/PaymentTerm.php
+++ b/app/Models/PaymentTerm.php
@@ -26,11 +26,10 @@ class PaymentTerm extends BaseModel
      * @var bool
      */
     public $timestamps = true;
+
     /**
      * @var array
      */
-    protected $dates = ['deleted_at'];
-
     protected $fillable = ['num_days'];
 
     public function getNumDays()
diff --git a/app/Models/Paymentable.php b/app/Models/Paymentable.php
index 3eaf405d2177..594162829132 100644
--- a/app/Models/Paymentable.php
+++ b/app/Models/Paymentable.php
@@ -43,5 +43,4 @@ class Paymentable extends Pivot
     {
         return $this->belongsTo(Payment::class);
     }
-
 }
diff --git a/app/Models/Presenters/ClientPresenter.php b/app/Models/Presenters/ClientPresenter.php
index 3c6eebac3294..de04af406752 100644
--- a/app/Models/Presenters/ClientPresenter.php
+++ b/app/Models/Presenters/ClientPresenter.php
@@ -60,13 +60,13 @@ class ClientPresenter extends EntityPresenter
     {
         $primary_contact = $this->entity->primary_contact->first();
 
-        if($primary_contact && strlen($primary_contact->email) > 1)
+        if ($primary_contact && strlen($primary_contact->email) > 1) {
             return $primary_contact->email;
+        }
 
         $contact = $this->entity->contacts->whereNotNull('email')->first();
 
         return $contact ? $contact->email : 'No Email Set';
-
     }
 
     public function address()
@@ -180,7 +180,7 @@ class ClientPresenter extends EntityPresenter
     public function getCityState()
     {
         $client = $this->entity;
-        
+
         $country = $client->country ?: false;
 
         $swap = $country && $country->swap_postal_code;
diff --git a/app/Models/Presenters/RecurringInvoicePresenter.php b/app/Models/Presenters/RecurringInvoicePresenter.php
index 35392ec28d38..9c5041373a6d 100644
--- a/app/Models/Presenters/RecurringInvoicePresenter.php
+++ b/app/Models/Presenters/RecurringInvoicePresenter.php
@@ -27,5 +27,4 @@ use Laracasts\Presenter\PresentableTrait;
  */
 class RecurringInvoicePresenter extends InvoicePresenter
 {
-
 }
diff --git a/app/Models/Presenters/RecurringQuotePresenter.php b/app/Models/Presenters/RecurringQuotePresenter.php
index 476d9e8d67a8..f8aa091c5627 100644
--- a/app/Models/Presenters/RecurringQuotePresenter.php
+++ b/app/Models/Presenters/RecurringQuotePresenter.php
@@ -27,5 +27,4 @@ use Laracasts\Presenter\PresentableTrait;
  */
 class RecurringQuotePresenter extends InvoicePresenter
 {
-
 }
diff --git a/app/Models/Presenters/UserPresenter.php b/app/Models/Presenters/UserPresenter.php
index 6c82ba29deed..b6d84ad29cac 100644
--- a/app/Models/Presenters/UserPresenter.php
+++ b/app/Models/Presenters/UserPresenter.php
@@ -21,17 +21,16 @@ class UserPresenter extends EntityPresenter
      */
     public function name()
     {
+        if (! $this->entity) {
+            return 'No User Object Available';
+        }
 
-        if(!$this->entity)
-            return "No User Object Available";
-        
         $first_name = isset($this->entity->first_name) ? $this->entity->first_name : '';
         $last_name = isset($this->entity->last_name) ? $this->entity->last_name : '';
 
         return $first_name.' '.$last_name;
     }
 
-
     public function getDisplayName()
     {
         if ($this->getFullName()) {
diff --git a/app/Models/Product.php b/app/Models/Product.php
index 129a0fae19ca..a1739cb18bc6 100644
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -77,4 +77,4 @@ class Product extends BaseModel
     {
         return ctrans('texts.product');
     }
-}
\ No newline at end of file
+}
diff --git a/app/Models/Project.php b/app/Models/Project.php
index 107ef476a14b..99691cf5531b 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -18,8 +18,6 @@ class Project extends BaseModel
     /**
      * @var array
      */
-    protected $dates = ['deleted_at'];
-
     /**
      * @var array
      */
@@ -70,7 +68,7 @@ class Project extends BaseModel
 
     public function project()
     {
-        return $this->belongsTo(Project::class)->withTrashed();
+        return $this->belongsTo(self::class)->withTrashed();
     }
 
     public function documents()
@@ -87,7 +85,7 @@ class Project extends BaseModel
     {
         return $this->hasMany(Task::class);
     }
-    
+
     public function translate_entity()
     {
         return ctrans('texts.project');
diff --git a/app/Models/PurchaseOrderInvitation.php b/app/Models/PurchaseOrderInvitation.php
index dfeaeefbe7a2..dc2d7ce25a79 100644
--- a/app/Models/PurchaseOrderInvitation.php
+++ b/app/Models/PurchaseOrderInvitation.php
@@ -9,10 +9,8 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Models;
 
-
 use App\Utils\Ninja;
 use App\Utils\Traits\Inviteable;
 use App\Utils\Traits\MakesDates;
@@ -35,6 +33,7 @@ class PurchaseOrderInvitation extends BaseModel
         'company',
         'contact',
     ];
+
     protected $touches = ['purchase_order'];
 
     public function getEntityType()
@@ -71,7 +70,6 @@ class PurchaseOrderInvitation extends BaseModel
         return $this->belongsTo(User::class)->withTrashed();
     }
 
-
     public function company()
     {
         return $this->belongsTo(Company::class);
@@ -90,11 +88,11 @@ class PurchaseOrderInvitation extends BaseModel
 
     public function getPortalLink() :string
     {
-
-        if(Ninja::isHosted())
+        if (Ninja::isHosted()) {
             $domain = $this->company->domain();
-        else
+        } else {
             $domain = config('ninja.app_url');
+        }
 
         switch ($this->company->portal_mode) {
             case 'subdomain':
@@ -111,18 +109,17 @@ class PurchaseOrderInvitation extends BaseModel
                 return '';
                 break;
         }
-
     }
 
     public function getLink() :string
     {
         $entity_type = Str::snake(class_basename($this->entityType()));
 
-        if(Ninja::isHosted()){
+        if (Ninja::isHosted()) {
             $domain = $this->company->domain();
-        }
-        else
+        } else {
             $domain = config('ninja.app_url');
+        }
 
         switch ($this->company->portal_mode) {
             case 'subdomain':
@@ -145,6 +142,4 @@ class PurchaseOrderInvitation extends BaseModel
     {
         return $this->getLink().'?silent=true';
     }
-
-
 }
diff --git a/app/Models/Quote.php b/app/Models/Quote.php
index a917214948d9..c512c288aa19 100644
--- a/app/Models/Quote.php
+++ b/app/Models/Quote.php
@@ -92,12 +92,14 @@ class Quote extends BaseModel
         'is_amount_discount' => 'bool',
     ];
 
-    protected $dates = [];
-
     const STATUS_DRAFT = 1;
+
     const STATUS_SENT = 2;
+
     const STATUS_APPROVED = 3;
+
     const STATUS_CONVERTED = 4;
+
     const STATUS_EXPIRED = -1;
 
     public function getEntityType()
@@ -122,12 +124,11 @@ class Quote extends BaseModel
 
     public function getStatusIdAttribute($value)
     {
-        if($this->due_date && !$this->is_deleted && $value == Quote::STATUS_SENT && Carbon::parse($this->due_date)->lte(now()->startOfDay())){
-            return Quote::STATUS_EXPIRED;
+        if ($this->due_date && ! $this->is_deleted && $value == self::STATUS_SENT && Carbon::parse($this->due_date)->lte(now()->startOfDay())) {
+            return self::STATUS_EXPIRED;
         }
 
         return $value;
-
     }
 
     public function company()
@@ -221,38 +222,38 @@ class Quote extends BaseModel
         return new QuoteService($this);
     }
 
-
     public function pdf_file_path($invitation = null, string $type = 'path', bool $portal = false)
     {
         if (! $invitation) {
-
-            if($this->invitations()->exists())
+            if ($this->invitations()->exists()) {
                 $invitation = $this->invitations()->first();
-            else{
+            } else {
                 $this->service()->createInvitations();
                 $invitation = $this->invitations()->first();
             }
-
         }
 
-        if(!$invitation)
+        if (! $invitation) {
             throw new \Exception('Hard fail, could not create an invitation - is there a valid contact?');
+        }
 
         $file_path = $this->client->quote_filepath($invitation).$this->numberFormatter().'.pdf';
 
-        if(Ninja::isHosted() && $portal && Storage::disk(config('filesystems.default'))->exists($file_path)){
+        if (Ninja::isHosted() && $portal && Storage::disk(config('filesystems.default'))->exists($file_path)) {
             return Storage::disk(config('filesystems.default'))->{$type}($file_path);
-        }
-        elseif(Ninja::isHosted() && $portal){
-            $file_path = CreateEntityPdf::dispatchNow($invitation,config('filesystems.default'));
-            return Storage::disk(config('filesystems.default'))->{$type}($file_path);
-        }
-        
-        if(Storage::disk('public')->exists($file_path))
-            return Storage::disk('public')->{$type}($file_path);
+        } elseif (Ninja::isHosted() && $portal) {
 
-        $file_path = CreateEntityPdf::dispatchNow($invitation);
+            $file_path = (new CreateEntityPdf($invitation, config('filesystems.default')))->handle();
+            return Storage::disk(config('filesystems.default'))->{$type}($file_path);
+        }
+
+        if (Storage::disk('public')->exists($file_path)) {
             return Storage::disk('public')->{$type}($file_path);
+        }
+
+        $file_path = (new CreateEntityPdf($invitation))->handle();
+
+        return Storage::disk('public')->{$type}($file_path);
     }
 
     /**
diff --git a/app/Models/QuoteInvitation.php b/app/Models/QuoteInvitation.php
index adb0b7090c73..7c2378ea2580 100644
--- a/app/Models/QuoteInvitation.php
+++ b/app/Models/QuoteInvitation.php
@@ -134,7 +134,7 @@ class QuoteInvitation extends BaseModel
 
         if (! Storage::exists($this->quote->client->quote_filepath($this).$this->quote->numberFormatter().'.pdf')) {
             event(new QuoteWasUpdated($this->quote, $this->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
-            CreateEntityPdf::dispatchNow($this);
+            (new CreateEntityPdf($this))->handle();
         }
 
         return $storage_path;
diff --git a/app/Models/RecurringExpense.php b/app/Models/RecurringExpense.php
index 81423f4fd668..fa3dfa51eae4 100644
--- a/app/Models/RecurringExpense.php
+++ b/app/Models/RecurringExpense.php
@@ -120,7 +120,7 @@ class RecurringExpense extends BaseModel
 
     public function nextSendDate() :?Carbon
     {
-        if (!$this->next_send_date) {
+        if (! $this->next_send_date) {
             return null;
         }
 
@@ -154,10 +154,9 @@ class RecurringExpense extends BaseModel
         }
     }
 
-
     public function nextSendDateClient() :?Carbon
     {
-        if (!$this->next_send_date) {
+        if (! $this->next_send_date) {
             return null;
         }
 
@@ -208,7 +207,7 @@ class RecurringExpense extends BaseModel
         /* Return early if nothing to send back! */
         if ($this->status_id == RecurringInvoice::STATUS_COMPLETED ||
             $this->remaining_cycles == 0 ||
-            !$this->next_send_date) {
+            ! $this->next_send_date) {
             return [];
         }
 
@@ -221,20 +220,19 @@ class RecurringExpense extends BaseModel
 
         $data = [];
 
-        if (!Carbon::parse($this->next_send_date)) {
+        if (! Carbon::parse($this->next_send_date)) {
             return $data;
         }
 
         $next_send_date = Carbon::parse($this->next_send_date)->copy();
 
-        for ($x=0; $x<$iterations; $x++) {
+        for ($x = 0; $x < $iterations; $x++) {
             // we don't add the days... we calc the day of the month!!
             $this->nextDateByFrequency($next_send_date);
 
             $data[] = [
                 'send_date' => $next_send_date->format('Y-m-d'),
             ];
-
         }
 
         return $data;
@@ -244,8 +242,9 @@ class RecurringExpense extends BaseModel
     {
         $offset = 0;
 
-        if($this->client)
+        if ($this->client) {
             $offset = $this->client->timezone_offset();
+        }
 
         switch ($this->frequency_id) {
             case RecurringInvoice::FREQUENCY_DAILY:
diff --git a/app/Models/RecurringInvoice.php b/app/Models/RecurringInvoice.php
index 8d6852c7c75d..d22a1bc50e4a 100644
--- a/app/Models/RecurringInvoice.php
+++ b/app/Models/RecurringInvoice.php
@@ -40,25 +40,40 @@ class RecurringInvoice extends BaseModel
      * Invoice Statuses.
      */
     const STATUS_DRAFT = 1;
+
     const STATUS_ACTIVE = 2;
+
     const STATUS_PAUSED = 3;
+
     const STATUS_COMPLETED = 4;
+
     const STATUS_PENDING = -1;
 
     /**
      * Invoice Frequencies.
      */
     const FREQUENCY_DAILY = 1;
+
     const FREQUENCY_WEEKLY = 2;
+
     const FREQUENCY_TWO_WEEKS = 3;
+
     const FREQUENCY_FOUR_WEEKS = 4;
+
     const FREQUENCY_MONTHLY = 5;
+
     const FREQUENCY_TWO_MONTHS = 6;
+
     const FREQUENCY_THREE_MONTHS = 7;
+
     const FREQUENCY_FOUR_MONTHS = 8;
+
     const FREQUENCY_SIX_MONTHS = 9;
+
     const FREQUENCY_ANNUALLY = 10;
+
     const FREQUENCY_TWO_YEARS = 11;
+
     const FREQUENCY_THREE_YEARS = 12;
 
     const RECURS_INDEFINITELY = -1;
@@ -225,23 +240,23 @@ class RecurringInvoice extends BaseModel
 
     public function nextSendDate() :?Carbon
     {
-        if (!$this->next_send_date_client) {
+        if (! $this->next_send_date_client) {
             return null;
         }
 
         $offset = $this->client->timezone_offset();
 
         /* If this setting is enabled, the recurring invoice may be set in the past */
-            
-            if($this->company->stop_on_unpaid_recurring) {
+
+        if ($this->company->stop_on_unpaid_recurring) {
 
                 /* Lets set the next send date to now so we increment from today, rather than in the past*/
-                if(Carbon::parse($this->next_send_date)->lt(now()->subDays(3)))
-                    $this->next_send_date_client = now()->format('Y-m-d');
-
+            if (Carbon::parse($this->next_send_date)->lt(now()->subDays(3))) {
+                $this->next_send_date_client = now()->format('Y-m-d');
             }
-        
-        /* 
+        }
+
+        /*
         As we are firing at UTC+0 if our offset is negative it is technically firing the day before so we always need
         to add ON a day - a day = 86400 seconds
         */
@@ -280,19 +295,19 @@ class RecurringInvoice extends BaseModel
 
     public function nextSendDateClient() :?Carbon
     {
-        if (!$this->next_send_date_client) {
+        if (! $this->next_send_date_client) {
             return null;
         }
 
         /* If this setting is enabled, the recurring invoice may be set in the past */
-            
-            if($this->company->stop_on_unpaid_recurring) {
+
+        if ($this->company->stop_on_unpaid_recurring) {
 
                 /* Lets set the next send date to now so we increment from today, rather than in the past*/
-                if(Carbon::parse($this->next_send_date)->lt(now()->subDays(3)))
-                    $this->next_send_date_client = now()->format('Y-m-d');
-
+            if (Carbon::parse($this->next_send_date)->lt(now()->subDays(3))) {
+                $this->next_send_date_client = now()->format('Y-m-d');
             }
+        }
 
         switch ($this->frequency_id) {
             case self::FREQUENCY_DAILY:
@@ -322,7 +337,7 @@ class RecurringInvoice extends BaseModel
             default:
                 return null;
         }
-    }    
+    }
 
     public function nextDateByFrequency($date)
     {
@@ -425,7 +440,6 @@ class RecurringInvoice extends BaseModel
         }
     }
 
-
     public static function frequencyForKey(int $frequency_id) :string
     {
         switch ($frequency_id) {
@@ -495,7 +509,7 @@ class RecurringInvoice extends BaseModel
         /* Return early if nothing to send back! */
         if ($this->status_id == self::STATUS_COMPLETED ||
             $this->remaining_cycles == 0 ||
-            !$this->next_send_date) {
+            ! $this->next_send_date) {
             return [];
         }
 
@@ -508,13 +522,13 @@ class RecurringInvoice extends BaseModel
 
         $data = [];
 
-        if (!Carbon::parse($this->next_send_date_client)) {
+        if (! Carbon::parse($this->next_send_date_client)) {
             return $data;
         }
 
         $next_send_date = Carbon::parse($this->next_send_date_client)->copy();
 
-        for ($x=0; $x<$iterations; $x++) {
+        for ($x = 0; $x < $iterations; $x++) {
             // we don't add the days... we calc the day of the month!!
             $next_due_date = $this->calculateDueDate($next_send_date->copy()->format('Y-m-d'));
             $next_due_date_string = $next_due_date ? $next_due_date->format('Y-m-d') : '';
@@ -523,24 +537,22 @@ class RecurringInvoice extends BaseModel
 
             $data[] = [
                 'send_date' => $next_send_date->format('Y-m-d'),
-                'due_date' => $next_due_date_string
+                'due_date' => $next_due_date_string,
             ];
 
             /* Fixes the timeshift in case the offset is negative which cause a infinite loop due to UTC +0*/
-            if($this->client->timezone_offset() < 0){
+            if ($this->client->timezone_offset() < 0) {
                 $next_send_date = $this->nextDateByFrequency($next_send_date->addDay()->format('Y-m-d'));
-            }
-            else
+            } else {
                 $next_send_date = $this->nextDateByFrequency($next_send_date->format('Y-m-d'));
+            }
         }
 
         return $data;
     }
 
-
     public function calculateDueDate($date)
     {
-
         switch ($this->due_date_days) {
             case 'terms':
             case '':
@@ -557,7 +569,7 @@ class RecurringInvoice extends BaseModel
      * Calculates a date based on the client payment terms.
      *
      * @param  Carbon $date A given date
-     * @return NULL|Carbon  The date
+     * @return null|Carbon  The date
      */
     public function calculateDateFromTerms($date)
     {
diff --git a/app/Models/RecurringQuote.php b/app/Models/RecurringQuote.php
index e88736af9e1e..a344c6c40bb7 100644
--- a/app/Models/RecurringQuote.php
+++ b/app/Models/RecurringQuote.php
@@ -42,25 +42,40 @@ class RecurringQuote extends BaseModel
      * Quote Statuses.
      */
     const STATUS_DRAFT = 1;
+
     const STATUS_ACTIVE = 2;
+
     const STATUS_PAUSED = 3;
+
     const STATUS_COMPLETED = 4;
+
     const STATUS_PENDING = -1;
 
     /**
      * Quote Frequencies.
      */
     const FREQUENCY_DAILY = 1;
+
     const FREQUENCY_WEEKLY = 2;
+
     const FREQUENCY_TWO_WEEKS = 3;
+
     const FREQUENCY_FOUR_WEEKS = 4;
+
     const FREQUENCY_MONTHLY = 5;
+
     const FREQUENCY_TWO_MONTHS = 6;
+
     const FREQUENCY_THREE_MONTHS = 7;
+
     const FREQUENCY_FOUR_MONTHS = 8;
+
     const FREQUENCY_SIX_MONTHS = 9;
+
     const FREQUENCY_ANNUALLY = 10;
+
     const FREQUENCY_TWO_YEARS = 11;
+
     const FREQUENCY_THREE_YEARS = 12;
 
     const RECURS_INDEFINITELY = -1;
@@ -220,18 +235,19 @@ class RecurringQuote extends BaseModel
 
     public function nextSendDate() :?Carbon
     {
-        if (!$this->next_send_date) {
+        if (! $this->next_send_date) {
             return null;
         }
-        
+
         $offset = $this->client->timezone_offset();
 
-        /* 
+        /*
         As we are firing at UTC+0 if our offset is negative it is technically firing the day before so we always need
         to add ON a day - a day = 86400 seconds
         */
-        if($offset < 0)
+        if ($offset < 0) {
             $offset += 86400;
+        }
 
         switch ($this->frequency_id) {
             case self::FREQUENCY_DAILY:
@@ -406,7 +422,7 @@ class RecurringQuote extends BaseModel
         /* Return early if nothing to send back! */
         if ($this->status_id == self::STATUS_COMPLETED ||
             $this->remaining_cycles == 0 ||
-            !$this->next_send_date) {
+            ! $this->next_send_date) {
             return [];
         }
 
@@ -419,13 +435,13 @@ class RecurringQuote extends BaseModel
 
         $data = [];
 
-        if (!Carbon::parse($this->next_send_date)) {
+        if (! Carbon::parse($this->next_send_date)) {
             return $data;
         }
 
         $next_send_date = Carbon::parse($this->next_send_date)->copy();
 
-        for ($x=0; $x<$iterations; $x++) {
+        for ($x = 0; $x < $iterations; $x++) {
             // we don't add the days... we calc the day of the month!!
             $next_due_date = $this->calculateDueDate($next_send_date->copy()->format('Y-m-d'));
             $next_due_date_string = $next_due_date ? $next_due_date->format('Y-m-d') : '';
@@ -434,21 +450,20 @@ class RecurringQuote extends BaseModel
 
             $data[] = [
                 'send_date' => $next_send_date->format('Y-m-d'),
-                'due_date' => $next_due_date_string
+                'due_date' => $next_due_date_string,
             ];
 
             /* Fixes the timeshift in case the offset is negative which cause a infinite loop due to UTC +0*/
-            if($this->client->timezone_offset() < 0){
+            if ($this->client->timezone_offset() < 0) {
                 $next_send_date = $this->nextDateByFrequency($next_send_date->addDay()->format('Y-m-d'));
-            }
-            else
+            } else {
                 $next_send_date = $this->nextDateByFrequency($next_send_date->format('Y-m-d'));
+            }
         }
 
         return $data;
     }
 
-
     public function calculateDueDate($date)
     {
         switch ($this->due_date_days) {
@@ -465,7 +480,7 @@ class RecurringQuote extends BaseModel
      * Calculates a date based on the client payment terms.
      *
      * @param  Carbon $date A given date
-     * @return NULL|Carbon  The date
+     * @return null|Carbon  The date
      */
     public function calculateDateFromTerms($date)
     {
@@ -492,5 +507,4 @@ class RecurringQuote extends BaseModel
     {
         return ctrans('texts.recurring_quote');
     }
-
 }
diff --git a/app/Models/Scheduler.php b/app/Models/Scheduler.php
index 052870f5eb6f..287129638fb1 100644
--- a/app/Models/Scheduler.php
+++ b/app/Models/Scheduler.php
@@ -17,15 +17,15 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Carbon;
 
 /**
- * @property boolean paused
- * @property boolean is_deleted
+ * @property bool paused
+ * @property bool is_deleted
  * @property \Carbon\Carbon|mixed start_from
  * @property string repeat_every
  * @property \Carbon\Carbon|mixed scheduled_run
- * @property integer company_id
- * @property integer updated_at
- * @property integer created_at
- * @property integer deleted_at
+ * @property int company_id
+ * @property int updated_at
+ * @property int created_at
+ * @property int deleted_at
  * @property string action_name
  * @property mixed company
  * @property array parameters
@@ -43,7 +43,7 @@ class Scheduler extends BaseModel
         'action_class',
         'action_name',
         'parameters',
-        'company_id'
+        'company_id',
     ];
 
     protected $casts = [
@@ -57,29 +57,45 @@ class Scheduler extends BaseModel
         'parameters' => 'array',
     ];
 
-
     const DAILY = 'DAY';
+
     const WEEKLY = 'WEEK';
+
     const BIWEEKLY = 'BIWEEKLY';
+
     const MONTHLY = 'MONTH';
+
     const QUARTERLY = '3MONTHS';
+
     const ANNUALLY = 'YEAR';
 
     const CREATE_CLIENT_REPORT = 'create_client_report';
-    const CREATE_CLIENT_CONTACT_REPORT = 'create_client_contact_report';
-    const CREATE_CREDIT_REPORT = 'create_credit_report';
-    const CREATE_DOCUMENT_REPORT = 'create_document_report';
-    const CREATE_EXPENSE_REPORT = 'create_expense_report';
-    const CREATE_INVOICE_ITEM_REPORT = 'create_invoice_item_report';
-    const CREATE_INVOICE_REPORT = 'create_invoice_report';
-    const CREATE_PAYMENT_REPORT = 'create_payment_report';
-    const CREATE_PRODUCT_REPORT = 'create_product_report';
-    const CREATE_PROFIT_AND_LOSS_REPORT = 'create_profit_and_loss_report';
-    const CREATE_QUOTE_ITEM_REPORT = 'create_quote_item_report';
-    const CREATE_QUOTE_REPORT = 'create_quote_report';
-    const CREATE_RECURRING_INVOICE_REPORT = 'create_recurring_invoice_report';
-    const CREATE_TASK_REPORT = 'create_task_report';
 
+    const CREATE_CLIENT_CONTACT_REPORT = 'create_client_contact_report';
+
+    const CREATE_CREDIT_REPORT = 'create_credit_report';
+
+    const CREATE_DOCUMENT_REPORT = 'create_document_report';
+
+    const CREATE_EXPENSE_REPORT = 'create_expense_report';
+
+    const CREATE_INVOICE_ITEM_REPORT = 'create_invoice_item_report';
+
+    const CREATE_INVOICE_REPORT = 'create_invoice_report';
+
+    const CREATE_PAYMENT_REPORT = 'create_payment_report';
+
+    const CREATE_PRODUCT_REPORT = 'create_product_report';
+
+    const CREATE_PROFIT_AND_LOSS_REPORT = 'create_profit_and_loss_report';
+
+    const CREATE_QUOTE_ITEM_REPORT = 'create_quote_item_report';
+
+    const CREATE_QUOTE_REPORT = 'create_quote_report';
+
+    const CREATE_RECURRING_INVOICE_REPORT = 'create_recurring_invoice_report';
+
+    const CREATE_TASK_REPORT = 'create_task_report';
 
     /**
      * Service entry points.
@@ -89,16 +105,13 @@ class Scheduler extends BaseModel
         return new TaskSchedulerService($this);
     }
 
-
     public function company(): \Illuminate\Database\Eloquent\Relations\BelongsTo
     {
         return $this->belongsTo(Company::class);
     }
 
-
     public function nextScheduledDate(): ?Carbon
     {
-
         $offset = 0;
 
         $entity_send_time = $this->company->settings->entity_send_time;
@@ -115,8 +128,9 @@ class Scheduler extends BaseModel
         to add ON a day - a day = 86400 seconds
         */
 
-        if ($offset < 0)
+        if ($offset < 0) {
             $offset += 86400;
+        }
 
         switch ($this->repeat_every) {
             case self::DAILY:
diff --git a/app/Models/Subscription.php b/app/Models/Subscription.php
index 56b796654b26..da92f7add006 100644
--- a/app/Models/Subscription.php
+++ b/app/Models/Subscription.php
@@ -85,7 +85,6 @@ class Subscription extends BaseModel
 
     public function nextDateByInterval($date, $frequency_id)
     {
-
         switch ($frequency_id) {
 
             case RecurringInvoice::FREQUENCY_DAILY:
@@ -116,5 +115,4 @@ class Subscription extends BaseModel
                 return null;
         }
     }
-
 }
diff --git a/app/Models/SystemLog.php b/app/Models/SystemLog.php
index 6cdeb9969d0f..2158c68eef5a 100644
--- a/app/Models/SystemLog.php
+++ b/app/Models/SystemLog.php
@@ -32,65 +32,99 @@ class SystemLog extends Model
 
     /* Category IDs */
     const CATEGORY_GATEWAY_RESPONSE = 1;
+
     const CATEGORY_MAIL = 2;
+
     const CATEGORY_WEBHOOK = 3;
+
     const CATEGORY_PDF = 4;
+
     const CATEGORY_SECURITY = 5;
 
     /* Event IDs*/
     const EVENT_PAYMENT_RECONCILIATION_FAILURE = 10;
+
     const EVENT_PAYMENT_RECONCILIATION_SUCCESS = 11;
 
     const EVENT_GATEWAY_SUCCESS = 21;
+
     const EVENT_GATEWAY_FAILURE = 22;
+
     const EVENT_GATEWAY_ERROR = 23;
 
     const EVENT_MAIL_SEND = 30;
+
     const EVENT_MAIL_RETRY_QUEUE = 31; //we use this to queue emails that are spooled and not sent due to the email queue quota being exceeded.
+
     const EVENT_MAIL_BOUNCED = 32;
+
     const EVENT_MAIL_SPAM_COMPLAINT = 33;
+
     const EVENT_MAIL_DELIVERY = 34;
+
     const EVENT_MAIL_OPENED = 35;
 
     const EVENT_WEBHOOK_RESPONSE = 40;
+
     const EVENT_WEBHOOK_SUCCESS = 41;
+
     const EVENT_PDF_RESPONSE = 50;
 
     const EVENT_AUTHENTICATION_FAILURE = 60;
+
     const EVENT_USER = 61;
 
     /*Type IDs*/
     const TYPE_PAYPAL = 300;
+
     const TYPE_STRIPE = 301;
+
     const TYPE_LEDGER = 302;
+
     const TYPE_FAILURE = 303;
+
     const TYPE_CHECKOUT = 304;
+
     const TYPE_AUTHORIZE = 305;
+
     const TYPE_CUSTOM = 306;
+
     const TYPE_BRAINTREE = 307;
+
     const TYPE_WEPAY = 309;
+
     const TYPE_PAYFAST = 310;
+
     const TYPE_PAYTRACE = 311;
+
     const TYPE_MOLLIE = 312;
+
     const TYPE_EWAY = 313;
+
     const TYPE_SQUARE = 320;
+
     const TYPE_GOCARDLESS = 321;
+
     const TYPE_RAZORPAY = 322;
 
     const TYPE_QUOTA_EXCEEDED = 400;
+
     const TYPE_UPSTREAM_FAILURE = 401;
 
     const TYPE_WEBHOOK_RESPONSE = 500;
 
     const TYPE_PDF_FAILURE = 600;
+
     const TYPE_PDF_SUCCESS = 601;
 
     const TYPE_MODIFIED = 701;
+
     const TYPE_DELETED = 702;
 
     const TYPE_LOGIN_SUCCESS = 800;
+
     const TYPE_LOGIN_FAILURE = 801;
-    
+
     protected $fillable = [
         'client_id',
         'company_id',
@@ -125,16 +159,16 @@ class SystemLog extends Model
     {
         switch ($this->category_id) {
             case self::CATEGORY_GATEWAY_RESPONSE:
-                return "Gateway";
+                return 'Gateway';
             case self::CATEGORY_MAIL:
-                return "Mail";
+                return 'Mail';
             case self::CATEGORY_WEBHOOK:
-                return "Webhook";            
+                return 'Webhook';
             case self::CATEGORY_PDF:
-                return "PDF";
+                return 'PDF';
             case self::CATEGORY_SECURITY:
-                return "Security";
-                        
+                return 'Security';
+
             default:
                 return 'undefined';
         }
@@ -144,33 +178,33 @@ class SystemLog extends Model
     {
         switch ($this->event_id) {
             case self::EVENT_PAYMENT_RECONCILIATION_FAILURE:
-                return "Payment reco failure";
+                return 'Payment reco failure';
             case self::EVENT_PAYMENT_RECONCILIATION_SUCCESS:
-                return "Payment reco success";
+                return 'Payment reco success';
             case self::EVENT_GATEWAY_SUCCESS:
-                return "Success";            
+                return 'Success';
             case self::EVENT_GATEWAY_FAILURE:
-                return "Failure";
+                return 'Failure';
             case self::EVENT_GATEWAY_ERROR:
-                return "Error";
+                return 'Error';
             case self::EVENT_MAIL_SEND:
-                return "Send";
+                return 'Send';
             case self::EVENT_MAIL_RETRY_QUEUE:
-                return "Retry";
+                return 'Retry';
             case self::EVENT_MAIL_BOUNCED:
-                return "Bounced";
+                return 'Bounced';
             case self::EVENT_MAIL_SPAM_COMPLAINT:
-                return "Spam";
+                return 'Spam';
             case self::EVENT_MAIL_DELIVERY:
-                return "Delivery";
+                return 'Delivery';
             case self::EVENT_WEBHOOK_RESPONSE:
-                return "Webhook Response";
+                return 'Webhook Response';
             case self::EVENT_PDF_RESPONSE:
-                return "Pdf Response";
+                return 'Pdf Response';
             case self::EVENT_AUTHENTICATION_FAILURE:
-                return "Auth Failure";
+                return 'Auth Failure';
             case self::EVENT_USER:
-                return "User";                                                
+                return 'User';
             default:
                 return 'undefined';
         }
@@ -180,47 +214,45 @@ class SystemLog extends Model
     {
         switch ($this->type_id) {
             case self::TYPE_QUOTA_EXCEEDED:
-                return "Quota Exceeded";
+                return 'Quota Exceeded';
             case self::TYPE_UPSTREAM_FAILURE:
-                return "Upstream Failure";
+                return 'Upstream Failure';
             case self::TYPE_WEBHOOK_RESPONSE:
-                return "Webhook";            
+                return 'Webhook';
             case self::TYPE_PDF_FAILURE:
-                return "Failure";
+                return 'Failure';
             case self::TYPE_PDF_SUCCESS:
-                return "Success";
+                return 'Success';
             case self::TYPE_MODIFIED:
-                return "Modified";
+                return 'Modified';
             case self::TYPE_DELETED:
-                return "Deleted";  
+                return 'Deleted';
             case self::TYPE_LOGIN_SUCCESS:
-                return "Login Success";    
+                return 'Login Success';
             case self::TYPE_LOGIN_FAILURE:
-                return "Login Failure";
+                return 'Login Failure';
             case self::TYPE_PAYPAL:
-                return "PayPal";
+                return 'PayPal';
             case self::TYPE_STRIPE:
-                return "Stripe";
+                return 'Stripe';
             case self::TYPE_LEDGER:
-                return "Ledger";
+                return 'Ledger';
             case self::TYPE_FAILURE:
-                return "Failure";
+                return 'Failure';
             case self::TYPE_CHECKOUT:
-                return "Checkout";
+                return 'Checkout';
             case self::TYPE_AUTHORIZE:
-                return "Auth.net";
+                return 'Auth.net';
             case self::TYPE_CUSTOM:
-                return "Custom";
+                return 'Custom';
             case self::TYPE_BRAINTREE:
-                return "Braintree";
+                return 'Braintree';
             case self::TYPE_WEPAY:
-                return "WePay";
+                return 'WePay';
             case self::TYPE_PAYFAST:
-                return "Payfast";
+                return 'Payfast';
             default:
                 return 'undefined';
         }
     }
 }
-
-    
\ No newline at end of file
diff --git a/app/Models/Task.php b/app/Models/Task.php
index 0693eb0041c7..4e463e575c88 100644
--- a/app/Models/Task.php
+++ b/app/Models/Task.php
@@ -20,7 +20,7 @@ class Task extends BaseModel
     use MakesHash;
     use SoftDeletes;
     use Filterable;
-    
+
     protected $fillable = [
         'client_id',
         'invoice_id',
@@ -89,15 +89,6 @@ class Task extends BaseModel
         return $this->belongsTo(Project::class)->withTrashed();
     }
 
-
-
-
-
-
-
-
-
-
     public function calcStartTime()
     {
         $parts = json_decode($this->time_log) ?: [];
@@ -152,4 +143,4 @@ class Task extends BaseModel
     {
         return ctrans('texts.task');
     }
-}
\ No newline at end of file
+}
diff --git a/app/Models/TaskStatus.php b/app/Models/TaskStatus.php
index b6a71c6bfeca..9c18a5a4e2ef 100644
--- a/app/Models/TaskStatus.php
+++ b/app/Models/TaskStatus.php
@@ -21,20 +21,18 @@ class TaskStatus extends BaseModel
 {
     use SoftDeletes;
     use Filterable;
-    
+
     /**
      * @var bool
      */
     public $timestamps = true;
+
     /**
      * @var array
      */
-    protected $dates = ['deleted_at'];
-
     protected $fillable = [
         'name',
         'color',
         'status_order',
     ];
-
 }
diff --git a/app/Models/TaxRate.php b/app/Models/TaxRate.php
index 6c17642cb43c..7c22bd47ec7b 100644
--- a/app/Models/TaxRate.php
+++ b/app/Models/TaxRate.php
@@ -20,7 +20,7 @@ class TaxRate extends BaseModel
     use MakesHash;
     use SoftDeletes;
     use Filterable;
-    
+
     protected $fillable = [
         'name',
         'rate',
diff --git a/app/Models/TransactionEvent.php b/app/Models/TransactionEvent.php
index 5cf8b65ff74d..86b500abc233 100644
--- a/app/Models/TransactionEvent.php
+++ b/app/Models/TransactionEvent.php
@@ -16,7 +16,6 @@ namespace App\Models;
  */
 class TransactionEvent extends StaticModel
 {
-
     public $timestamps = false;
 
     public $guarded = ['id'];
@@ -28,19 +27,30 @@ class TransactionEvent extends StaticModel
     ];
 
     public const INVOICE_MARK_PAID = 1;
+
     public const INVOICE_UPDATED = 2;
+
     public const INVOICE_DELETED = 3;
+
     public const INVOICE_PAYMENT_APPLIED = 4;
+
     public const INVOICE_CANCELLED = 5;
+
     public const INVOICE_FEE_APPLIED = 6;
+
     public const INVOICE_REVERSED = 7;
-    
+
     public const PAYMENT_MADE = 100;
+
     public const PAYMENT_APPLIED = 101;
+
     public const PAYMENT_REFUND = 102;
+
     public const PAYMENT_FAILED = 103;
+
     public const GATEWAY_PAYMENT_MADE = 104;
+
     public const PAYMENT_DELETED = 105;
-    
+
     public const CLIENT_STATUS = 200;
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index a58c6e4caac1..a0494419a0ed 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -48,8 +48,6 @@ class User extends Authenticatable implements MustVerifyEmail
 
     protected $guard = 'user';
 
-    protected $dates = ['deleted_at'];
-
     protected $presenter = UserPresenter::class;
 
     protected $with = []; // ? companies also
@@ -109,10 +107,9 @@ class User extends Authenticatable implements MustVerifyEmail
         'oauth_user_token_expiry' => 'datetime',
     ];
 
-
     public function name()
     {
-        return $this->first_name . ' ' . $this->last_name;
+        return $this->first_name.' '.$this->last_name;
     }
 
     public function getEntityType()
@@ -149,7 +146,7 @@ class User extends Authenticatable implements MustVerifyEmail
     {
         $truth = app()->make(TruthSource::class);
 
-        if($truth->getCompanyToken()){
+        if ($truth->getCompanyToken()) {
             return $truth->getCompanyToken();
         }
 
@@ -190,13 +187,11 @@ class User extends Authenticatable implements MustVerifyEmail
     {
         $truth = app()->make(TruthSource::class);
 
-        if ($this->company){
+        if ($this->company) {
             return $this->company;
-        }
-        elseif($truth->getCompany()){
+        } elseif ($truth->getCompany()) {
             return $truth->getCompany();
-        }
-        elseif (request()->header('X-API-TOKEN')) {
+        } elseif (request()->header('X-API-TOKEN')) {
             $company_token = CompanyToken::with(['company'])->where('token', request()->header('X-API-TOKEN'))->first();
 
             return $company_token->company;
@@ -207,8 +202,9 @@ class User extends Authenticatable implements MustVerifyEmail
 
     public function companyIsSet()
     {
-        if($this->company)
+        if ($this->company) {
             return true;
+        }
 
         return false;
     }
@@ -239,29 +235,29 @@ class User extends Authenticatable implements MustVerifyEmail
     {
         $truth = app()->make(TruthSource::class);
 
-        if($truth->getCompanyUser()){
+        if ($truth->getCompanyUser()) {
             return $truth->getCompanyUser();
         }
-        
-        return $this->token()->cu;
 
+        return $this->token()->cu;
     }
 
     public function company_user()
     {
-        if($this->companyId())
+        if ($this->companyId()) {
             return $this->belongsTo(CompanyUser::class)->where('company_id', $this->companyId())->withTrashed();
+        }
 
         $truth = app()->make(TruthSource::class);
 
-        if($truth->getCompanyUser())
+        if ($truth->getCompanyUser()) {
             return $truth->getCompanyUser();
-        
+        }
+
         return $this->token()->cu;
 
         // return $this->hasOneThrough(CompanyUser::class, CompanyToken::class, 'user_id', 'user_id', 'id', 'user_id')
         // ->withTrashed();
-
     }
 
     /**
@@ -287,7 +283,7 @@ class User extends Authenticatable implements MustVerifyEmail
     public function permissions()
     {
         return $this->token()->cu->permissions;
-        
+
         // return $this->company_user->permissions;
     }
 
@@ -312,13 +308,13 @@ class User extends Authenticatable implements MustVerifyEmail
     {
         return $this->token()->cu->is_admin;
 
-       // return $this->company_user->is_admin;
+        // return $this->company_user->is_admin;
     }
 
     public function isOwner() : bool
     {
         return $this->token()->cu->is_owner;
-        
+
         // return $this->company_user->is_owner;
     }
 
@@ -402,9 +398,9 @@ class User extends Authenticatable implements MustVerifyEmail
 
     public function routeNotificationForSlack($notification)
     {
-
-        if($this->token()->cu->slack_webhook_url)
+        if ($this->token()->cu->slack_webhook_url) {
             return $this->token()->cu->slack_webhook_url;
+        }
     }
 
     public function routeNotificationForMail($notification)
@@ -434,9 +430,8 @@ class User extends Authenticatable implements MustVerifyEmail
      */
     public function sendPasswordResetNotification($token)
     {
-
         $nmo = new NinjaMailerObject;
-        $nmo->mailable = new NinjaMailer( (new ResetPasswordObject($token, $this, $this->account->default_company))->build());
+        $nmo->mailable = new NinjaMailer((new ResetPasswordObject($token, $this, $this->account->default_company))->build());
         $nmo->to_user = $this;
         $nmo->settings = $this->account->default_company->settings;
         $nmo->company = $this->account->default_company;
diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php
index a1d98692aa9d..f267e9201cfa 100644
--- a/app/Models/Vendor.php
+++ b/app/Models/Vendor.php
@@ -64,7 +64,7 @@ class Vendor extends BaseModel
     protected $touches = [];
 
     protected $with = [
-    //    'contacts',
+        'company',
     ];
 
     protected $presenter = VendorPresenter::class;
@@ -79,7 +79,6 @@ class Vendor extends BaseModel
         return $this->hasMany(VendorContact::class)->where('is_primary', true);
     }
 
-
     public function documents()
     {
         return $this->morphMany(Document::class, 'documentable');
@@ -104,18 +103,19 @@ class Vendor extends BaseModel
     {
         $currencies = Cache::get('currencies');
 
-        if(!$currencies)
+        if (! $currencies) {
             $this->buildCache(true);
+        }
 
-        if(!$this->currency_id)
+        if (! $this->currency_id) {
             $this->currency_id = 1;
+        }
 
         return $currencies->filter(function ($item) {
             return $item->id == $this->currency_id;
         })->first();
     }
 
-
     public function company()
     {
         return $this->belongsTo(Company::class);
@@ -158,9 +158,7 @@ class Vendor extends BaseModel
     {
         if ((property_exists($this->company->settings, $setting) != false) && (isset($this->company->settings->{$setting}) !== false)) {
             return $this->company->settings->{$setting};
-        }
-
-        elseif( property_exists(CompanySettings::defaults(), $setting) ) {
+        } elseif (property_exists(CompanySettings::defaults(), $setting)) {
             return CompanySettings::defaults()->{$setting};
         }
 
@@ -168,16 +166,19 @@ class Vendor extends BaseModel
     }
 
     public function purchase_order_filepath($invitation)
-    {   
+    {
         $contact_key = $invitation->contact->contact_key;
-        
+
         return $this->company->company_key.'/'.$this->vendor_hash.'/'.$contact_key.'/purchase_orders/';
     }
 
+    public function locale()
+    {
+        return $this->company->locale();
+    }
+
     public function country()
     {
         return $this->belongsTo(Country::class);
     }
-
-
 }
diff --git a/app/Models/VendorContact.php b/app/Models/VendorContact.php
index d0661f943a95..72479d5a6939 100644
--- a/app/Models/VendorContact.php
+++ b/app/Models/VendorContact.php
@@ -41,10 +41,6 @@ class VendorContact extends Authenticatable implements HasLocalePreference
     /* Allow microtime timestamps */
     protected $dateFormat = 'Y-m-d H:i:s.u';
 
-    protected $dates = [
-        'deleted_at',
-    ];
-
     protected $appends = [
         'hashed_id',
     ];
@@ -81,7 +77,7 @@ class VendorContact extends Authenticatable implements HasLocalePreference
 
         return asset('images/svg/user.svg');
     }
-    
+
     public function setAvatarAttribute($value)
     {
         if (! filter_var($value, FILTER_VALIDATE_URL) && $value) {
@@ -138,7 +134,6 @@ class VendorContact extends Authenticatable implements HasLocalePreference
         return $languages->filter(function ($item) {
             return $item->id == $this->company->getSetting('language_id');
         })->first()->locale;
-
     }
 
     /**
@@ -154,8 +149,18 @@ class VendorContact extends Authenticatable implements HasLocalePreference
             ->withTrashed()
             ->where('id', $this->decodePrimaryKey($value))->firstOrFail();
     }
+
     public function purchase_order_invitations(): \Illuminate\Database\Eloquent\Relations\HasMany
     {
         return $this->hasMany(PurchaseOrderInvitation::class);
     }
+
+    public function getLoginLink()
+    {
+
+        $domain = isset($this->company->portal_domain) ? $this->company->portal_domain : $this->company->domain();
+
+        return $domain.'/vendor/key_login/'.$this->contact_key;
+
+    }
 }
diff --git a/app/Models/Webhook.php b/app/Models/Webhook.php
index a1129448e310..fb0bb4b73180 100644
--- a/app/Models/Webhook.php
+++ b/app/Models/Webhook.php
@@ -19,32 +19,56 @@ class Webhook extends BaseModel
     use Filterable;
 
     const EVENT_CREATE_CLIENT = 1;
+
     const EVENT_CREATE_INVOICE = 2;
+
     const EVENT_CREATE_QUOTE = 3;
+
     const EVENT_CREATE_PAYMENT = 4;
+
     const EVENT_CREATE_VENDOR = 5;
+
     const EVENT_UPDATE_QUOTE = 6;
+
     const EVENT_DELETE_QUOTE = 7;
+
     const EVENT_UPDATE_INVOICE = 8;
+
     const EVENT_DELETE_INVOICE = 9;
+
     const EVENT_UPDATE_CLIENT = 10;
+
     const EVENT_DELETE_CLIENT = 11;
+
     const EVENT_DELETE_PAYMENT = 12;
+
     const EVENT_UPDATE_VENDOR = 13;
+
     const EVENT_DELETE_VENDOR = 14;
+
     const EVENT_CREATE_EXPENSE = 15;
+
     const EVENT_UPDATE_EXPENSE = 16;
+
     const EVENT_DELETE_EXPENSE = 17;
+
     const EVENT_CREATE_TASK = 18;
+
     const EVENT_UPDATE_TASK = 19;
+
     const EVENT_DELETE_TASK = 20;
+
     const EVENT_APPROVE_QUOTE = 21;
+
     const EVENT_LATE_INVOICE = 22;
+
     const EVENT_EXPIRED_QUOTE = 23;
+
     const EVENT_REMIND_INVOICE = 24;
+
     const EVENT_PROJECT_CREATE = 25;
+
     const EVENT_PROJECT_UPDATE = 26;
-    
 
     public static $valid_events = [
         self::EVENT_CREATE_CLIENT,
@@ -72,7 +96,7 @@ class Webhook extends BaseModel
         self::EVENT_EXPIRED_QUOTE,
         self::EVENT_REMIND_INVOICE,
         self::EVENT_PROJECT_CREATE,
-        self::EVENT_PROJECT_UPDATE
+        self::EVENT_PROJECT_UPDATE,
     ];
 
     protected $fillable = [
diff --git a/app/Notifications/Admin/EntitySentNotification.php b/app/Notifications/Admin/EntitySentNotification.php
index f22ca056bb0e..d398e0594c98 100644
--- a/app/Notifications/Admin/EntitySentNotification.php
+++ b/app/Notifications/Admin/EntitySentNotification.php
@@ -24,7 +24,6 @@ use Illuminate\Queue\SerializesModels;
 //@deprecated
 class EntitySentNotification extends Notification
 {
-    
     /**
      * Create a new notification instance.
      *
@@ -102,17 +101,17 @@ class EntitySentNotification extends Notification
                     ->content(trans(
                         "texts.notification_{$this->entity_name}_sent_subject",
                         [
-                        'amount' => $amount,
-                        'client' => $this->contact->client->present()->name(),
-                        'invoice' => $this->entity->number,
-                    ]
+                            'amount' => $amount,
+                            'client' => $this->contact->client->present()->name(),
+                            'invoice' => $this->entity->number,
+                        ]
                     ))
                     ->attachment(function ($attachment) use ($amount) {
                         $attachment->title(ctrans('texts.invoice_number_placeholder', ['invoice' => $this->entity->number]), $this->invitation->getAdminLink())
                                    ->fields([
-                                        ctrans('texts.client') => $this->contact->client->present()->name(),
-                                        ctrans('texts.amount') => $amount,
-                                    ]);
+                                       ctrans('texts.client') => $this->contact->client->present()->name(),
+                                       ctrans('texts.amount') => $amount,
+                                   ]);
                     });
     }
 }
diff --git a/app/Notifications/Admin/EntityViewedNotification.php b/app/Notifications/Admin/EntityViewedNotification.php
index 2784406de370..04d5d8fdb739 100644
--- a/app/Notifications/Admin/EntityViewedNotification.php
+++ b/app/Notifications/Admin/EntityViewedNotification.php
@@ -23,7 +23,6 @@ use Illuminate\Queue\SerializesModels;
 
 class EntityViewedNotification extends Notification
 {
-
     /**
      * Create a new notification instance.
      *
@@ -110,9 +109,9 @@ class EntityViewedNotification extends Notification
             ->attachment(function ($attachment) use ($amount) {
                 $attachment->title(ctrans('texts.entity_number_placeholder', ['entity' => ucfirst($this->entity_name), 'entity_number' => $this->entity->number]), $this->invitation->getAdminLink())
                            ->fields([
-                                ctrans('texts.client') => $this->contact->present()->name(),
-                                ctrans('texts.status_viewed') => $this->invitation->viewed_date,
-                            ]);
+                               ctrans('texts.client') => $this->contact->present()->name(),
+                               ctrans('texts.status_viewed') => $this->invitation->viewed_date,
+                           ]);
             });
     }
 
@@ -146,9 +145,9 @@ class EntityViewedNotification extends Notification
         $subject = ctrans(
             "texts.notification_{$this->entity_name}_viewed_subject",
             [
-            'client' => $this->contact->present()->name(),
-            $this->entity_name => $this->entity->number,
-        ]
+                'client' => $this->contact->present()->name(),
+                $this->entity_name => $this->entity->number,
+            ]
         );
 
         return $subject;
diff --git a/app/Notifications/Admin/NewPaymentNotification.php b/app/Notifications/Admin/NewPaymentNotification.php
index 65898af49a65..60078e887385 100644
--- a/app/Notifications/Admin/NewPaymentNotification.php
+++ b/app/Notifications/Admin/NewPaymentNotification.php
@@ -23,7 +23,6 @@ use Illuminate\Queue\SerializesModels;
 
 class NewPaymentNotification extends Notification
 {
-
     /**
      * Create a new notification instance.
      *
@@ -102,8 +101,8 @@ class NewPaymentNotification extends Notification
                 ->content(ctrans(
                     'texts.notification_payment_paid',
                     ['amount' => $amount,
-                    'client' => $this->payment->client->present()->name(),
-                    'invoice' => $invoice_texts, ]
+                        'client' => $this->payment->client->present()->name(),
+                        'invoice' => $invoice_texts, ]
                 ));
     }
 }
diff --git a/app/Notifications/BaseNotification.php b/app/Notifications/BaseNotification.php
index 1533e2b61fe1..20a73b431b72 100644
--- a/app/Notifications/BaseNotification.php
+++ b/app/Notifications/BaseNotification.php
@@ -20,9 +20,9 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
 
-class BaseNotification extends Notification 
+class BaseNotification extends Notification
 {
-  //  use Queueable;
+    //  use Queueable;
     use MakesInvoiceHtml;
 
     /**
@@ -94,11 +94,11 @@ class BaseNotification extends Notification
         }
 
         if ($this->entity instanceof Invoice && $this->settings->ubl_email_attachment) {
-            $ubl_string = CreateUbl::dispatchNow($this->entity);
+            $ubl_string = (new Createubl($this->entity))->handle();
             $mail_message->attachData($ubl_string, $this->entity->getFileName('xml'));
         }
 
-        return $mail_message->withSwiftMessage(function ($message) {
+        return $mail_message->withSymfonyMessage(function ($message) {
             $message->getHeaders()->addTextHeader('Tag', $this->invitation->company->company_key);
         });
     }
diff --git a/app/Notifications/ClientContactRequestCancellation.php b/app/Notifications/ClientContactRequestCancellation.php
index 0da893a15bf9..bf4e831e17fb 100644
--- a/app/Notifications/ClientContactRequestCancellation.php
+++ b/app/Notifications/ClientContactRequestCancellation.php
@@ -23,9 +23,9 @@ use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Mail;
 
 //@deprecated for mail
-class ClientContactRequestCancellation extends Notification 
+class ClientContactRequestCancellation extends Notification
 {
-  //  use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    //  use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     /**
      * Create a new notification instance.
diff --git a/app/Notifications/ClientContactResetPassword.php b/app/Notifications/ClientContactResetPassword.php
index 32c83ae33891..48f6e4ab15db 100644
--- a/app/Notifications/ClientContactResetPassword.php
+++ b/app/Notifications/ClientContactResetPassword.php
@@ -22,7 +22,7 @@ use Illuminate\Queue\SerializesModels;
 //@deprecated
 class ClientContactResetPassword extends Notification
 {
-   // use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    // use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
     /**
      * The password reset token.
      *
diff --git a/app/Notifications/Ninja/EmailBounceNotification.php b/app/Notifications/Ninja/EmailBounceNotification.php
index e8c52efcb6db..3a4506093149 100644
--- a/app/Notifications/Ninja/EmailBounceNotification.php
+++ b/app/Notifications/Ninja/EmailBounceNotification.php
@@ -20,15 +20,13 @@ use Illuminate\Notifications\Notification;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class EmailBounceNotification extends Notification 
+class EmailBounceNotification extends Notification
 {
-
     /**
      * Create a new notification instance.
      *
      * @return void
      */
-
     protected $account;
 
     public function __construct($account)
@@ -72,7 +70,6 @@ class EmailBounceNotification extends Notification
 
     public function toSlack($notifiable)
     {
-
         $content = "Email bounce notification for Account {$this->account->key} \n";
 
         $owner = $this->account->companies()->first()->owner();
diff --git a/app/Notifications/Ninja/EmailQuotaNotification.php b/app/Notifications/Ninja/EmailQuotaNotification.php
index 083dba7eb58f..775240c9ac1b 100644
--- a/app/Notifications/Ninja/EmailQuotaNotification.php
+++ b/app/Notifications/Ninja/EmailQuotaNotification.php
@@ -20,15 +20,13 @@ use Illuminate\Notifications\Notification;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class EmailQuotaNotification extends Notification 
+class EmailQuotaNotification extends Notification
 {
-
     /**
      * Create a new notification instance.
      *
      * @return void
      */
-
     protected $account;
 
     public function __construct($account)
@@ -72,7 +70,6 @@ class EmailQuotaNotification extends Notification
 
     public function toSlack($notifiable)
     {
-
         $content = "Email quota exceeded by Account {$this->account->key} \n";
 
         $owner = $this->account->companies()->first()->owner();
diff --git a/app/Notifications/Ninja/EmailSpamNotification.php b/app/Notifications/Ninja/EmailSpamNotification.php
index 243cea0d6892..dab6d0c339f5 100644
--- a/app/Notifications/Ninja/EmailSpamNotification.php
+++ b/app/Notifications/Ninja/EmailSpamNotification.php
@@ -20,15 +20,13 @@ use Illuminate\Notifications\Notification;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class EmailSpamNotification extends Notification 
+class EmailSpamNotification extends Notification
 {
-
     /**
      * Create a new notification instance.
      *
      * @return void
      */
-
     protected $account;
 
     public function __construct($account)
@@ -72,7 +70,6 @@ class EmailSpamNotification extends Notification
 
     public function toSlack($notifiable)
     {
-
         $content = "Email SPAM notification for Account {$this->account->key} \n";
 
         $owner = $this->account->companies()->first()->owner();
diff --git a/app/Notifications/Ninja/GmailCredentialNotification.php b/app/Notifications/Ninja/GmailCredentialNotification.php
index b75a7a726ce4..64c0fdd0da89 100644
--- a/app/Notifications/Ninja/GmailCredentialNotification.php
+++ b/app/Notifications/Ninja/GmailCredentialNotification.php
@@ -20,15 +20,13 @@ use Illuminate\Notifications\Notification;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class GmailCredentialNotification extends Notification 
+class GmailCredentialNotification extends Notification
 {
-
     /**
      * Create a new notification instance.
      *
      * @return void
      */
-
     protected $account;
 
     public function __construct($account)
@@ -72,7 +70,6 @@ class GmailCredentialNotification extends Notification
 
     public function toSlack($notifiable)
     {
-
         $content = "GMail credentials invalid for Account {$this->account->key} \n";
 
         $owner = $this->account->companies()->first()->owner();
diff --git a/app/Notifications/Ninja/NewAccountCreated.php b/app/Notifications/Ninja/NewAccountCreated.php
index f7d130b8ba0d..2dff1c41c3ed 100644
--- a/app/Notifications/Ninja/NewAccountCreated.php
+++ b/app/Notifications/Ninja/NewAccountCreated.php
@@ -20,11 +20,10 @@ use Illuminate\Notifications\Notification;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-
 //@deprecated
-class NewAccountCreated extends Notification 
+class NewAccountCreated extends Notification
 {
-   // use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    // use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     /**
      * Create a new notification instance.
diff --git a/app/Notifications/Ninja/SpamNotification.php b/app/Notifications/Ninja/SpamNotification.php
index 061c720e3865..9c85bb1565dc 100644
--- a/app/Notifications/Ninja/SpamNotification.php
+++ b/app/Notifications/Ninja/SpamNotification.php
@@ -29,7 +29,7 @@ class SpamNotification extends Notification
      * @return void
      */
 
-    protected array $spam_list;
+    public array $spam_list;
 
     public function __construct($spam_list)
     {
@@ -74,43 +74,45 @@ class SpamNotification extends Notification
     {
         $content = '';
 
-        foreach($this->spam_list as $spam_list)
-        {
+        // foreach($this->spam_lists as $spam_list)
+        // {
 
-            if(array_key_exists('companies', $spam_list))
+            if(array_key_exists('companies', $this->spam_list))
             {
                 $content .= " Companies \n";
 
-                foreach($spam_list['companies'] as $company)
+                foreach($this->spam_list['companies'] as $company)
                 {
                     $content .= "{$company['name']} - c_key={$company['company_key']} - a_key={$company['account_key']} - {$company['owner']} \n";
                 }
             }
 
-            if(array_key_exists('templates', $spam_list))
+            if(array_key_exists('templates', $this->spam_list))
             {
                 $content .= " Templates \n";
 
-                foreach($spam_list['templates'] as $company)
+                foreach($this->spam_list['templates'] as $company)
                 {
                     $content .= "{$company['name']} - c_key={$company['company_key']} - a_key={$company['account_key']} - {$company['owner']} \n";
                 }
             }
 
 
-            if(array_key_exists('users', $spam_list))
+            if(array_key_exists('users', $this->spam_list))
             {
 
                 $content .= ' Users \n';
 
-                foreach($spam_list['users'] as $user)
+                foreach($this->spam_list['users'] as $user)
                 {
                     $content .= "{$user['email']} - a_key={$user['account_key']} - created={$user['created']} \n";
                 }
 
             }
 
-        }
+        // }
+
+
 
         return (new SlackMessage)
                 ->success()
diff --git a/app/Notifications/Ninja/VerifyUser.php b/app/Notifications/Ninja/VerifyUser.php
index e7361deeb342..6b73c98741bb 100644
--- a/app/Notifications/Ninja/VerifyUser.php
+++ b/app/Notifications/Ninja/VerifyUser.php
@@ -20,9 +20,9 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
 //@deprecated
-class VerifyUser extends Notification 
+class VerifyUser extends Notification
 {
-  //  use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    //  use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     /**
      * Create a new notification instance.
diff --git a/app/Notifications/Ninja/WePayFailureNotification.php b/app/Notifications/Ninja/WePayFailureNotification.php
index f08b2e8ca02a..17f5eb2c0c26 100644
--- a/app/Notifications/Ninja/WePayFailureNotification.php
+++ b/app/Notifications/Ninja/WePayFailureNotification.php
@@ -20,15 +20,13 @@ use Illuminate\Notifications\Notification;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class WePayFailureNotification extends Notification 
+class WePayFailureNotification extends Notification
 {
-
     /**
      * Create a new notification instance.
      *
      * @return void
      */
-
     protected $company_id;
 
     public function __construct($company_id)
@@ -72,15 +70,16 @@ class WePayFailureNotification extends Notification
 
     public function toSlack($notifiable)
     {
-        $ip = "";
- 
-        if(request())
-            $ip = request()->getClientIp();
+        $ip = '';
 
-       return  (new SlackMessage)
+        if (request()) {
+            $ip = request()->getClientIp();
+        }
+
+        return  (new SlackMessage)
                 ->success()
                 ->from(ctrans('texts.notification_bot'))
                 ->image('https://app.invoiceninja.com/favicon.png')
-                ->content("New WePay ACH Failure from Company ID: {$this->company_id} IP: {$ip}" );
+                ->content("New WePay ACH Failure from Company ID: {$this->company_id} IP: {$ip}");
     }
 }
diff --git a/app/Observers/CompanyGatewayObserver.php b/app/Observers/CompanyGatewayObserver.php
index 4c483819824b..22e0c8e8fa96 100644
--- a/app/Observers/CompanyGatewayObserver.php
+++ b/app/Observers/CompanyGatewayObserver.php
@@ -56,8 +56,8 @@ class CompanyGatewayObserver
     {
         //When we restore the gateway, bring back the tokens!
         ClientGatewayToken::where('company_gateway_id', $company_gateway->id)
-                          ->withTrashed()->cursor()->each(function ($cgt){
-                            $cgt->restore();
+                          ->withTrashed()->cursor()->each(function ($cgt) {
+                              $cgt->restore();
                           });
     }
 
diff --git a/app/Observers/CompanyObserver.php b/app/Observers/CompanyObserver.php
index 6644c88259e0..79a9bcc346b8 100644
--- a/app/Observers/CompanyObserver.php
+++ b/app/Observers/CompanyObserver.php
@@ -36,10 +36,8 @@ class CompanyObserver
      */
     public function updated(Company $company)
     {
-
-        if(Ninja::isHosted() && $company->portal_mode == 'domain' && $company->isDirty('portal_domain'))
-        {
-            //fire event to build new custom portal domain 
+        if (Ninja::isHosted() && $company->portal_mode == 'domain' && $company->isDirty('portal_domain')) {
+            //fire event to build new custom portal domain
             \Modules\Admin\Jobs\Domain\CustomDomain::dispatch($company->getOriginal('portal_domain'), $company)->onQueue('domain');
         }
     }
diff --git a/app/Observers/CreditObserver.php b/app/Observers/CreditObserver.php
index b49e2f5ef289..497e32e6dc82 100644
--- a/app/Observers/CreditObserver.php
+++ b/app/Observers/CreditObserver.php
@@ -37,7 +37,6 @@ class CreditObserver
      */
     public function updated(Credit $credit)
     {
-
     }
 
     /**
@@ -48,7 +47,6 @@ class CreditObserver
      */
     public function deleted(Credit $credit)
     {
-
     }
 
     /**
diff --git a/app/Observers/InvoiceObserver.php b/app/Observers/InvoiceObserver.php
index 9650579f0e66..0aa0c984d7ef 100644
--- a/app/Observers/InvoiceObserver.php
+++ b/app/Observers/InvoiceObserver.php
@@ -20,7 +20,7 @@ use App\Models\Webhook;
 class InvoiceObserver
 {
     public $afterCommit = true;
-    
+
     /**
      * Handle the client "created" event.
      *
@@ -29,13 +29,11 @@ class InvoiceObserver
      */
     public function created(Invoice $invoice)
     {
-
         $subscriptions = Webhook::where('company_id', $invoice->company_id)
                             ->where('event_id', Webhook::EVENT_CREATE_INVOICE)
                             ->exists();
 
         if ($subscriptions) {
-    
             WebhookHandler::dispatch(Webhook::EVENT_CREATE_INVOICE, $invoice, $invoice->company, 'client')->delay(now()->addSeconds(2));
         }
     }
@@ -48,17 +46,13 @@ class InvoiceObserver
      */
     public function updated(Invoice $invoice)
     {
-            
         $subscriptions = Webhook::where('company_id', $invoice->company_id)
                             ->where('event_id', Webhook::EVENT_UPDATE_INVOICE)
                             ->exists();
 
         if ($subscriptions) {
-                
             WebhookHandler::dispatch(Webhook::EVENT_UPDATE_INVOICE, $invoice, $invoice->company, 'client')->delay(now()->addSeconds(2));
-        
         }
-
     }
 
     /**
@@ -74,7 +68,6 @@ class InvoiceObserver
                             ->exists();
 
         if ($subscriptions) {
-        
             WebhookHandler::dispatch(Webhook::EVENT_DELETE_INVOICE, $invoice, $invoice->company, 'client')->delay(now()->addSeconds(2));
         }
     }
diff --git a/app/Observers/ProjectObserver.php b/app/Observers/ProjectObserver.php
index 8c88a6c8eb9b..fe4fc35f787a 100644
--- a/app/Observers/ProjectObserver.php
+++ b/app/Observers/ProjectObserver.php
@@ -18,6 +18,7 @@ use App\Models\Webhook;
 class ProjectObserver
 {
     public $afterCommit = true;
+
     /**
      * Handle the product "created" event.
      *
@@ -31,7 +32,6 @@ class ProjectObserver
                             ->exists();
 
         if ($subscriptions) {
-    
             WebhookHandler::dispatch(Webhook::EVENT_PROJECT_CREATE, $project, $project->company, 'client')->delay(now()->addSeconds(2));
         }
     }
@@ -49,7 +49,6 @@ class ProjectObserver
                             ->exists();
 
         if ($subscriptions) {
-    
             WebhookHandler::dispatch(Webhook::EVENT_PROJECT_UPDATE, $project, $project->company, 'client')->delay(now()->addSeconds(2));
         }
     }
diff --git a/app/Observers/PurchaseOrderObserver.php b/app/Observers/PurchaseOrderObserver.php
index 4af8e1722ab5..3cb431e16da3 100644
--- a/app/Observers/PurchaseOrderObserver.php
+++ b/app/Observers/PurchaseOrderObserver.php
@@ -11,7 +11,6 @@
 
 namespace App\Observers;
 
-
 use App\Models\PurchaseOrder;
 
 class PurchaseOrderObserver
@@ -34,7 +33,6 @@ class PurchaseOrderObserver
      */
     public function updated(PurchaseOrder $purchase_order)
     {
-
     }
 
     /**
@@ -45,7 +43,6 @@ class PurchaseOrderObserver
      */
     public function deleted(PurchaseOrder $purchase_order)
     {
-
     }
 
     /**
diff --git a/app/Observers/QuoteObserver.php b/app/Observers/QuoteObserver.php
index 55e24d8e9b5c..1c6adccf6225 100644
--- a/app/Observers/QuoteObserver.php
+++ b/app/Observers/QuoteObserver.php
@@ -30,7 +30,6 @@ class QuoteObserver
                         ->where('event_id', Webhook::EVENT_CREATE_QUOTE)
                         ->exists();
 
-
         if ($subscriptions) {
             $quote->load('client');
             WebhookHandler::dispatch(Webhook::EVENT_CREATE_QUOTE, $quote, $quote->company, 'client')->delay(now()->addSeconds(2));
@@ -49,13 +48,10 @@ class QuoteObserver
                         ->where('event_id', Webhook::EVENT_UPDATE_QUOTE)
                         ->exists();
 
-
-
         if ($subscriptions) {
             $quote->load('client');
             WebhookHandler::dispatch(Webhook::EVENT_UPDATE_QUOTE, $quote, $quote->company, 'client')->delay(now()->addSeconds(2));
         }
-
     }
 
     /**
diff --git a/app/PaymentDrivers/Authorize/AuthorizeCreateCustomer.php b/app/PaymentDrivers/Authorize/AuthorizeCreateCustomer.php
index 61f01f260866..84477c155554 100644
--- a/app/PaymentDrivers/Authorize/AuthorizeCreateCustomer.php
+++ b/app/PaymentDrivers/Authorize/AuthorizeCreateCustomer.php
@@ -80,49 +80,40 @@ class AuthorizeCreateCustomer
 
     public function get($profileIdRequested)
     {
-
         error_reporting(E_ALL & ~E_DEPRECATED);
 
         $this->authorize->init();
         $request = new GetCustomerProfileRequest();
         $request->setMerchantAuthentication($this->authorize->merchant_authentication);
         $request->setCustomerProfileId($profileIdRequested);
-        
+
         $controller = new GetCustomerProfileController($request);
         $response = $controller->executeWithApiResponse($this->authorize->merchant_authentication);
 
-        if (($response != null) && ($response->getMessages()->getResultCode() == "Ok") )
-        {
-            echo "GetCustomerProfile SUCCESS : " .  "\n";
+        if (($response != null) && ($response->getMessages()->getResultCode() == 'Ok')) {
+            echo 'GetCustomerProfile SUCCESS : '."\n";
             $profileSelected = $response->getProfile();
             $paymentProfilesSelected = $profileSelected->getPaymentProfiles();
-            echo "Profile Has " . count($paymentProfilesSelected). " Payment Profiles" . "\n";
-
-                if($response->getSubscriptionIds() != null) 
-                {
-                    if($response->getSubscriptionIds() != null)
-                    {
-
-                        echo "List of subscriptions:";
-                        foreach($response->getSubscriptionIds() as $subscriptionid)
-                            echo $subscriptionid . "\n";
+            echo 'Profile Has '.count($paymentProfilesSelected).' Payment Profiles'."\n";
 
+            if ($response->getSubscriptionIds() != null) {
+                if ($response->getSubscriptionIds() != null) {
+                    echo 'List of subscriptions:';
+                    foreach ($response->getSubscriptionIds() as $subscriptionid) {
+                        echo $subscriptionid."\n";
                     }
                 }
-        }
-        else
-        {
+            }
+        } else {
             echo "ERROR :  GetCustomerProfile: Invalid response\n";
             $errorMessages = $response->getMessages()->getMessage();
-            echo "Response : " . $errorMessages[0]->getCode() . "  " .$errorMessages[0]->getText() . "\n";
+            echo 'Response : '.$errorMessages[0]->getCode().'  '.$errorMessages[0]->getText()."\n";
         }
 
         return $response;
     }
 
-
-
-// This is how we can harvest client profiles and attach them within Invoice Ninja
+    // This is how we can harvest client profiles and attach them within Invoice Ninja
 // $request = new net\authorize\api\contract\v1\GetCustomerProfileRequest();
 // $request->setMerchantAuthentication($driver->merchant_authentication);
 // $request->setCustomerProfileId($gateway_customer_reference);
@@ -144,5 +135,4 @@ class AuthorizeCreateCustomer
 //       echo "First Name in Billing Address: " . $paymentProfile->getBillTo()->getFirstName() . "\n";
 //   }
 // }
-  
 }
diff --git a/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php b/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php
index 0b1a03c9299f..ba9496476ec4 100644
--- a/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php
+++ b/app/PaymentDrivers/Authorize/AuthorizeCreditCard.php
@@ -78,8 +78,7 @@ class AuthorizeCreditCard
         if ($request->has('store_card') && $request->input('store_card') === true) {
             $authorise_payment_method->payment_method = GatewayType::CREDIT_CARD;
             $client_gateway_token = $authorise_payment_method->createClientGatewayToken($payment_profile, $gateway_customer_reference);
-        }
-        else{
+        } else {
             //remove the payment profile if we are not storing tokens in our system
             $this->removePaymentProfile($gateway_customer_reference, $payment_profile_id);
         }
@@ -89,22 +88,20 @@ class AuthorizeCreditCard
 
     private function removePaymentProfile($customer_profile_id, $customer_payment_profile_id)
     {
-        
-      $request = new DeleteCustomerPaymentProfileRequest();
-      $request->setMerchantAuthentication($this->authorize->merchant_authentication);
-      $request->setCustomerProfileId($customer_profile_id);
-      $request->setCustomerPaymentProfileId($customer_payment_profile_id);
-      $controller = new DeleteCustomerPaymentProfileController($request);
-      $response = $controller->executeWithApiResponse($this->authorize->mode());
-        
-        if (($response != null) && ($response->getMessages()->getResultCode() == "Ok") )
-        {
-          nlog("SUCCESS: Delete Customer Payment Profile  SUCCESS");
-        }
-        else
-            nlog("unable to delete profile {$customer_profile_id} with payment id {$customer_payment_profile_id}");
+        $request = new DeleteCustomerPaymentProfileRequest();
+        $request->setMerchantAuthentication($this->authorize->merchant_authentication);
+        $request->setCustomerProfileId($customer_profile_id);
+        $request->setCustomerPaymentProfileId($customer_payment_profile_id);
+        $controller = new DeleteCustomerPaymentProfileController($request);
+        $response = $controller->executeWithApiResponse($this->authorize->mode());
 
-      // Delete a customer profile  
+        if (($response != null) && ($response->getMessages()->getResultCode() == 'Ok')) {
+            nlog('SUCCESS: Delete Customer Payment Profile  SUCCESS');
+        } else {
+            nlog("unable to delete profile {$customer_profile_id} with payment id {$customer_payment_profile_id}");
+        }
+
+        // Delete a customer profile
       // $request = new DeleteCustomerProfileRequest();
       // $request->setMerchantAuthentication($this->authorize->merchant_authentication);
       // $request->setCustomerProfileId( $customer_profile_id );
@@ -117,8 +114,6 @@ class AuthorizeCreditCard
       // }
       // else
       //   nlog("unable to delete profile {$customer_profile_id}");
-
-
     }
 
     private function processTokenPayment($request)
@@ -128,7 +123,7 @@ class AuthorizeCreditCard
             ->where('company_id', auth()->guard('contact')->user()->client->company->id)
             ->first();
 
-        if (!$client_gateway_token) {
+        if (! $client_gateway_token) {
             throw new PaymentFailed(ctrans('texts.payment_token_not_found'), 401);
         }
 
@@ -143,11 +138,10 @@ class AuthorizeCreditCard
 
         $data = (new ChargePaymentProfile($this->authorize))->chargeCustomerProfile($cgt->gateway_customer_reference, $cgt->token, $amount);
 
-       $response = $data['response'];
+        $response = $data['response'];
 
         // if ($response != null && $response->getMessages()->getResultCode() == 'Ok') {
         if ($response != null && $response->getMessages() != null) {
-
             $this->storePayment($payment_hash, $data);
 
             $vars = [
@@ -164,7 +158,6 @@ class AuthorizeCreditCard
 
             return true;
         } else {
-
             $vars = [
                 'invoices' => $payment_hash->invoices(),
                 'amount' => $amount,
@@ -175,8 +168,8 @@ class AuthorizeCreditCard
                 'data' => $this->formatGatewayResponse($data, $vars),
             ];
 
-            $code = "Error";
-            $description = "There was an error processing the payment";
+            $code = 'Error';
+            $description = 'There was an error processing the payment';
 
             if ($response->getErrors() != null) {
                 $code = $response->getErrors()[0]->getErrorCode();
@@ -191,7 +184,6 @@ class AuthorizeCreditCard
         }
     }
 
-
     private function handleResponse($data, $request)
     {
         $response = $data['response'];
@@ -254,16 +246,16 @@ class AuthorizeCreditCard
         $amount = array_key_exists('amount_with_fee', $data) ? $data['amount_with_fee'] : 0;
 
         $code = 1;
-        $description = "There was an error processing the payment";
+        $description = 'There was an error processing the payment';
 
         if ($response && $response->getErrors() != null) {
-            $code = (int)$response->getErrors()[0]->getErrorCode();
+            $code = (int) $response->getErrors()[0]->getErrorCode();
             $description = $response->getErrors()[0]->getErrorText();
         }
 
         $this->authorize->sendFailureMail($description);
 
-        $payment_hash = PaymentHash::where('hash', $request->input('payment_hash'))->firstOrFail(); 
+        $payment_hash = PaymentHash::where('hash', $request->input('payment_hash'))->firstOrFail();
 
         $vars = [
             'invoices' => $payment_hash->invoices(),
@@ -285,7 +277,6 @@ class AuthorizeCreditCard
         );
 
         throw new PaymentFailed($description, $code);
-
     }
 
     private function formatGatewayResponse($data, $vars)
@@ -295,7 +286,7 @@ class AuthorizeCreditCard
         $code = '';
         $description = '';
 
-        if($response->getMessages() !== null){
+        if ($response->getMessages() !== null) {
             $code = $response->getMessages()[0]->getCode();
             $description = $response->getMessages()[0]->getDescription();
         }
diff --git a/app/PaymentDrivers/Authorize/AuthorizeCustomer.php b/app/PaymentDrivers/Authorize/AuthorizeCustomer.php
index af34f049f505..1cb9a46edaf0 100644
--- a/app/PaymentDrivers/Authorize/AuthorizeCustomer.php
+++ b/app/PaymentDrivers/Authorize/AuthorizeCustomer.php
@@ -49,57 +49,44 @@ class AuthorizeCustomer
         $request->setMerchantAuthentication($this->authorize->merchant_authentication);
         $controller = new GetCustomerProfileIdsController($request);
         $response = $controller->executeWithApiResponse($this->authorize->mode());
-        if (($response != null) && ($response->getMessages()->getResultCode() == "Ok") )
-        {
-
+        if (($response != null) && ($response->getMessages()->getResultCode() == 'Ok')) {
             return $response->getIds();
-
-        }
-        else
-        {
+        } else {
             return [];
 
-            nlog( "GetCustomerProfileId's ERROR :  Invalid response");
+            nlog("GetCustomerProfileId's ERROR :  Invalid response");
             $errorMessages = $response->getMessages()->getMessage();
-            nlog( "Response : " . $errorMessages[0]->getCode() . "  " .$errorMessages[0]->getText());
+            nlog('Response : '.$errorMessages[0]->getCode().'  '.$errorMessages[0]->getText());
         }
-
     }
 
     private function getCustomerProfile($customer_profile_id)
     {
+        $request = new GetCustomerProfileRequest();
+        $request->setMerchantAuthentication($this->authorize->merchant_authentication);
+        $request->setCustomerProfileId($customer_profile_id);
+        $controller = new GetCustomerProfileController($request);
+        $response = $controller->executeWithApiResponse($this->authorize->mode());
+        if (($response != null) && ($response->getMessages()->getResultCode() == 'Ok')) {
+            $profileSelected = $response->getProfile();
+            $paymentProfilesSelected = $profileSelected->getPaymentProfiles();
 
-      $request = new GetCustomerProfileRequest();
-      $request->setMerchantAuthentication($this->authorize->merchant_authentication);
-      $request->setCustomerProfileId($customer_profile_id);
-      $controller = new GetCustomerProfileController($request);
-      $response = $controller->executeWithApiResponse($this->authorize->mode());
-      if (($response != null) && ($response->getMessages()->getResultCode() == "Ok") )
-      {
-        $profileSelected = $response->getProfile();
-        $paymentProfilesSelected = $profileSelected->getPaymentProfiles();
+            return [
+                'email' => $profileSelected->getEmail(),
+                'payment_profiles' => $paymentProfilesSelected,
+                'error' => '',
+            ];
+        } else {
+            nlog('ERROR :  GetCustomerProfile: Invalid response');
+            $errorMessages = $response->getMessages()->getMessage();
+            nlog('Response : '.$errorMessages[0]->getCode().'  '.$errorMessages[0]->getText());
 
-        return [
-            'email' => $profileSelected->getEmail(),
-            'payment_profiles' => $paymentProfilesSelected,
-            'error' => ''
-        ];
-
-      }
-      else
-      {
-
-        nlog("ERROR :  GetCustomerProfile: Invalid response");
-        $errorMessages = $response->getMessages()->getMessage();
-        nlog("Response : " . $errorMessages[0]->getCode() . "  " .$errorMessages[0]->getText());
-
-        return [
-            'profile' => NULL,
-            'payment_profiles' => NULL,
-            'error' => $errorMessages[0]->getCode() . "  " .$errorMessages[0]->getText(),
-        ];
-
-      }
+            return [
+                'profile' => null,
+                'payment_profiles' => null,
+                'error' => $errorMessages[0]->getCode().'  '.$errorMessages[0]->getText(),
+            ];
+        }
     }
 
     public function importCustomers()
@@ -108,28 +95,25 @@ class AuthorizeCustomer
         $company = $this->authorize->company_gateway->company;
         $user = $company->owner();
 
-        foreach($auth_customers as $gateway_customer_reference)
-        {
-
+        foreach ($auth_customers as $gateway_customer_reference) {
             $profile = $this->getCustomerProfile($gateway_customer_reference);
 
             //if the profile ID already exists in ClientGatewayToken we continue else - add.
-            if($client_gateway_token = ClientGatewayToken::where('company_id', $company->id)->where('gateway_customer_reference', $gateway_customer_reference)->first()){
+            if ($client_gateway_token = ClientGatewayToken::where('company_id', $company->id)->where('gateway_customer_reference', $gateway_customer_reference)->first()) {
                 // nlog("found client");
                 $client = $client_gateway_token->client;
-            }
-            elseif($client_contact = ClientContact::where('company_id', $company->id)->where('email', $profile['email'])->first()){
+            } elseif ($client_contact = ClientContact::where('company_id', $company->id)->where('email', $profile['email'])->first()) {
                 $client = $client_contact->client;
-                // nlog("found client through contact");
-            }
-            else {
+            // nlog("found client through contact");
+            } else {
                 // nlog("creating client");
 
                 $first_payment_profile = $profile['payment_profiles'][0];
 
-                if(!$first_payment_profile)
+                if (! $first_payment_profile) {
                     continue;
-                
+                }
+
                 $client = ClientFactory::create($company->id, $user->id);
                 $billTo = $first_payment_profile->getBillTo();
                 $client->address1 = $billTo->getAddress();
@@ -148,19 +132,17 @@ class AuthorizeCustomer
                 $client_contact->save();
             }
 
-            if($client && is_array($profile['payment_profiles'])){
-
+            if ($client && is_array($profile['payment_profiles'])) {
                 $this->authorize->setClient($client);
 
-                foreach($profile['payment_profiles'] as $payment_profile)
-                {
-                    
+                foreach ($profile['payment_profiles'] as $payment_profile) {
                     $token_exists = ClientGatewayToken::where('company_id', $company->id)
                                                       ->where('token', $payment_profile->getCustomerPaymentProfileId())
                                                       ->where('gateway_customer_reference', $gateway_customer_reference)
                                                       ->exists();
-                    if($token_exists)
+                    if ($token_exists) {
                         continue;
+                    }
 
 //                    $expiry = $payment_profile->getPayment()->getCreditCard()->getExpirationDate();
 
@@ -177,12 +159,9 @@ class AuthorizeCustomer
                     $additional['gateway_customer_reference'] = $gateway_customer_reference;
 
                     $this->authorize->storeGatewayToken($data, $additional);
-
                 }
             }
-
         }
-       
     }
 
     private function getCountryCode($country_code)
@@ -195,6 +174,4 @@ class AuthorizeCustomer
 
         return (string) $country->id;
     }
-}    
-
-
+}
diff --git a/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php b/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php
index 3f06ec4ab123..e5129bf2d587 100644
--- a/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php
+++ b/app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php
@@ -52,7 +52,6 @@ class AuthorizePaymentMethod
             return $this->authorizeCreditCard();
         }
 
-
         // case GatewayType::BANK_TRANSFER:
         //     return $this->authorizeBankTransfer();
         //     break;
@@ -105,7 +104,6 @@ class AuthorizePaymentMethod
             $this->createClientGatewayToken($payment_profile, $gateway_customer_reference);
         }
 
-
         return redirect()->route('client.payment_methods.index');
     }
 
@@ -130,12 +128,11 @@ class AuthorizePaymentMethod
 
     public function buildPaymentMethod($payment_profile)
     {
-
         $payment_meta = new stdClass;
         $payment_meta->exp_month = 'xx';
         $payment_meta->exp_year = 'xx';
-        $payment_meta->brand = (string)$payment_profile->getPaymentProfile()->getPayment()->getCreditCard()->getCardType();
-        $payment_meta->last4 = (string)$payment_profile->getPaymentProfile()->getPayment()->getCreditCard()->getCardNumber();
+        $payment_meta->brand = (string) $payment_profile->getPaymentProfile()->getPayment()->getCreditCard()->getCardType();
+        $payment_meta->last4 = (string) $payment_profile->getPaymentProfile()->getPayment()->getCreditCard()->getCardNumber();
         $payment_meta->type = $this->payment_method;
 
         return $payment_meta;
@@ -160,23 +157,23 @@ class AuthorizePaymentMethod
         $contact = $this->authorize->client->primary_contact()->first() ?: $this->authorize->client->contacts()->first();
 
         $billto = false;
-        
+
         if ($contact) {
             // Create the Bill To info for new payment type
             $billto = new CustomerAddressType();
-            $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));
+            $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);
             }
 
-            $billto->setPhoneNumber(substr($this->authorize->client->phone,0,20));
+            $billto->setPhoneNumber(substr($this->authorize->client->phone, 0, 20));
         }
 
         // Create a new Customer Payment Profile object
@@ -216,7 +213,6 @@ class AuthorizePaymentMethod
             }
 
             throw new PaymentFailed($message, 500);
-
         }
     }
 
@@ -256,36 +252,32 @@ class AuthorizePaymentMethod
         }
     }
 
-    public function deletePaymentProfile($gateway_customer_reference, $payment_profile_id) {
-
+    public function deletePaymentProfile($gateway_customer_reference, $payment_profile_id)
+    {
         error_reporting(E_ALL & ~E_DEPRECATED);
 
         $this->authorize->init();
 
         // Set the transaction's refId
-        $refId = 'ref' . time();
+        $refId = 'ref'.time();
 
-          // Use an existing payment profile ID for this Merchant name and Transaction key
+        // Use an existing payment profile ID for this Merchant name and Transaction key
 
-          $request = new DeleteCustomerPaymentProfileRequest();
-          $request->setMerchantAuthentication($this->authorize->merchant_authentication);
-          $request->setCustomerProfileId($gateway_customer_reference);
-          $request->setCustomerPaymentProfileId($payment_profile_id);
-          $controller = new DeleteCustomerPaymentProfileController($request);
+        $request = new DeleteCustomerPaymentProfileRequest();
+        $request->setMerchantAuthentication($this->authorize->merchant_authentication);
+        $request->setCustomerProfileId($gateway_customer_reference);
+        $request->setCustomerPaymentProfileId($payment_profile_id);
+        $controller = new DeleteCustomerPaymentProfileController($request);
 
-          $response = $controller->executeWithApiResponse($this->authorize->mode());
-          if (($response != null) && ($response->getMessages()->getResultCode() == "Ok") )
-          {
-              nlog("SUCCESS: Delete Customer Payment Profile  SUCCESS  :");
-           }
-          else
-          {
-              nlog("ERROR :  Delete Customer Payment Profile: Invalid response\n");
-              $errorMessages = $response->getMessages()->getMessage();
-              nlog("Response : " . $errorMessages[0]->getCode() . "  " .$errorMessages[0]->getText() . "\n");
-          }
-
-          return $response;
-  }
+        $response = $controller->executeWithApiResponse($this->authorize->mode());
+        if (($response != null) && ($response->getMessages()->getResultCode() == 'Ok')) {
+            nlog('SUCCESS: Delete Customer Payment Profile  SUCCESS  :');
+        } else {
+            nlog("ERROR :  Delete Customer Payment Profile: Invalid response\n");
+            $errorMessages = $response->getMessages()->getMessage();
+            nlog('Response : '.$errorMessages[0]->getCode().'  '.$errorMessages[0]->getText()."\n");
+        }
 
+        return $response;
+    }
 }
diff --git a/app/PaymentDrivers/Authorize/ChargePaymentProfile.php b/app/PaymentDrivers/Authorize/ChargePaymentProfile.php
index 1d33cf2227bc..f8925844fa5e 100644
--- a/app/PaymentDrivers/Authorize/ChargePaymentProfile.php
+++ b/app/PaymentDrivers/Authorize/ChargePaymentProfile.php
@@ -17,9 +17,9 @@ use App\PaymentDrivers\AuthorizePaymentDriver;
 use App\Utils\Traits\MakesHash;
 use net\authorize\api\contract\v1\CreateTransactionRequest;
 use net\authorize\api\contract\v1\CustomerProfilePaymentType;
+use net\authorize\api\contract\v1\ExtendedAmountType;
 use net\authorize\api\contract\v1\OrderType;
 use net\authorize\api\contract\v1\PaymentProfileType;
-use net\authorize\api\contract\v1\ExtendedAmountType;
 use net\authorize\api\contract\v1\TransactionRequestType;
 use net\authorize\api\controller\CreateTransactionController;
 
@@ -29,7 +29,7 @@ use net\authorize\api\controller\CreateTransactionController;
 class ChargePaymentProfile
 {
     use MakesHash;
-    
+
     public function __construct(AuthorizePaymentDriver $authorize)
     {
         $this->authorize = $authorize;
@@ -53,27 +53,27 @@ class ChargePaymentProfile
         $invoiceTotal = 0;
         $invoiceTaxes = 0;
 
-        if($this->authorize->payment_hash->data) {
-            $invoice_numbers =  collect($this->authorize->payment_hash->data->invoices)->pluck('invoice_number')->implode(",");
+        if ($this->authorize->payment_hash->data) {
+            $invoice_numbers = collect($this->authorize->payment_hash->data->invoices)->pluck('invoice_number')->implode(',');
             $invObj = Invoice::whereIn('id', $this->transformKeys(array_column($this->authorize->payment_hash->invoices(), 'invoice_id')))->withTrashed()->get();
-            
+
             $invoiceTotal = round($invObj->pluck('amount')->sum(), 2);
             $invoiceTaxes = round($invObj->pluck('total_taxes')->sum(), 2);
-            
+
             if ($invoiceTotal != $amount) {
-                $taxRatio = $amount/$invoiceTotal;
-                $taxAmount = round($invoiceTaxes*$taxRatio, 2);
+                $taxRatio = $amount / $invoiceTotal;
+                $taxAmount = round($invoiceTaxes * $taxRatio, 2);
             } else {
                 $taxAmount = $invoiceTaxes;
             }
         }
-        
+
         $description = "Invoices: {$invoice_numbers} for {$amount} for client {$this->authorize->client->present()->name()}";
 
         $order = new OrderType();
-        $order->setInvoiceNumber(substr($invoice_numbers,0,19));
-        $order->setDescription(substr($description,0,255));
-        
+        $order->setInvoiceNumber(substr($invoice_numbers, 0, 19));
+        $order->setDescription(substr($description, 0, 255));
+
         $tax = new ExtendedAmountType();
         $tax->setName('tax');
         $tax->setAmount($taxAmount);
@@ -132,10 +132,10 @@ class ChargePaymentProfile
         }
 
         return [
-          'response'           => $tresponse,
-          'amount'             => $amount,
-          'profile_id'         => $profile_id,
-          'payment_profile_id' => $payment_profile_id,
+            'response'           => $tresponse,
+            'amount'             => $amount,
+            'profile_id'         => $profile_id,
+            'payment_profile_id' => $payment_profile_id,
         ];
     }
 }
diff --git a/app/PaymentDrivers/Authorize/RefundTransaction.php b/app/PaymentDrivers/Authorize/RefundTransaction.php
index c4651217d91a..e60d099bbb10 100644
--- a/app/PaymentDrivers/Authorize/RefundTransaction.php
+++ b/app/PaymentDrivers/Authorize/RefundTransaction.php
@@ -75,7 +75,6 @@ class RefundTransaction
                 $tresponse = $response->getTransactionResponse();
 
                 if ($tresponse != null && $tresponse->getMessages() != null) {
-                
                     $data = [
                         'transaction_reference' => $tresponse->getTransId(),
                         'success' => true,
@@ -88,13 +87,9 @@ class RefundTransaction
 
                     SystemLogger::dispatch($data, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_SUCCESS, SystemLog::TYPE_AUTHORIZE, $this->authorize->client, $this->authorize->client->company);
 
-
-                return $data;
-
+                    return $data;
                 } else {
-
                     if ($tresponse->getErrors() != null) {
-
                         $data = [
                             'transaction_reference' => '',
                             'transaction_response' => '',
@@ -114,7 +109,6 @@ class RefundTransaction
                 echo "Transaction Failed \n";
                 $tresponse = $response->getTransactionResponse();
                 if ($tresponse != null && $tresponse->getErrors() != null) {
-
                     $data = [
                         'transaction_reference' => '',
                         'transaction_response' => '',
@@ -128,9 +122,7 @@ class RefundTransaction
                     SystemLogger::dispatch($data, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_AUTHORIZE, $this->authorize->client, $this->authorize->client->company);
 
                     return $data;
-
                 } else {
-
                     $data = [
                         'transaction_reference' => '',
                         'transaction_response' => '',
@@ -147,20 +139,19 @@ class RefundTransaction
                 }
             }
         } else {
+            $data = [
+                'transaction_reference' => '',
+                'transaction_response' => '',
+                'success' => false,
+                'description' => 'No response returned',
+                'code' => 'No response returned',
+                'payment_id' => $payment->id,
+                'amount' => $amount,
+            ];
 
-                $data = [
-                    'transaction_reference' => '',
-                    'transaction_response' => '',
-                    'success' => false,
-                    'description' => 'No response returned',
-                    'code' => 'No response returned',
-                    'payment_id' => $payment->id,
-                    'amount' => $amount,
-                ];
-                
-                SystemLogger::dispatch($data, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_AUTHORIZE, $this->authorize->client, $this->authorize->client->company);
+            SystemLogger::dispatch($data, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_AUTHORIZE, $this->authorize->client, $this->authorize->client->company);
 
-                return $data;
+            return $data;
         }
 
         $data = [
@@ -174,6 +165,5 @@ class RefundTransaction
         ];
 
         SystemLogger::dispatch($data, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_AUTHORIZE, $this->authorize->client, $this->authorize->client->company);
-
     }
 }
diff --git a/app/PaymentDrivers/AuthorizePaymentDriver.php b/app/PaymentDrivers/AuthorizePaymentDriver.php
index e04c0a7f68ac..0f39e0adc256 100644
--- a/app/PaymentDrivers/AuthorizePaymentDriver.php
+++ b/app/PaymentDrivers/AuthorizePaymentDriver.php
@@ -59,7 +59,7 @@ class AuthorizePaymentDriver extends BaseDriver
     {
         $types = [];
 
-            $types[] = GatewayType::CREDIT_CARD;
+        $types[] = GatewayType::CREDIT_CARD;
 
         return $types;
     }
@@ -120,7 +120,7 @@ class AuthorizePaymentDriver extends BaseDriver
     public function tokenBilling(ClientGatewayToken $cgt, PaymentHash $payment_hash)
     {
         $this->init();
-        
+
         $this->setPaymentMethod($cgt->gateway_type_id);
 
         return $this->payment_method->tokenBilling($cgt, $payment_hash);
@@ -164,7 +164,6 @@ class AuthorizePaymentDriver extends BaseDriver
                                  ->first();
     }
 
-
     /**
      * Detach payment method from Authorize.net.
      *
diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php
index f6d76512d1cb..1a520977060d 100644
--- a/app/PaymentDrivers/BaseDriver.php
+++ b/app/PaymentDrivers/BaseDriver.php
@@ -166,7 +166,7 @@ class BaseDriver extends AbstractPaymentDriver
 
     /**
      * Detaches a payment method from the gateway
-     * 
+     *
      * @param  ClientGatewayToken $token The gateway token
      * @return bool                      boolean response
      */
@@ -193,6 +193,7 @@ class BaseDriver extends AbstractPaymentDriver
     public function setPaymentHash(PaymentHash $payment_hash)
     {
         $this->payment_hash = $payment_hash;
+
         return $this;
     }
 
@@ -227,20 +228,19 @@ class BaseDriver extends AbstractPaymentDriver
      */
     public function createPayment($data, $status = Payment::STATUS_COMPLETED): Payment
     {
-
-        if(in_array($status, [Payment::STATUS_COMPLETED, Payment::STATUS_PENDING]) )        
+        if (in_array($status, [Payment::STATUS_COMPLETED, Payment::STATUS_PENDING])) {
             $this->confirmGatewayFee();
+        }
 
         /*Never create a payment with a duplicate transaction reference*/
-        if(array_key_exists('transaction_reference', $data)){
-
+        if (array_key_exists('transaction_reference', $data)) {
             $_payment = Payment::where('transaction_reference', $data['transaction_reference'])
                                ->where('client_id', $this->client->id)
                                ->first();
 
-           if($_payment)
-            return $_payment;
-        
+            if ($_payment) {
+                return $_payment;
+            }
         }
 
         $payment = PaymentFactory::create($this->client->company->id, $this->client->user->id);
@@ -261,28 +261,30 @@ class BaseDriver extends AbstractPaymentDriver
         $payment->saveQuietly();
 
         /* Return early if the payment is not completed or pending*/
-        if(!in_array($status, [Payment::STATUS_COMPLETED, Payment::STATUS_PENDING]) )
+        if (! in_array($status, [Payment::STATUS_COMPLETED, Payment::STATUS_PENDING])) {
             return $payment;
+        }
 
         $this->payment_hash->payment_id = $payment->id;
         $this->payment_hash->save();
 
         $this->attachInvoices($payment, $this->payment_hash);
-        
-        if($this->payment_hash->credits_total() > 0)
+
+        if ($this->payment_hash->credits_total() > 0) {
             $payment = $payment->service()->applyCredits($this->payment_hash)->save();
+        }
 
         $payment->service()->updateInvoicePayment($this->payment_hash);
 
         event('eloquent.created: App\Models\Payment', $payment);
 
-        if ($this->client->getSetting('client_online_payment_notification') && in_array($status, [Payment::STATUS_COMPLETED, Payment::STATUS_PENDING]))
+        if ($this->client->getSetting('client_online_payment_notification') && in_array($status, [Payment::STATUS_COMPLETED, Payment::STATUS_PENDING])) {
             $payment->service()->sendEmail();
+        }
 
-            //todo
-            //catch any payment failures here also and fire a subsequent failure email if necessary? note only need for delayed payment forms
-            //perhaps this type of functionality should be handled higher up to provide better context?
-
+        //todo
+        //catch any payment failures here also and fire a subsequent failure email if necessary? note only need for delayed payment forms
+        //perhaps this type of functionality should be handled higher up to provide better context?
 
         event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
 
@@ -319,7 +321,6 @@ class BaseDriver extends AbstractPaymentDriver
         $invoices = Invoice::whereIn('id', $this->transformKeys(array_column($payment_invoices, 'invoice_id')))->withTrashed()->get();
 
         $invoices->each(function ($invoice) use ($fee_total) {
-
             if (collect($invoice->line_items)->contains('type_id', '3')) {
                 $invoice->service()->toggleFeesPaid()->save();
             }
@@ -333,7 +334,6 @@ class BaseDriver extends AbstractPaymentDriver
             ];
 
             TransactionLog::dispatch(TransactionEvent::INVOICE_FEE_APPLIED, $transaction, $invoice->company->db);
-
         });
     }
 
@@ -403,14 +403,15 @@ class BaseDriver extends AbstractPaymentDriver
 
     public function processInternallyFailedPayment($gateway, $e)
     {
-        if (!is_null($this->payment_hash)) {
+        if (! is_null($this->payment_hash)) {
             $this->unWindGatewayFees($this->payment_hash);
         }
 
         $error = $e->getMessage();
 
-        if(!$this->payment_hash)
+        if (! $this->payment_hash) {
             throw new PaymentFailed($error, $e->getCode());
+        }
 
         $amount = array_sum(array_column($this->payment_hash->invoices(), 'amount')) + $this->payment_hash->fee_total;
 
@@ -430,28 +431,25 @@ class BaseDriver extends AbstractPaymentDriver
 
     public function sendFailureMail($error)
     {
-
-        if (!is_null($this->payment_hash)) {
+        if (! is_null($this->payment_hash)) {
             $this->unWindGatewayFees($this->payment_hash);
         }
 
-        if(!$error)
+        if (! $error) {
             $error = '';
-        
+        }
+
         PaymentFailedMailer::dispatch(
             $this->payment_hash,
             $this->client->company,
             $this->client,
             $error
         );
-
     }
 
     public function clientPaymentFailureMailer($error)
     {
-
         if ($this->payment_hash && is_array($this->payment_hash->invoices())) {
-
             $nmo = new NinjaMailerObject;
             $nmo->mailable = new NinjaMailer((new ClientPaymentFailureObject($this->client, $error, $this->client->company, $this->payment_hash))->build());
             $nmo->company = $this->client->company;
@@ -460,23 +458,16 @@ class BaseDriver extends AbstractPaymentDriver
             $invoices = Invoice::whereIn('id', $this->transformKeys(array_column($this->payment_hash->invoices(), 'invoice_id')))->withTrashed()->get();
 
             $invoices->each(function ($invoice) {
-
                 $invoice->service()->touchPdf();
-                
             });
 
             $invoices->first()->invitations->each(function ($invitation) use ($nmo) {
-
-                if ((bool)$invitation->contact->send_email !== false && $invitation->contact->email) {
-
+                if ((bool) $invitation->contact->send_email !== false && $invitation->contact->email) {
                     $nmo->to_user = $invitation->contact;
                     NinjaMailerJob::dispatch($nmo);
                 }
-            
             });
-
         }
-
     }
 
     /**
@@ -505,27 +496,21 @@ class BaseDriver extends AbstractPaymentDriver
         $this->sendFailureMail($error);
 
         $nmo = new NinjaMailerObject;
-        $nmo->mailable = new NinjaMailer( (new ClientPaymentFailureObject($this->client, $error, $this->client->company, $this->payment_hash))->build() );
+        $nmo->mailable = new NinjaMailer((new ClientPaymentFailureObject($this->client, $error, $this->client->company, $this->payment_hash))->build());
         $nmo->company = $this->client->company;
         $nmo->settings = $this->client->company->settings;
 
         $invoices = Invoice::whereIn('id', $this->transformKeys(array_column($this->payment_hash->invoices(), 'invoice_id')))->withTrashed()->get();
 
-        $invoices->each(function ($invoice){
-
+        $invoices->each(function ($invoice) {
             $invoice->service()->touchPdf();
-
         });
 
-        $invoices->first()->invitations->each(function ($invitation) use ($nmo){
-
-            if (!$invitation->contact->trashed()) {
-
+        $invoices->first()->invitations->each(function ($invitation) use ($nmo) {
+            if (! $invitation->contact->trashed()) {
                 $nmo->to_user = $invitation->contact;
                 NinjaMailerJob::dispatch($nmo);
-
             }
-
         });
 
         $message = [
@@ -542,13 +527,11 @@ class BaseDriver extends AbstractPaymentDriver
             $this->client->company,
         );
 
-        if($client_present)
+        if ($client_present) {
             throw new PaymentFailed($error, 500);
-
+        }
     }
 
-
-
     public function checkRequirements()
     {
         if ($this->company_gateway->require_billing_address) {
@@ -655,7 +638,6 @@ class BaseDriver extends AbstractPaymentDriver
 
     public function logSuccessfulGatewayResponse($response, $gateway_const)
     {
-
         SystemLogger::dispatch(
             $response,
             SystemLog::CATEGORY_GATEWAY_RESPONSE,
@@ -669,8 +651,8 @@ class BaseDriver extends AbstractPaymentDriver
     public function genericWebhookUrl()
     {
         return route('payment_notification_webhook', [
-            'company_key' => $this->client->company->company_key, 
-            'company_gateway_id' => $this->encodePrimaryKey($this->company_gateway->id), 
+            'company_key' => $this->client->company->company_key,
+            'company_gateway_id' => $this->encodePrimaryKey($this->company_gateway->id),
             'client' => $this->encodePrimaryKey($this->client->id),
         ]);
     }
@@ -691,14 +673,15 @@ class BaseDriver extends AbstractPaymentDriver
      */
     public function getDescription(bool $abbreviated = true)
     {
-        if(!$this->payment_hash)
-            return "";
+        if (! $this->payment_hash) {
+            return '';
+        }
 
-        if($abbreviated)
+        if ($abbreviated) {
             return \implode(', ', collect($this->payment_hash->invoices())->pluck('invoice_number')->toArray());
+        }
 
         return sprintf('%s: %s', ctrans('texts.invoices'), \implode(', ', collect($this->payment_hash->invoices())->pluck('invoice_number')->toArray()));
-
     }
 
     public function disconnect()
diff --git a/app/PaymentDrivers/Braintree/ACH.php b/app/PaymentDrivers/Braintree/ACH.php
index c11fb5abbcd3..86995790d8ab 100644
--- a/app/PaymentDrivers/Braintree/ACH.php
+++ b/app/PaymentDrivers/Braintree/ACH.php
@@ -62,13 +62,13 @@ class ACH implements MethodInterface
             ],
         ]);
 
-        if ($result->success && optional($result->paymentMethod)->verified) {
+        if ($result->success && $result->paymentMethod?->verified) {
             $account = $result->paymentMethod;
 
             try {
                 $payment_meta = new \stdClass;
-                $payment_meta->brand = (string)$account->bankName;
-                $payment_meta->last4 = (string)$account->last4;
+                $payment_meta->brand = (string) $account->bankName;
+                $payment_meta->last4 = (string) $account->last4;
                 $payment_meta->type = GatewayType::BANK_TRANSFER;
                 $payment_meta->state = 'authorized';
 
@@ -117,7 +117,7 @@ class ACH implements MethodInterface
             'amount' => $this->braintree->payment_hash->data->amount_with_fee,
             'paymentMethodToken' => $token->token,
             'options' => [
-                'submitForSettlement' => true
+                'submitForSettlement' => true,
             ],
         ]);
 
@@ -158,7 +158,7 @@ class ACH implements MethodInterface
     private function processUnsuccessfulPayment($response)
     {
         $this->braintree->sendFailureMail($response->transaction->additionalProcessorResponse);
-        
+
         $message = [
             'server_response' => $response,
             'data' => $this->braintree->payment_hash->data,
diff --git a/app/PaymentDrivers/Braintree/CreditCard.php b/app/PaymentDrivers/Braintree/CreditCard.php
index 0c2c697d01ce..484b18b67e4d 100644
--- a/app/PaymentDrivers/Braintree/CreditCard.php
+++ b/app/PaymentDrivers/Braintree/CreditCard.php
@@ -12,7 +12,6 @@
 
 namespace App\PaymentDrivers\Braintree;
 
-
 use App\Exceptions\PaymentFailed;
 use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
 use App\Http\Requests\Request;
@@ -63,8 +62,8 @@ class CreditCard
         if ($this->braintree->company_gateway->getConfigField('merchantAccountId')) {
             /** https://developer.paypal.com/braintree/docs/reference/request/client-token/generate#merchant_account_id */
             $data['client_token'] = $this->braintree->gateway->clientToken()->generate([
-                'merchantAccountId' => $this->braintree->company_gateway->getConfigField('merchantAccountId')
-            ]); 
+                'merchantAccountId' => $this->braintree->company_gateway->getConfigField('merchantAccountId'),
+            ]);
         }
 
         return render('gateways.braintree.credit_card.pay', $data);
@@ -87,7 +86,7 @@ class CreditCard
         $state = array_merge($state, $request->all());
         $state['store_card'] = boolval($state['store_card']);
 
-        $this->braintree->payment_hash->data = array_merge((array)$this->braintree->payment_hash->data, $state);
+        $this->braintree->payment_hash->data = array_merge((array) $this->braintree->payment_hash->data, $state);
         $this->braintree->payment_hash->save();
 
         $customer = $this->braintree->findOrCreateCustomer();
@@ -99,7 +98,7 @@ class CreditCard
             'paymentMethodToken' => $token,
             'deviceData' => $state['client-data'],
             'options' => [
-                'submitForSettlement' => true
+                'submitForSettlement' => true,
             ],
         ];
 
@@ -110,9 +109,8 @@ class CreditCard
 
         try {
             $result = $this->braintree->gateway->transaction()->sale($data);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             if ($e instanceof \Braintree\Exception\Authorization) {
-
                 $this->braintree->sendFailureMail(ctrans('texts.generic_gateway_error'));
 
                 throw new PaymentFailed(ctrans('texts.generic_gateway_error'), $e->getCode());
@@ -122,7 +120,6 @@ class CreditCard
 
             throw new PaymentFailed($e->getMessage(), $e->getCode());
         }
-        
 
         if ($result->success) {
             $this->braintree->logSuccessfulGatewayResponse(['response' => $request->server_response, 'data' => $this->braintree->payment_hash], SystemLog::TYPE_BRAINTREE);
@@ -137,14 +134,13 @@ class CreditCard
         }
 
         $error = $result ?: 'Undefined gateway error';
-        
-        return $this->processUnsuccessfulPayment($error);
 
+        return $this->processUnsuccessfulPayment($error);
     }
 
     private function getPaymentToken(array $data, $customerId): ?string
     {
-        if (array_key_exists('token', $data) && !is_null($data['token'])) {
+        if (array_key_exists('token', $data) && ! is_null($data['token'])) {
             return $data['token'];
         }
 
@@ -162,7 +158,7 @@ class CreditCard
             /** https://developer.paypal.com/braintree/docs/reference/request/transaction/sale/php#full-example */
             $data['options']['verificationMerchantAccountId'] = $this->braintree->company_gateway->getConfigField('merchantAccountId');
         }
-        
+
         $response = $this->braintree->gateway->paymentMethod()->create($data);
 
         if ($response->success) {
@@ -204,7 +200,6 @@ class CreditCard
      */
     private function processUnsuccessfulPayment($response)
     {
-
         $this->braintree->sendFailureMail($response->transaction->additionalProcessorResponse);
 
         $message = [
@@ -228,10 +223,10 @@ class CreditCard
     {
         try {
             $payment_meta = new \stdClass;
-            $payment_meta->exp_month = (string)$method->expirationMonth;
-            $payment_meta->exp_year = (string)$method->expirationYear;
-            $payment_meta->brand = (string)$method->cardType;
-            $payment_meta->last4 = (string)$method->last4;
+            $payment_meta->exp_month = (string) $method->expirationMonth;
+            $payment_meta->exp_year = (string) $method->expirationYear;
+            $payment_meta->brand = (string) $method->cardType;
+            $payment_meta->last4 = (string) $method->last4;
             $payment_meta->type = GatewayType::CREDIT_CARD;
 
             $data = [
diff --git a/app/PaymentDrivers/Braintree/PayPal.php b/app/PaymentDrivers/Braintree/PayPal.php
index a58736571ba6..6d24013e7c4a 100644
--- a/app/PaymentDrivers/Braintree/PayPal.php
+++ b/app/PaymentDrivers/Braintree/PayPal.php
@@ -1,9 +1,7 @@
 <?php
 
-
 namespace App\PaymentDrivers\Braintree;
 
-
 use App\Exceptions\PaymentFailed;
 use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
 use App\Jobs\Util\SystemLogger;
@@ -63,7 +61,7 @@ class PayPal
         $state = array_merge($state, $request->all());
         $state['store_card'] = boolval($state['store_card']);
 
-        $this->braintree->payment_hash->data = array_merge((array)$this->braintree->payment_hash->data, $state);
+        $this->braintree->payment_hash->data = array_merge((array) $this->braintree->payment_hash->data, $state);
         $this->braintree->payment_hash->save();
 
         $customer = $this->braintree->findOrCreateCustomer();
@@ -75,10 +73,10 @@ class PayPal
             'paymentMethodToken' => $token,
             'deviceData' => $state['client-data'],
             'options' => [
-                'submitForSettlement' => True,
+                'submitForSettlement' => true,
                 'paypal' => [
                     'description' => 'Meaningful description.',
-                ]
+                ],
             ],
         ]);
 
@@ -102,7 +100,7 @@ class PayPal
 
     private function getPaymentToken(array $data, string $customerId)
     {
-        if (array_key_exists('token', $data) && !is_null($data['token'])) {
+        if (array_key_exists('token', $data) && ! is_null($data['token'])) {
             return $data['token'];
         }
 
@@ -172,7 +170,7 @@ class PayPal
     {
         try {
             $payment_meta = new \stdClass;
-            $payment_meta->email = (string)$method->email;
+            $payment_meta->email = (string) $method->email;
             $payment_meta->type = GatewayType::PAYPAL;
 
             $data = [
diff --git a/app/PaymentDrivers/BraintreePaymentDriver.php b/app/PaymentDrivers/BraintreePaymentDriver.php
index 3687663ea6cf..7393d2a43ece 100644
--- a/app/PaymentDrivers/BraintreePaymentDriver.php
+++ b/app/PaymentDrivers/BraintreePaymentDriver.php
@@ -196,7 +196,7 @@ class BraintreePaymentDriver extends BaseDriver
             'paymentMethodToken' => $cgt->token,
             'deviceData' => '',
             'options' => [
-                'submitForSettlement' => true
+                'submitForSettlement' => true,
             ],
         ]);
 
@@ -224,7 +224,7 @@ class BraintreePaymentDriver extends BaseDriver
             return $payment;
         }
 
-        if (!$result->success) {
+        if (! $result->success) {
             $this->unWindGatewayFees($payment_hash);
 
             $this->sendFailureMail($result->transaction->additionalProcessorResponse);
@@ -249,7 +249,6 @@ class BraintreePaymentDriver extends BaseDriver
 
     public function processWebhookRequest($request)
     {
-
         $validator = Validator::make($request->all(), [
             'bt_signature' => ['required'],
             'bt_payload' => ['required'],
@@ -262,21 +261,18 @@ class BraintreePaymentDriver extends BaseDriver
         $this->init();
 
         $webhookNotification = $this->gateway->webhookNotification()->parse(
-            $request->input("bt_signature"), $request->input("bt_payload")
+            $request->input('bt_signature'), $request->input('bt_payload')
         );
 
-        nlog("braintree webhook");
+        nlog('braintree webhook');
 
         // if($webhookNotification)
         //     nlog($webhookNotification->kind);
-        
+
         // // Example values for webhook notification properties
         // $message = $webhookNotification->kind; // "subscription_went_past_due"
         // $message = $webhookNotification->timestamp->format('D M j G:i:s T Y'); // "Sun Jan 1 00:00:00 UTC 2012"
 
         return response()->json([], 200);
-
     }
-
-
 }
diff --git a/app/PaymentDrivers/CheckoutCom/CreditCard.php b/app/PaymentDrivers/CheckoutCom/CreditCard.php
index 033f5865c93e..c645eb01e5e9 100644
--- a/app/PaymentDrivers/CheckoutCom/CreditCard.php
+++ b/app/PaymentDrivers/CheckoutCom/CreditCard.php
@@ -25,13 +25,13 @@ use Checkout\CheckoutArgumentException;
 use Checkout\CheckoutAuthorizationException;
 use Checkout\Library\Exceptions\CheckoutHttpException;
 use Checkout\Models\Payments\IdSource;
+use Checkout\Payments\Four\Request\PaymentRequest;
 use Checkout\Payments\Four\Request\Source\RequestTokenSource;
+use Checkout\Payments\PaymentRequest as PaymentsPaymentRequest;
 use Checkout\Payments\Source\RequestTokenSource as SourceRequestTokenSource;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\Request;
 use Illuminate\View\View;
-use Checkout\Payments\PaymentRequest as PaymentsPaymentRequest;
-use Checkout\Payments\Four\Request\PaymentRequest;
 
 class CreditCard implements MethodInterface
 {
@@ -65,27 +65,19 @@ class CreditCard implements MethodInterface
 
     public function bootRequest($token)
     {
-
-        if($this->checkout->is_four_api){
-
+        if ($this->checkout->is_four_api) {
             $token_source = new RequestTokenSource();
             $token_source->token = $token;
             $request = new PaymentRequest();
             $request->source = $token_source;
-
-
-        }
-        else {
-
+        } else {
             $token_source = new SourceRequestTokenSource();
             $token_source->token = $token;
             $request = new PaymentsPaymentRequest();
             $request->source = $token_source;
-
         }
 
         return $request;
-
     }
 
     /**
@@ -106,9 +98,7 @@ class CreditCard implements MethodInterface
         $request->currency = $this->checkout->client->getCurrencyCode();
         $request->customer = $customerRequest;
 
-
         try {
-
             $response = $this->checkout->gateway->getPaymentsClient()->requestPayment($request);
 
             if ($response['approved'] && $response['status'] === 'Authorized') {
@@ -122,15 +112,13 @@ class CreditCard implements MethodInterface
                 $data = [
                     'payment_meta' => $payment_meta,
                     'token' => $response['source']['id'],
-                    'payment_method_id' => GatewayType::CREDIT_CARD,  
+                    'payment_method_id' => GatewayType::CREDIT_CARD,
                 ];
 
-                $payment_method = $this->checkout->storeGatewayToken($data,['gateway_customer_reference' => $customerRequest['id']]);
+                $payment_method = $this->checkout->storeGatewayToken($data, ['gateway_customer_reference' => $customerRequest['id']]);
 
                 return redirect()->route('client.payment_methods.show', $payment_method->hashed_id);
             }
-
-
         } catch (CheckoutApiException $e) {
             // API error
             $request_id = $e->request_id;
@@ -145,7 +133,6 @@ class CreditCard implements MethodInterface
             // Bad Invalid authorization
             throw new PaymentFailed($e->getMessage());
         }
-
     }
 
     public function paymentView($data)
@@ -175,10 +162,10 @@ class CreditCard implements MethodInterface
         $state = array_merge($state, $request->all());
         $state['store_card'] = boolval($state['store_card']);
 
-        $this->checkout->payment_hash->data = array_merge((array)$this->checkout->payment_hash->data, $state);
+        $this->checkout->payment_hash->data = array_merge((array) $this->checkout->payment_hash->data, $state);
         $this->checkout->payment_hash->save();
 
-        if ($request->has('token') && !is_null($request->token) && !empty($request->token)) {
+        if ($request->has('token') && ! is_null($request->token) && ! empty($request->token)) {
             return $this->attemptPaymentUsingToken($request);
         }
 
@@ -192,7 +179,7 @@ class CreditCard implements MethodInterface
             ->where('company_id', auth()->guard('contact')->user()->client->company_id)
             ->first();
 
-        if (!$cgt) {
+        if (! $cgt) {
             throw new PaymentFailed(ctrans('texts.payment_token_not_found'), 401);
         }
 
@@ -212,18 +199,16 @@ class CreditCard implements MethodInterface
 
     private function completePayment($paymentRequest, PaymentResponseRequest $request)
     {
-
         $paymentRequest->amount = $this->checkout->payment_hash->data->value;
         $paymentRequest->reference = $this->checkout->getDescription();
         $paymentRequest->customer = $this->checkout->getCustomer();
-        $paymentRequest->metadata = ['udf1' => "Invoice Ninja"];
+        $paymentRequest->metadata = ['udf1' => 'Invoice Ninja'];
         $paymentRequest->currency = $this->checkout->client->getCurrencyCode();
 
-        $this->checkout->payment_hash->data = array_merge((array)$this->checkout->payment_hash->data, ['checkout_payment_ref' => $paymentRequest]);
+        $this->checkout->payment_hash->data = array_merge((array) $this->checkout->payment_hash->data, ['checkout_payment_ref' => $paymentRequest]);
         $this->checkout->payment_hash->save();
 
         if ($this->checkout->client->currency()->code == 'EUR' || $this->checkout->company_gateway->getConfigField('threeds')) {
-
             $paymentRequest->{'3ds'} = ['enabled' => true];
 
             $paymentRequest->{'success_url'} = route('checkout.3ds_redirect', [
@@ -237,7 +222,6 @@ class CreditCard implements MethodInterface
                 'company_gateway_id' => $this->checkout->company_gateway->hashed_id,
                 'hash' => $this->checkout->payment_hash->hash,
             ]);
-
         }
 
         try {
@@ -256,35 +240,31 @@ class CreditCard implements MethodInterface
             }
 
             if ($response['status'] == 'Declined') {
-
                 $this->checkout->unWindGatewayFees($this->checkout->payment_hash);
 
                 return $this->processUnsuccessfulPayment($response);
             }
-        } 
-        catch (CheckoutApiException $e) {
+        } catch (CheckoutApiException $e) {
             // API error
             $request_id = $e->request_id;
             $http_status_code = $e->http_status_code;
             $error_details = $e->error_details;
 
-        
             $this->checkout->unWindGatewayFees($this->checkout->payment_hash);
-            return $this->checkout->processInternallyFailedPayment($this->checkout, $e);
 
+            return $this->checkout->processInternallyFailedPayment($this->checkout, $e);
         } catch (CheckoutArgumentException $e) {
             // Bad arguments
 
             $this->checkout->unWindGatewayFees($this->checkout->payment_hash);
-            return $this->checkout->processInternallyFailedPayment($this->checkout, $e);
 
+            return $this->checkout->processInternallyFailedPayment($this->checkout, $e);
         } catch (CheckoutAuthorizationException $e) {
             // Bad Invalid authorization
 
             $this->checkout->unWindGatewayFees($this->checkout->payment_hash);
+
             return $this->checkout->processInternallyFailedPayment($this->checkout, $e);
-
         }
-
     }
 }
diff --git a/app/PaymentDrivers/CheckoutCom/Utilities.php b/app/PaymentDrivers/CheckoutCom/Utilities.php
index 014046963ba4..fc827b3098e5 100644
--- a/app/PaymentDrivers/CheckoutCom/Utilities.php
+++ b/app/PaymentDrivers/CheckoutCom/Utilities.php
@@ -30,7 +30,7 @@ trait Utilities
 
     public function getParent()
     {
-        return static::class == 'App\PaymentDrivers\CheckoutComPaymentDriver' ? $this : $this->checkout;
+        return static::class == \App\PaymentDrivers\CheckoutComPaymentDriver::class ? $this : $this->checkout;
     }
 
     public function convertToCheckoutAmount($amount, $currency)
@@ -56,7 +56,6 @@ trait Utilities
 
     private function processSuccessfulPayment($_payment)
     {
-
         if ($this->getParent()->payment_hash->data->store_card) {
             $this->storeLocalPaymentMethod($_payment);
         }
@@ -85,16 +84,16 @@ trait Utilities
 
     public function processUnsuccessfulPayment($_payment, $throw_exception = true)
     {
-
         $error_message = '';
 
-        if(array_key_exists('response_summary',$_payment))
+        if (array_key_exists('response_summary', $_payment)) {
             $error_message = $_payment['response_summary'];
-        elseif(array_key_exists('status',$_payment))
+        } elseif (array_key_exists('status', $_payment)) {
             $error_message = $_payment['status'];
+        }
 
         $this->getParent()->sendFailureMail($error_message);
-                
+
         $message = [
             'server_response' => $_payment,
             'data' => $this->getParent()->payment_hash->data,
@@ -110,14 +109,12 @@ trait Utilities
         );
 
         if ($throw_exception) {
-
-            throw new PaymentFailed($_payment['status'] . " " . $error_message, 500);
+            throw new PaymentFailed($_payment['status'].' '.$error_message, 500);
         }
     }
 
     private function processPendingPayment($_payment)
     {
-
         try {
             return redirect($_payment['_links']['redirect']['href']);
         } catch (Exception $e) {
diff --git a/app/PaymentDrivers/CheckoutComPaymentDriver.php b/app/PaymentDrivers/CheckoutComPaymentDriver.php
index 552123dbbc75..210e231149bb 100644
--- a/app/PaymentDrivers/CheckoutComPaymentDriver.php
+++ b/app/PaymentDrivers/CheckoutComPaymentDriver.php
@@ -33,17 +33,17 @@ use Checkout\CheckoutArgumentException;
 use Checkout\CheckoutAuthorizationException;
 use Checkout\CheckoutDefaultSdk;
 use Checkout\CheckoutFourSdk;
+use Checkout\Common\CustomerRequest;
 use Checkout\Environment;
 use Checkout\Library\Exceptions\CheckoutHttpException;
 use Checkout\Models\Payments\IdSource;
 use Checkout\Models\Payments\Refund;
-use Exception;
 use Checkout\Payments\Four\Request\PaymentRequest;
 use Checkout\Payments\Four\Request\Source\RequestIdSource as SourceRequestIdSource;
 use Checkout\Payments\PaymentRequest as PaymentsPaymentRequest;
-use Checkout\Payments\Source\RequestIdSource;
-use Checkout\Common\CustomerRequest;
 use Checkout\Payments\RefundRequest;
+use Checkout\Payments\Source\RequestIdSource;
+use Exception;
 
 class CheckoutComPaymentDriver extends BaseDriver
 {
@@ -90,7 +90,7 @@ class CheckoutComPaymentDriver extends BaseDriver
         $types = [];
 
         $types[] = GatewayType::CREDIT_CARD;
-        
+
         return $types;
     }
 
@@ -99,7 +99,7 @@ class CheckoutComPaymentDriver extends BaseDriver
      * @param int|null $payment_method
      * @return CheckoutComPaymentDriver
      */
-    public function setPaymentMethod($payment_method = null): CheckoutComPaymentDriver
+    public function setPaymentMethod($payment_method = null): self
     {
         // At the moment Checkout.com payment
         // driver only supports payments using credit card.
@@ -123,20 +123,18 @@ class CheckoutComPaymentDriver extends BaseDriver
             'sandbox' => $this->company_gateway->getConfigField('testMode'),
         ];
 
-
-        if(strlen($config['secret']) <= 38){
+        if (strlen($config['secret']) <= 38) {
             $this->is_four_api = true;
             $builder = CheckoutFourSdk::staticKeys();
             $builder->setPublicKey($config['public']); // optional, only required for operations related with tokens
             $builder->setSecretKey($config['secret']);
-            $builder->setEnvironment($config['sandbox'] ? Environment::sandbox(): Environment::production());
+            $builder->setEnvironment($config['sandbox'] ? Environment::sandbox() : Environment::production());
             $this->gateway = $builder->build();
-        }
-        else    {
+        } else {
             $builder = CheckoutDefaultSdk::staticKeys();
             $builder->setPublicKey($config['public']); // optional, only required for operations related with tokens
             $builder->setSecretKey($config['secret']);
-            $builder->setEnvironment($config['sandbox'] ? Environment::sandbox(): Environment::production());
+            $builder->setEnvironment($config['sandbox'] ? Environment::sandbox() : Environment::production());
             $this->gateway = $builder->build();
         }
 
@@ -181,7 +179,7 @@ class CheckoutComPaymentDriver extends BaseDriver
             $fields[] = ['name' => 'client_country_id', 'label' => ctrans('texts.country'), 'type' => 'text', 'validation' => 'required'];
         }
 
-        if($this->company_gateway->require_postal_code) {
+        if ($this->company_gateway->require_postal_code) {
             $fields[] = ['name' => 'client_postal_code', 'label' => ctrans('texts.postal_code'), 'type' => 'text', 'validation' => 'required'];
         }
 
@@ -238,7 +236,7 @@ class CheckoutComPaymentDriver extends BaseDriver
         $this->init();
 
         $request = new RefundRequest();
-        $request->reference = "{$payment->transaction_reference} " . now();
+        $request->reference = "{$payment->transaction_reference} ".now();
         $request->amount = $this->convertToCheckoutAmount($amount, $this->client->getCurrencyCode());
 
         try {
@@ -252,7 +250,6 @@ class CheckoutComPaymentDriver extends BaseDriver
                 'description' => $response['reference'],
                 'code' => 202,
             ];
-
         } catch (CheckoutApiException $e) {
             // API error
             $request_id = $e->request_id;
@@ -279,49 +276,38 @@ class CheckoutComPaymentDriver extends BaseDriver
                 'code' => $e->getCode(),
             ];
         }
-
     }
 
     public function getCustomer()
     {
-        try{
-        
-        $response = $this->gateway->getCustomersClient()->get($this->client->present()->email());
-            
-            return $response;
-        }
-        catch(\Exception $e){
+        try {
+            $response = $this->gateway->getCustomersClient()->get($this->client->present()->email());
 
+            return $response;
+        } catch (\Exception $e) {
             $request = new CustomerRequest();
             $request->email = $this->client->present()->email();
             $request->name = $this->client->present()->name();
+
             return $request;
         }
     }
 
     public function bootTokenRequest($token)
     {
-
-        if($this->is_four_api){
-
+        if ($this->is_four_api) {
             $token_source = new SourceRequestIdSource();
             $token_source->id = $token;
             $request = new PaymentRequest();
             $request->source = $token_source;
-
-
-        }
-        else {
-
+        } else {
             $token_source = new RequestIdSource();
             $token_source->id = $token;
             $request = new PaymentsPaymentRequest();
             $request->source = $token_source;
-
         }
 
         return $request;
-
     }
 
     public function tokenBilling(ClientGatewayToken $cgt, PaymentHash $payment_hash)
@@ -333,9 +319,9 @@ class CheckoutComPaymentDriver extends BaseDriver
 
         $paymentRequest = $this->bootTokenRequest($cgt->token);
         $paymentRequest->amount = $this->convertToCheckoutAmount($amount, $this->client->getCurrencyCode());
-        $paymentRequest->reference = '#' . $invoice->number . ' - ' . now();
+        $paymentRequest->reference = '#'.$invoice->number.' - '.now();
         $paymentRequest->customer = $this->getCustomer();
-        $paymentRequest->metadata = ['udf1' => "Invoice Ninja"];
+        $paymentRequest->metadata = ['udf1' => 'Invoice Ninja'];
         $paymentRequest->currency = $this->client->getCurrencyCode();
 
         $request = new PaymentResponseRequest();
@@ -372,7 +358,7 @@ class CheckoutComPaymentDriver extends BaseDriver
             if ($response['status'] == 'Declined') {
                 $this->unWindGatewayFees($payment_hash);
 
-                $this->sendFailureMail($response['status'] . " " . $response['response_summary']);
+                $this->sendFailureMail($response['status'].' '.$response['response_summary']);
 
                 $message = [
                     'server_response' => $response,
@@ -404,11 +390,11 @@ class CheckoutComPaymentDriver extends BaseDriver
             $this->sendFailureMail($message);
 
             SystemLogger::dispatch(
-                $data, 
-                SystemLog::CATEGORY_GATEWAY_RESPONSE, 
-                SystemLog::EVENT_GATEWAY_FAILURE, 
-                SystemLog::TYPE_CHECKOUT, 
-                $this->client, 
+                $data,
+                SystemLog::CATEGORY_GATEWAY_RESPONSE,
+                SystemLog::EVENT_GATEWAY_FAILURE,
+                SystemLog::TYPE_CHECKOUT,
+                $this->client,
                 $this->client->company
             );
         }
@@ -421,7 +407,6 @@ class CheckoutComPaymentDriver extends BaseDriver
 
     public function process3dsConfirmation(Checkout3dsRequest $request)
     {
-
         $this->init();
         $this->setPaymentHash($request->getPaymentHash());
 
diff --git a/app/PaymentDrivers/CustomPaymentDriver.php b/app/PaymentDrivers/CustomPaymentDriver.php
index 55f92e5f8711..8c9072df8a88 100644
--- a/app/PaymentDrivers/CustomPaymentDriver.php
+++ b/app/PaymentDrivers/CustomPaymentDriver.php
@@ -68,8 +68,8 @@ class CustomPaymentDriver extends BaseDriver
         }
 
         $variables['values']['$invoices'] = collect($this->payment_hash->invoices())->pluck('invoice_number')->implode(',');
-        $variables['labels']['$invoices_label'] = ctrans('texts.invoice_number_short'); 
-        
+        $variables['labels']['$invoices_label'] = ctrans('texts.invoice_number_short');
+
         $data['title'] = $this->company_gateway->getConfigField('name');
         $data['instructions'] = strtr($this->company_gateway->getConfigField('text'), $variables['values']);
 
diff --git a/app/PaymentDrivers/Eway/CreditCard.php b/app/PaymentDrivers/Eway/CreditCard.php
index 2da269954ea2..8000e1ac652d 100644
--- a/app/PaymentDrivers/Eway/CreditCard.php
+++ b/app/PaymentDrivers/Eway/CreditCard.php
@@ -20,8 +20,8 @@ use App\Models\Payment;
 use App\Models\PaymentHash;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\EwayPaymentDriver;
 use App\PaymentDrivers\Eway\ErrorCode;
+use App\PaymentDrivers\EwayPaymentDriver;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
@@ -40,22 +40,18 @@ class CreditCard
 
     public function authorizeView($data)
     {
-
         $data['gateway'] = $this->eway_driver;
         $data['api_key'] = $this->eway_driver->company_gateway->getConfigField('apiKey');
         $data['public_api_key'] = $this->eway_driver->company_gateway->getConfigField('publicApiKey');
 
         return render('gateways.eway.authorize', $data);
-
     }
 
     public function authorizeResponse($request)
     {
-
         $token = $this->createEwayToken($request->input('securefieldcode'));
 
         return redirect()->route('client.payment_methods.index');
-
     }
 
     private function createEwayToken($securefieldcode)
@@ -74,7 +70,7 @@ class CreditCard
             'Country' => $this->eway_driver->client->country->iso_3166_2,
             'Phone' => $this->eway_driver->client->phone,
             'Email' => $this->eway_driver->client->contacts()->first()->email,
-            "Url" => $this->eway_driver->client->website,
+            'Url' => $this->eway_driver->client->website,
             'Method' => \Eway\Rapid\Enum\PaymentMethod::CREATE_TOKEN_CUSTOMER,
             'SecuredCardData' => $securefieldcode,
         ];
@@ -83,8 +79,7 @@ class CreditCard
 
         $response_status = ErrorCode::getStatus($response->ResponseMessage);
 
-        if(!$response_status['success']){
-
+        if (! $response_status['success']) {
             $this->eway_driver->sendFailureMail($response_status['message']);
 
             throw new PaymentFailed($response_status['message'], 400);
@@ -99,7 +94,7 @@ class CreditCard
         $payment_meta->exp_month = $response->Customer->CardDetails->ExpiryMonth;
         $payment_meta->exp_year = $response->Customer->CardDetails->ExpiryYear;
         $payment_meta->brand = 'CC';
-        $payment_meta->last4 = substr($response->Customer->CardDetails->Number, -4);;
+        $payment_meta->last4 = substr($response->Customer->CardDetails->Number, -4);
         $payment_meta->type = GatewayType::CREDIT_CARD;
 
         $cgt['payment_meta'] = $payment_meta;
@@ -111,17 +106,14 @@ class CreditCard
 
     public function paymentView($data)
     {
-    
         $data['gateway'] = $this->eway_driver;
         $data['public_api_key'] = $this->eway_driver->company_gateway->getConfigField('publicApiKey');
 
         return render('gateways.eway.pay', $data);
-
     }
 
     public function paymentResponse($request)
     {
-
         $state = [
             'server_response' => $request->all(),
         ];
@@ -129,28 +121,25 @@ class CreditCard
         $this->eway_driver->payment_hash->data = array_merge((array) $this->eway_driver->payment_hash->data, $state);
         $this->eway_driver->payment_hash->save();
 
-        if(boolval($request->input('store_card')))
-        {
+        if (boolval($request->input('store_card'))) {
             $token = $this->createEwayToken($request->input('securefieldcode'));
             $payment = $this->tokenBilling($token->token, $this->eway_driver->payment_hash);
 
             return redirect()->route('client.payments.show', ['payment' => $this->encodePrimaryKey($payment->id)]);
-
         }
 
-        if($request->token){
-
+        if ($request->token) {
             $payment = $this->tokenBilling($request->token, $this->eway_driver->payment_hash);
 
             return redirect()->route('client.payments.show', ['payment' => $this->encodePrimaryKey($payment->id)]);
-
         }
 
         $invoice_numbers = '';
 
-        if($this->eway_driver->payment_hash->data)
-            $invoice_numbers =  collect($this->eway_driver->payment_hash->data->invoices)->pluck('invoice_number')->implode(',');
-        
+        if ($this->eway_driver->payment_hash->data) {
+            $invoice_numbers = collect($this->eway_driver->payment_hash->data->invoices)->pluck('invoice_number')->implode(',');
+        }
+
         $amount = array_sum(array_column($this->eway_driver->payment_hash->invoices(), 'amount')) + $this->eway_driver->payment_hash->fee_total;
 
         $description = "Invoices: {$invoice_numbers} for {$amount} for client {$this->eway_driver->client->present()->name()}";
@@ -160,7 +149,7 @@ class CreditCard
                 'TotalAmount' => $this->convertAmountForEway(),
                 'CurrencyCode' => $this->eway_driver->client->currency()->code,
                 'InvoiceNumber' => $invoice_numbers,
-                'InvoiceDescription' => substr($invoice_numbers, 0, 63)
+                'InvoiceDescription' => substr($invoice_numbers, 0, 63),
             ],
             'TransactionType' => \Eway\Rapid\Enum\TransactionType::PURCHASE,
             'SecuredCardData' => $request->input('securefieldcode'),
@@ -193,32 +182,27 @@ class CreditCard
         //     throw new PaymentFailed($response_status['message'], 400);
         // }
 
-            if($response->TransactionStatus)
-                $payment = $this->storePayment($response);
-            else {
+        if ($response->TransactionStatus) {
+            $payment = $this->storePayment($response);
+        } else {
+            $message = 'Error processing payment.';
 
-                $message = 'Error processing payment.';
-
-                if(isset($response->ResponseMessage))
-                    $message .= " Gateway Error Code = {$response->ResponseMessage}";
-
-                if($response->getErrors())
-                {
-    
-                    foreach ($response->getErrors() as $error) {
-                        $message = \Eway\Rapid::getMessage($error);
-                    }
-
-                }
-
-                $this->eway_driver->sendFailureMail($message);
-
-                throw new PaymentFailed($message, 400);
+            if (isset($response->ResponseMessage)) {
+                $message .= " Gateway Error Code = {$response->ResponseMessage}";
             }
 
+            if ($response->getErrors()) {
+                foreach ($response->getErrors() as $error) {
+                    $message = \Eway\Rapid::getMessage($error);
+                }
+            }
+
+            $this->eway_driver->sendFailureMail($message);
+
+            throw new PaymentFailed($message, 400);
+        }
 
         return redirect()->route('client.payments.show', ['payment' => $this->encodePrimaryKey($payment->id)]);
-
     }
 
     private function storePayment($response)
@@ -238,19 +222,19 @@ class CreditCard
 
     private function convertAmountForEway($amount = false)
     {
-    
-        if(!$amount)
+        if (! $amount) {
             $amount = array_sum(array_column($this->eway_driver->payment_hash->invoices(), 'amount')) + $this->eway_driver->payment_hash->fee_total;
+        }
 
-        if(in_array($this->eway_driver->client->currency()->code, ['VND', 'JPY', 'KRW', 'GNF', 'IDR', 'PYG', 'RWF', 'UGX', 'VUV', 'XAF', 'XPF']))
+        if (in_array($this->eway_driver->client->currency()->code, ['VND', 'JPY', 'KRW', 'GNF', 'IDR', 'PYG', 'RWF', 'UGX', 'VUV', 'XAF', 'XPF'])) {
             return $amount;
+        }
 
         return $amount * 100;
     }
 
     private function logResponse($response, $success = true)
     {
-
         $logger_message = [
             'server_response' => $response,
         ];
@@ -263,19 +247,18 @@ class CreditCard
             $this->eway_driver->client,
             $this->eway_driver->client->company,
         );
-
     }
 
-
     public function tokenBilling($token, $payment_hash)
     {
         $amount = array_sum(array_column($payment_hash->invoices(), 'amount')) + $payment_hash->fee_total;
 
         $invoice_numbers = '';
-        
-        if($this->eway_driver->payment_hash->data)
-            $invoice_numbers =  collect($this->eway_driver->payment_hash->data->invoices)->pluck('invoice_number')->implode(',');
-        
+
+        if ($this->eway_driver->payment_hash->data) {
+            $invoice_numbers = collect($this->eway_driver->payment_hash->data->invoices)->pluck('invoice_number')->implode(',');
+        }
+
         $description = "Invoices: {$invoice_numbers} for {$amount} for client {$this->eway_driver->client->present()->name()}";
 
         $transaction = [
@@ -286,40 +269,36 @@ class CreditCard
                 'TotalAmount' => $this->convertAmountForEway($amount),
                 'CurrencyCode' => $this->eway_driver->client->currency()->code,
                 'InvoiceNumber' => $invoice_numbers,
-                'InvoiceDescription' => substr($invoice_numbers, 0, 63)
+                'InvoiceDescription' => substr($invoice_numbers, 0, 63),
             ],
             'TransactionType' => \Eway\Rapid\Enum\TransactionType::RECURRING,
         ];
 
         $response = $this->eway_driver->init()->eway->createTransaction(\Eway\Rapid\Enum\ApiMethod::DIRECT, $transaction);
 
-            if($response->TransactionStatus){
-                $this->logResponse($response, true);
-                $payment = $this->storePayment($response);
+        if ($response->TransactionStatus) {
+            $this->logResponse($response, true);
+            $payment = $this->storePayment($response);
+        } else {
+            $message = 'Error processing payment.';
+
+            if (isset($response->ResponseMessage)) {
+                $message .= " Gateway Error Code = {$response->ResponseMessage}";
             }
-            else {
-
-                $message = 'Error processing payment.';
-
-                if(isset($response->ResponseMessage))
-                    $message .= " Gateway Error Code = {$response->ResponseMessage}";
-
-                if($response->getErrors())
-                {
-    
-                    foreach ($response->getErrors() as $error) {
-                        $message = \Eway\Rapid::getMessage($error);
-                    }
 
+            if ($response->getErrors()) {
+                foreach ($response->getErrors() as $error) {
+                    $message = \Eway\Rapid::getMessage($error);
                 }
-
-                $this->logResponse($response, false);
-
-                $this->eway_driver->sendFailureMail($message);
-
-                throw new PaymentFailed($message, 400);
             }
 
+            $this->logResponse($response, false);
+
+            $this->eway_driver->sendFailureMail($message);
+
+            throw new PaymentFailed($message, 400);
+        }
+
         return $payment;
     }
-}
\ No newline at end of file
+}
diff --git a/app/PaymentDrivers/Eway/ErrorCode.php b/app/PaymentDrivers/Eway/ErrorCode.php
index 8c9a55a71e1d..a6fe36c85b79 100644
--- a/app/PaymentDrivers/Eway/ErrorCode.php
+++ b/app/PaymentDrivers/Eway/ErrorCode.php
@@ -14,92 +14,92 @@ namespace App\PaymentDrivers\Eway;
 
 class ErrorCode
 {
+    private static $success = [
+        'A2000' =>	'Transaction Approved',
+        'A2008' =>	'Honour With Identification',
+        'A2010' =>	'Approved For Partial Amount',
+        'A2011' =>	'Approved, VIP',
+        'A2016' =>	'Approved, Update Track 3',
+    ];
 
-	private static $success = [
-		"A2000" =>	"Transaction Approved",
-		"A2008" =>	"Honour With Identification",
-		"A2010" =>	"Approved For Partial Amount",
-		"A2011" =>	"Approved, VIP",
-		"A2016" =>	"Approved, Update Track 3",
-	];
+    private static $failure = [
+        'D4401' =>	'Refer to Issuer',
+        'D4402' =>	'Refer to Issuer, special',
+        'D4403' =>	'No Merchant',
+        'D4404' =>	'Pick Up Card',
+        'D4405' =>	'Do Not Honour',
+        'D4406' =>	'Error',
+        'D4407' =>	'Pick Up Card, Special',
+        'D4409' =>	'Request In Progress',
+        'D4412' =>	'Invalid Transaction',
+        'D4413' =>	'Invalid Amount',
+        'D4414' =>	'Invalid Card Number',
+        'D4415' =>	'No Issuer',
+        'D4417' =>	'3D Secure Error',
+        'D4419' =>	'Re-enter Last Transaction',
+        'D4421' =>	'No Action Taken',
+        'D4422' =>	'Suspected Malfunction',
+        'D4423' =>	'Unacceptable Transaction Fee',
+        'D4425' =>	'Unable to Locate Record On File',
+        'D4430' =>	'Format Error',
+        'D4431' =>	'Bank Not Supported By Switch',
+        'D4433' =>	'Expired Card, Capture',
+        'D4434' =>	'Suspected Fraud, Retain Card',
+        'D4435' =>	'Card Acceptor, Contact Acquirer, Retain Card',
+        'D4436' =>	'Restricted Card, Retain Card',
+        'D4437' =>	'Contact Acquirer Security Department, Retain Card',
+        'D4438' =>	'PIN Tries Exceeded, Capture',
+        'D4439' =>	'No Credit Account',
+        'D4440' =>	'Function Not Supported',
+        'D4441' =>	'Lost Card',
+        'D4442' =>	'No Universal Account',
+        'D4443' =>	'Stolen Card',
+        'D4444' =>	'No Investment Account',
+        'D4450' =>	'Click-to-Pay (Visa Checkout) Transaction',
+        'D4451' =>	'Insufficient Funds',
+        'D4452' =>	'No Cheque Account',
+        'D4453' =>	'No Savings Account',
+        'D4454' =>	'Expired Card',
+        'D4455' =>	'Incorrect PIN',
+        'D4456' =>	'No Card Record',
+        'D4457' =>	'Function Not Permitted to Cardholder',
+        'D4458' =>	'Function Not Permitted to Terminal',
+        'D4459' =>	'Suspected Fraud',
+        'D4460' =>	'Acceptor Contact Acquirer',
+        'D4461' =>	'Exceeds Withdrawal Limit',
+        'D4462' =>	'Restricted Card',
+        'D4463' =>	'Security Violation',
+        'D4464' =>	'Original Amount Incorrect',
+        'D4466' =>	'Acceptor Contact Acquirer, Security',
+        'D4467' =>	'Capture Card',
+        'D4475' =>	'PIN Tries Exceeded',
+        'D4476' =>	'Invalidate Txn Reference',
+        'D4481' =>	'Accumulated Transaction Counter (Amount) Exceeded',
+        'D4482' =>	'CVV Validation Error',
+        'D4483' =>	'Acquirer Is Not Accepting Transactions From You At This Time',
+        'D4484' =>	'Acquirer Is Not Accepting This Transaction',
+        'D4490' =>	'Cut off In Progress',
+        'D4491' =>	'Card Issuer Unavailable',
+        'D4492' =>	'Unable To Route Transaction',
+        'D4493' =>	'Cannot Complete, Violation Of The Law',
+        'D4494' =>	'Duplicate Transaction',
+        'D4495' =>	'Amex Declined',
+        'D4496' =>	'System Error',
+        'D4497' =>	'MasterPass Error',
+        'D4498' =>	'PayPal Create Transaction Error',
+        'D4499' =>	'Invalid Transaction for Auth/Void',
+    ];
 
-	private static $failure = [
-		"D4401" =>	"Refer to Issuer",
-		"D4402" =>	"Refer to Issuer, special",
-		"D4403" =>	"No Merchant",
-		"D4404" =>	"Pick Up Card",
-		"D4405" =>	"Do Not Honour",
-		"D4406" =>	"Error",
-		"D4407" =>	"Pick Up Card, Special",
-		"D4409" =>	"Request In Progress",
-		"D4412" =>	"Invalid Transaction",
-		"D4413" =>	"Invalid Amount",
-		"D4414" =>	"Invalid Card Number",
-		"D4415" =>	"No Issuer",
-		"D4417" =>	"3D Secure Error",
-		"D4419" =>	"Re-enter Last Transaction",
-		"D4421" =>	"No Action Taken",
-		"D4422" =>	"Suspected Malfunction",
-		"D4423" =>	"Unacceptable Transaction Fee",
-		"D4425" =>	"Unable to Locate Record On File",
-		"D4430" =>	"Format Error",
-		"D4431" =>	"Bank Not Supported By Switch",
-		"D4433" =>	"Expired Card, Capture",
-		"D4434" =>	"Suspected Fraud, Retain Card",
-		"D4435" =>	"Card Acceptor, Contact Acquirer, Retain Card",
-		"D4436" =>	"Restricted Card, Retain Card",
-		"D4437" =>	"Contact Acquirer Security Department, Retain Card",
-		"D4438" =>	"PIN Tries Exceeded, Capture",
-		"D4439" =>	"No Credit Account",
-		"D4440" =>	"Function Not Supported",
-		"D4441" =>	"Lost Card",
-		"D4442" =>	"No Universal Account",
-		"D4443" =>	"Stolen Card",
-		"D4444" =>	"No Investment Account",
-		"D4450" =>	"Click-to-Pay (Visa Checkout) Transaction",
-		"D4451" =>	"Insufficient Funds",
-		"D4452" =>	"No Cheque Account",
-		"D4453" =>	"No Savings Account",
-		"D4454" =>	"Expired Card",
-		"D4455" =>	"Incorrect PIN",
-		"D4456" =>	"No Card Record",
-		"D4457" =>	"Function Not Permitted to Cardholder",
-		"D4458" =>	"Function Not Permitted to Terminal",
-		"D4459" =>	"Suspected Fraud",
-		"D4460" =>	"Acceptor Contact Acquirer",
-		"D4461" =>	"Exceeds Withdrawal Limit",
-		"D4462" =>	"Restricted Card",
-		"D4463" =>	"Security Violation",
-		"D4464" =>	"Original Amount Incorrect",
-		"D4466" =>	"Acceptor Contact Acquirer, Security",
-		"D4467" =>	"Capture Card",
-		"D4475" =>	"PIN Tries Exceeded",
-		"D4476" =>	"Invalidate Txn Reference",
-		"D4481" =>	"Accumulated Transaction Counter (Amount) Exceeded",
-		"D4482" =>	"CVV Validation Error",
-		"D4483" =>	"Acquirer Is Not Accepting Transactions From You At This Time",
-		"D4484" =>	"Acquirer Is Not Accepting This Transaction",
-		"D4490" =>	"Cut off In Progress",
-		"D4491" =>	"Card Issuer Unavailable",
-		"D4492" =>	"Unable To Route Transaction",
-		"D4493" =>	"Cannot Complete, Violation Of The Law",
-		"D4494" =>	"Duplicate Transaction",
-		"D4495" =>	"Amex Declined",
-		"D4496" =>	"System Error",
-		"D4497" =>	"MasterPass Error",
-		"D4498" =>	"PayPal Create Transaction Error",
-		"D4499" =>	"Invalid Transaction for Auth/Void",
-	];
+    public static function getStatus($code)
+    {
+        if (array_key_exists($code, self::$success)) {
+            return ['success' => true, 'message' => self::$success[$code]];
+        }
 
+        if (array_key_exists($code, self::$failure)) {
+            return ['success' => false, 'message' => self::$failure[$code]];
+        }
 
-	public static function getStatus($code)
-	{
-		if(array_key_exists($code, self::$success))
-			return ['success' => true, 'message' => self::$success[$code]];
-
-		if(array_key_exists($code, self::$failure))
-			return ['success' => false, 'message' => self::$failure[$code]];
-
-		return ['success' => false, 'message' => "Unknown error message code - {$code}"];
-	}
-}
\ No newline at end of file
+        return ['success' => false, 'message' => "Unknown error message code - {$code}"];
+    }
+}
diff --git a/app/PaymentDrivers/Eway/Token.php b/app/PaymentDrivers/Eway/Token.php
index 8545521073af..06426f77272c 100644
--- a/app/PaymentDrivers/Eway/Token.php
+++ b/app/PaymentDrivers/Eway/Token.php
@@ -20,8 +20,8 @@ use App\Models\Payment;
 use App\Models\PaymentHash;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\EwayPaymentDriver;
 use App\PaymentDrivers\Eway\ErrorCode;
+use App\PaymentDrivers\EwayPaymentDriver;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
@@ -29,7 +29,7 @@ use Illuminate\Support\Str;
 
 class Token
 {
-	use MakesHash;
+    use MakesHash;
 
     public $eway_driver;
 
@@ -40,46 +40,44 @@ class Token
 
     public function tokenBilling(ClientGatewayToken $cgt, PaymentHash $payment_hash)
     {
-
         $amount = array_sum(array_column($payment_hash->invoices(), 'amount')) + $payment_hash->fee_total;
 
-
         $invoice_numbers = '';
 
-        if($this->eway_driver->payment_hash->data)
-            $invoice_numbers =  collect($this->eway_driver->payment_hash->data->invoices)->pluck('invoice_number')->implode(',');
-        
+        if ($this->eway_driver->payment_hash->data) {
+            $invoice_numbers = collect($this->eway_driver->payment_hash->data->invoices)->pluck('invoice_number')->implode(',');
+        }
+
         $description = "Invoices: {$invoice_numbers} for {$amount} for client {$this->eway_driver->client->present()->name()}";
 
         $this->eway_driver->payment_hash = $payment_hash;
 
-    	$transaction = [
-		    'Customer' => [
-		        'TokenCustomerID' => $cgt->token,
-		    ],
-		    'Payment' => [
-		        'TotalAmount' => $this->eway_driver->convertAmount($amount),
+        $transaction = [
+            'Customer' => [
+                'TokenCustomerID' => $cgt->token,
+            ],
+            'Payment' => [
+                'TotalAmount' => $this->eway_driver->convertAmount($amount),
                 'CurrencyCode' => $this->eway_driver->client->currency()->code,
                 'InvoiceNumber' => $invoice_numbers,
-                'InvoiceDescription' => substr($description, 0,63),
-		    ],
-		    'TransactionType' => \Eway\Rapid\Enum\TransactionType::RECURRING,
-		];
+                'InvoiceDescription' => substr($description, 0, 63),
+            ],
+            'TransactionType' => \Eway\Rapid\Enum\TransactionType::RECURRING,
+        ];
 
         $response = $this->eway_driver->init()->eway->createTransaction(\Eway\Rapid\Enum\ApiMethod::DIRECT, $transaction);
 
         $response_status = ErrorCode::getStatus($response->ResponseMessage);
 
-        if(!$response_status['success'])
-          return $this->processUnsuccessfulPayment($response);
+        if (! $response_status['success']) {
+            return $this->processUnsuccessfulPayment($response);
+        }
 
-      	$payment = $this->processSuccessfulPayment($response, $cgt);
-
-      	return $payment;
+        $payment = $this->processSuccessfulPayment($response, $cgt);
 
+        return $payment;
     }
 
-
     private function processSuccessfulPayment($response, $cgt)
     {
         $amount = array_sum(array_column($this->eway_driver->payment_hash->invoices(), 'amount')) + $this->eway_driver->payment_hash->fee_total;
@@ -90,7 +88,7 @@ class Token
             'transaction_reference' => $response->TransactionID,
             'amount' => $amount,
         ];
-        
+
         $payment = $this->eway_driver->createPayment($data);
         $payment->meta = $cgt->meta;
         $payment->save();
@@ -99,17 +97,15 @@ class Token
         $this->eway_driver->payment_hash->save();
 
         return $payment;
-
     }
 
     private function processUnsuccessfulPayment($response)
     {
-
         $response_status = ErrorCode::getStatus($response->ResponseMessage);
 
-    	$error = $response_status['message'];
-    	$error_code = $response->ResponseMessage;
-    	
+        $error = $response_status['message'];
+        $error_code = $response->ResponseMessage;
+
         $data = [
             'response' => $response,
             'error' => $error,
@@ -117,7 +113,5 @@ class Token
         ];
 
         return $this->eway_driver->processUnsuccessfulTransaction($data);
-
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/PaymentDrivers/EwayPaymentDriver.php b/app/PaymentDrivers/EwayPaymentDriver.php
index fba26466c06a..4fc3bc6e9945 100644
--- a/app/PaymentDrivers/EwayPaymentDriver.php
+++ b/app/PaymentDrivers/EwayPaymentDriver.php
@@ -48,7 +48,7 @@ class EwayPaymentDriver extends BaseDriver
         $apiEndpoint = $this->company_gateway->getConfigField('testMode') ? \Eway\Rapid\Client::MODE_SANDBOX : \Eway\Rapid\Client::MODE_PRODUCTION;
         $this->eway = \Eway\Rapid::createClient($apiKey, $apiPassword, $apiEndpoint);
 
-        return $this; 
+        return $this;
     }
 
     /* Returns an array of gateway types for the payment gateway */
@@ -56,7 +56,7 @@ class EwayPaymentDriver extends BaseDriver
     {
         $types = [];
 
-            $types[] = GatewayType::CREDIT_CARD;
+        $types[] = GatewayType::CREDIT_CARD;
 
         return $types;
     }
@@ -66,6 +66,7 @@ class EwayPaymentDriver extends BaseDriver
     {
         $class = self::$methods[$payment_method_id];
         $this->payment_method = new $class($this);
+
         return $this;
     }
 
@@ -92,11 +93,10 @@ class EwayPaymentDriver extends BaseDriver
     /* We need PCI compliance prior to enabling this */
     public function refund(Payment $payment, $amount, $return_client_response = false)
     {
-
         $refund = [
             'Refund' => [
                 'TransactionID' => $payment->transaction_reference,
-                'TotalAmount' => $this->convertAmount($amount)
+                'TotalAmount' => $this->convertAmount($amount),
             ],
         ];
 
@@ -105,7 +105,7 @@ class EwayPaymentDriver extends BaseDriver
         $transaction_reference = '';
         $refund_status = true;
         $refund_message = '';
-        
+
         if ($response->TransactionStatus) {
             $transaction_reference = $response->TransactionID;
         } else {
@@ -142,15 +142,17 @@ class EwayPaymentDriver extends BaseDriver
     {
         $precision = $this->client->currency()->precision;
 
-        if($precision == 0)
+        if ($precision == 0) {
             return $amount;
+        }
 
-        if($precision == 1)
-            return $amount*10;
-
-        if($precision == 2)
-            return $amount*100;
+        if ($precision == 1) {
+            return $amount * 10;
+        }
 
+        if ($precision == 2) {
+            return $amount * 100;
+        }
 
         return $amount;
     }
@@ -177,8 +179,9 @@ class EwayPaymentDriver extends BaseDriver
             $fields[] = ['name' => 'client_state', 'label' => ctrans('texts.state'), 'type' => 'text', 'validation' => 'required'];
         }
 
-        if($this->company_gateway->require_postal_code)
+        if ($this->company_gateway->require_postal_code) {
             $fields[] = ['name' => 'client_postal_code', 'label' => ctrans('texts.postal_code'), 'type' => 'text', 'validation' => 'required'];
+        }
 
         if ($this->company_gateway->require_shipping_address) {
             $fields[] = ['name' => 'client_shipping_address_line_1', 'label' => ctrans('texts.shipping_address1'), 'type' => 'text', 'validation' => 'required'];
@@ -188,7 +191,6 @@ class EwayPaymentDriver extends BaseDriver
             $fields[] = ['name' => 'client_shipping_country_id', 'label' => ctrans('texts.shipping_country'), 'type' => 'text', 'validation' => 'required'];
         }
 
-
         return $fields;
     }
 }
diff --git a/app/PaymentDrivers/GoCardless/ACH.php b/app/PaymentDrivers/GoCardless/ACH.php
index 174fa0ce81ca..885434cd41e4 100644
--- a/app/PaymentDrivers/GoCardless/ACH.php
+++ b/app/PaymentDrivers/GoCardless/ACH.php
@@ -7,7 +7,7 @@
  *
  * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace App\PaymentDrivers\GoCardless;
@@ -56,20 +56,20 @@ class ACH implements MethodInterface
 
         try {
             $redirect = $this->go_cardless->gateway->redirectFlows()->create([
-                "params" => [
-                    "scheme" => "ach",
-                    "session_token" => $session_token,
-                    "success_redirect_url" => route('client.payment_methods.confirm', [
+                'params' => [
+                    'scheme' => 'ach',
+                    'session_token' => $session_token,
+                    'success_redirect_url' => route('client.payment_methods.confirm', [
                         'method' => GatewayType::BANK_TRANSFER,
                         'session_token' => $session_token,
                     ]),
-                    "prefilled_customer" => [
-                        "given_name" => auth()->guard('contact')->user()->first_name,
-                        "family_name" => auth()->guard('contact')->user()->last_name,
-                        "email" => auth()->guard('contact')->user()->email,
-                        "address_line1" => auth()->guard('contact')->user()->client->address1,
-                        "city" => auth()->guard('contact')->user()->client->city,
-                        "postal_code" => auth()->guard('contact')->user()->client->postal_code,
+                    'prefilled_customer' => [
+                        'given_name' => auth()->guard('contact')->user()->first_name,
+                        'family_name' => auth()->guard('contact')->user()->last_name,
+                        'email' => auth()->guard('contact')->user()->email,
+                        'address_line1' => auth()->guard('contact')->user()->client->address1,
+                        'city' => auth()->guard('contact')->user()->client->city,
+                        'postal_code' => auth()->guard('contact')->user()->client->postal_code,
                     ],
                 ],
             ]);
@@ -89,7 +89,7 @@ class ACH implements MethodInterface
      * @throws PaymentFailed
      * @return void
      */
-    public function processUnsuccessfulAuthorization(\Exception $exception): void
+    public function processUnsuccessfulAuthorization(Exception $exception): void
     {
         SystemLogger::dispatch(
             $exception->getMessage(),
@@ -115,7 +115,7 @@ class ACH implements MethodInterface
             $redirect_flow = $this->go_cardless->gateway->redirectFlows()->complete(
                 $request->redirect_flow_id,
                 ['params' => [
-                    'session_token' => $request->session_token
+                    'session_token' => $request->session_token,
                 ]],
             );
 
@@ -161,17 +161,17 @@ class ACH implements MethodInterface
      */
     public function paymentResponse(PaymentResponseRequest $request)
     {
-
         $this->go_cardless->ensureMandateIsReady($request->source);
 
         $invoice = Invoice::whereIn('id', $this->transformKeys(array_column($this->go_cardless->payment_hash->invoices(), 'invoice_id')))
                           ->withTrashed()
                           ->first();
 
-        if($invoice)
+        if ($invoice) {
             $description = "Invoice {$invoice->number} for {$request->amount} for client {$this->go_cardless->client->present()->name()}";
-        else
+        } else {
             $description = "Amount {$request->amount} from client {$this->go_cardless->client->present()->name()}";
+        }
 
         try {
             $payment = $this->go_cardless->gateway->payments()->create([
@@ -188,7 +188,6 @@ class ACH implements MethodInterface
                 ],
             ]);
 
-
             if ($payment->status === 'pending_submission') {
                 return $this->processPendingPayment($payment);
             }
@@ -206,7 +205,7 @@ class ACH implements MethodInterface
      * @param array $data
      * @return RedirectResponse
      */
-    public function processPendingPayment(\GoCardlessPro\Resources\Payment $payment, array $data = [])
+    public function processPendingPayment(ResourcesPayment $payment, array $data = [])
     {
         $data = [
             'payment_type' => PaymentType::ACH,
@@ -235,10 +234,10 @@ class ACH implements MethodInterface
      * @param ResourcesPayment $payment
      * @return never
      */
-    public function processUnsuccessfulPayment(\GoCardlessPro\Resources\Payment $payment)
+    public function processUnsuccessfulPayment(ResourcesPayment $payment)
     {
         $this->go_cardless->sendFailureMail($payment->status);
-        
+
         $message = [
             'server_response' => $payment,
             'data' => $this->go_cardless->payment_hash->data,
diff --git a/app/PaymentDrivers/GoCardless/DirectDebit.php b/app/PaymentDrivers/GoCardless/DirectDebit.php
index 70f86708a29f..9204100b87a2 100644
--- a/app/PaymentDrivers/GoCardless/DirectDebit.php
+++ b/app/PaymentDrivers/GoCardless/DirectDebit.php
@@ -7,7 +7,7 @@
  *
  * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace App\PaymentDrivers\GoCardless;
@@ -113,7 +113,7 @@ class DirectDebit implements MethodInterface
             $redirect_flow = $this->go_cardless->gateway->redirectFlows()->complete(
                 $request->redirect_flow_id,
                 ['params' => [
-                    'session_token' => $request->session_token
+                    'session_token' => $request->session_token,
                 ]],
             );
 
@@ -153,17 +153,17 @@ class DirectDebit implements MethodInterface
 
     public function paymentResponse(PaymentResponseRequest $request)
     {
-
         $this->go_cardless->ensureMandateIsReady($request->source);
 
         $invoice = Invoice::whereIn('id', $this->transformKeys(array_column($this->go_cardless->payment_hash->invoices(), 'invoice_id')))
                           ->withTrashed()
                           ->first();
 
-        if($invoice)
+        if ($invoice) {
             $description = "Invoice {$invoice->number} for {$request->amount} for client {$this->go_cardless->client->present()->name()}";
-        else
+        } else {
             $description = "Amount {$request->amount} from client {$this->go_cardless->client->present()->name()}";
+        }
 
         try {
             $payment = $this->go_cardless->gateway->payments()->create([
@@ -180,7 +180,6 @@ class DirectDebit implements MethodInterface
                 ],
             ]);
 
-
             if ($payment->status === 'pending_submission') {
                 return $this->processPendingPayment($payment, ['token' => $request->source]);
             }
diff --git a/app/PaymentDrivers/GoCardless/InstantBankPay.php b/app/PaymentDrivers/GoCardless/InstantBankPay.php
index 3ba3cdc8dcd3..5543a3992a3a 100644
--- a/app/PaymentDrivers/GoCardless/InstantBankPay.php
+++ b/app/PaymentDrivers/GoCardless/InstantBankPay.php
@@ -56,11 +56,11 @@ class InstantBankPay implements MethodInterface
             $billing_request = $this->go_cardless->gateway->billingRequests()->create([
                 'params' => [
                     'payment_request' => [
-                        'description' => ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number'),
+                        'description' => ctrans('texts.invoices').': '.collect($data['invoices'])->pluck('invoice_number'),
                         'amount' => (string) $data['amount_with_fee'] * 100,
                         'currency' => $this->go_cardless->client->getCurrencyCode(),
                     ],
-                ]
+                ],
             ]);
 
             $billing_request_flow = $this->go_cardless->gateway->billingRequestFlows()->create([
@@ -72,7 +72,7 @@ class InstantBankPay implements MethodInterface
                     ]),
                     'links' => [
                         'billing_request' => $billing_request->id,
-                    ]
+                    ],
                 ],
             ]);
 
diff --git a/app/PaymentDrivers/GoCardless/SEPA.php b/app/PaymentDrivers/GoCardless/SEPA.php
index 3771d25bdb95..cb80b89549f5 100644
--- a/app/PaymentDrivers/GoCardless/SEPA.php
+++ b/app/PaymentDrivers/GoCardless/SEPA.php
@@ -7,7 +7,7 @@
  *
  * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace App\PaymentDrivers\GoCardless;
@@ -87,7 +87,7 @@ class SEPA implements MethodInterface
      * @param Exception $exception
      * @return void
      */
-    public function processUnsuccessfulAuthorization(\Exception $exception): void
+    public function processUnsuccessfulAuthorization(Exception $exception): void
     {
         $this->go_cardless->sendFailureMail($exception->getMessage());
 
@@ -115,7 +115,7 @@ class SEPA implements MethodInterface
             $redirect_flow = $this->go_cardless->gateway->redirectFlows()->complete(
                 $request->redirect_flow_id,
                 ['params' => [
-                    'session_token' => $request->session_token
+                    'session_token' => $request->session_token,
                 ]],
             );
 
@@ -167,10 +167,11 @@ class SEPA implements MethodInterface
                           ->withTrashed()
                           ->first();
 
-        if($invoice)
+        if ($invoice) {
             $description = "Invoice {$invoice->number} for {$request->amount} for client {$this->go_cardless->client->present()->name()}";
-        else
+        } else {
             $description = "Amount {$request->amount} from client {$this->go_cardless->client->present()->name()}";
+        }
 
         try {
             $payment = $this->go_cardless->gateway->payments()->create([
diff --git a/app/PaymentDrivers/GoCardlessPaymentDriver.php b/app/PaymentDrivers/GoCardlessPaymentDriver.php
index 26810875467e..e93bd171f5a1 100644
--- a/app/PaymentDrivers/GoCardlessPaymentDriver.php
+++ b/app/PaymentDrivers/GoCardlessPaymentDriver.php
@@ -6,7 +6,7 @@
  *
  * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace App\PaymentDrivers;
@@ -141,7 +141,6 @@ class GoCardlessPaymentDriver extends BaseDriver
                 ],
             ]);
 
-
             if ($payment->status === 'pending_submission') {
                 $this->confirmGatewayFee();
 
@@ -232,23 +231,21 @@ class GoCardlessPaymentDriver extends BaseDriver
         // Allow app to catch up with webhook request.
         $this->init();
 
-        nlog("GoCardless Event");
+        nlog('GoCardless Event');
         nlog($request->all());
 
-        if(!$request->has("events")){
+        if (! $request->has('events')) {
+            nlog('No GoCardless events to process in response?');
 
-            nlog("No GoCardless events to process in response?");
             return response()->json([], 200);
-
         }
 
         sleep(1);
 
         foreach ($request->events as $event) {
             if ($event['action'] === 'confirmed' || $event['action'] === 'paid_out') {
+                nlog('Searching for transaction reference');
 
-                nlog("Searching for transaction reference");
-                
                 $payment = Payment::query()
                     ->where('transaction_reference', $event['links']['payment'])
                     ->where('company_id', $request->getCompany()->id)
@@ -257,16 +254,14 @@ class GoCardlessPaymentDriver extends BaseDriver
                 if ($payment) {
                     $payment->status_id = Payment::STATUS_COMPLETED;
                     $payment->save();
-                    nlog("GoCardless completed");
+                    nlog('GoCardless completed');
+                } else {
+                    nlog('I was unable to find the payment for this reference');
                 }
-                else
-                    nlog("I was unable to find the payment for this reference");
                 //finalize payments on invoices here.
-
             }
 
             if ($event['action'] === 'failed') {
-
                 $payment = Payment::query()
                     ->where('transaction_reference', $event['links']['payment'])
                     ->where('company_id', $request->getCompany()->id)
@@ -275,7 +270,7 @@ class GoCardlessPaymentDriver extends BaseDriver
                 if ($payment) {
                     $payment->status_id = Payment::STATUS_FAILED;
                     $payment->save();
-                    nlog("GoCardless completed");
+                    nlog('GoCardless completed');
                 }
             }
         }
diff --git a/app/PaymentDrivers/Mollie/Bancontact.php b/app/PaymentDrivers/Mollie/Bancontact.php
index f9b74cd8e281..e86d6c914836 100644
--- a/app/PaymentDrivers/Mollie/Bancontact.php
+++ b/app/PaymentDrivers/Mollie/Bancontact.php
@@ -13,7 +13,6 @@
 namespace App\PaymentDrivers\Mollie;
 
 use App\Exceptions\PaymentFailed;
-use Illuminate\Http\Request;
 use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
 use App\Jobs\Util\SystemLogger;
 use App\Models\GatewayType;
@@ -23,6 +22,7 @@ use App\Models\SystemLog;
 use App\PaymentDrivers\Common\MethodInterface;
 use App\PaymentDrivers\MolliePaymentDriver;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
 use Illuminate\View\View;
 
 class Bancontact implements MethodInterface
@@ -111,7 +111,6 @@ class Bancontact implements MethodInterface
      */
     public function processUnsuccessfulPayment(\Exception $exception): void
     {
-
         $this->mollie->sendFailureMail($exception->getMessage());
 
         SystemLogger::dispatch(
@@ -126,7 +125,6 @@ class Bancontact implements MethodInterface
         throw new PaymentFailed($exception->getMessage(), $exception->getCode());
     }
 
-
     /**
      * Handle the payments for the KBC.
      *
@@ -135,9 +133,9 @@ class Bancontact implements MethodInterface
      */
     public function paymentResponse(PaymentResponseRequest $request)
     {
-        if (!\property_exists($this->mollie->payment_hash->data, 'payment_id')) {
+        if (! \property_exists($this->mollie->payment_hash->data, 'payment_id')) {
             return $this->processUnsuccessfulPayment(
-                new PaymentFailed('Whoops, something went wrong. Missing required [payment_id] parameter. Please contact administrator. Reference hash: ' . $this->mollie->payment_hash->hash)
+                new PaymentFailed('Whoops, something went wrong. Missing required [payment_id] parameter. Please contact administrator. Reference hash: '.$this->mollie->payment_hash->hash)
             );
         }
 
diff --git a/app/PaymentDrivers/Mollie/BankTransfer.php b/app/PaymentDrivers/Mollie/BankTransfer.php
index 45119b08923c..dfb1d67af1fb 100644
--- a/app/PaymentDrivers/Mollie/BankTransfer.php
+++ b/app/PaymentDrivers/Mollie/BankTransfer.php
@@ -14,7 +14,6 @@ namespace App\PaymentDrivers\Mollie;
 
 use App\Exceptions\PaymentFailed;
 use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
-use Illuminate\Http\Request;
 use App\Jobs\Util\SystemLogger;
 use App\Models\GatewayType;
 use App\Models\Payment;
@@ -24,6 +23,7 @@ use App\PaymentDrivers\Common\MethodInterface;
 use App\PaymentDrivers\MolliePaymentDriver;
 use Exception;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Illuminate\View\View;
 use Mollie\Api\Resources\Payment as ResourcesPayment;
@@ -112,9 +112,8 @@ class BankTransfer implements MethodInterface
      * @throws PaymentFailed
      * @return void
      */
-    public function processUnsuccessfulPayment(\Exception $e): void
+    public function processUnsuccessfulPayment(Exception $e): void
     {
-
         $this->mollie->sendFailureMail($e->getMessage());
 
         SystemLogger::dispatch(
@@ -139,7 +138,7 @@ class BankTransfer implements MethodInterface
     {
         if (! \property_exists($this->mollie->payment_hash->data, 'payment_id')) {
             return $this->processUnsuccessfulPayment(
-                new PaymentFailed('Whoops, something went wrong. Missing required [payment_id] parameter. Please contact administrator. Reference hash: ' . $this->mollie->payment_hash->hash)
+                new PaymentFailed('Whoops, something went wrong. Missing required [payment_id] parameter. Please contact administrator. Reference hash: '.$this->mollie->payment_hash->hash)
             );
         }
 
@@ -171,7 +170,7 @@ class BankTransfer implements MethodInterface
      * @param string $status
      * @return RedirectResponse
      */
-    public function processSuccessfulPayment(\Mollie\Api\Resources\Payment $payment, $status = 'paid'): RedirectResponse
+    public function processSuccessfulPayment(ResourcesPayment $payment, $status = 'paid'): RedirectResponse
     {
         $data = [
             'gateway_type_id' => GatewayType::BANK_TRANSFER,
@@ -203,7 +202,7 @@ class BankTransfer implements MethodInterface
      * @param ResourcesPayment $payment
      * @return RedirectResponse
      */
-    public function processOpenPayment(\Mollie\Api\Resources\Payment $payment): RedirectResponse
+    public function processOpenPayment(ResourcesPayment $payment): RedirectResponse
     {
         return $this->processSuccessfulPayment($payment, 'open');
     }
diff --git a/app/PaymentDrivers/Mollie/CreditCard.php b/app/PaymentDrivers/Mollie/CreditCard.php
index 1c96455d86ff..bd6b2054fff2 100644
--- a/app/PaymentDrivers/Mollie/CreditCard.php
+++ b/app/PaymentDrivers/Mollie/CreditCard.php
@@ -56,7 +56,7 @@ class CreditCard
             ->withData('gateway_type_id', GatewayType::CREDIT_CARD)
             ->withData('client_id', $this->mollie->client->id);
 
-        if (!empty($request->token)) {
+        if (! empty($request->token)) {
             try {
                 $cgt = ClientGatewayToken::where('token', $request->token)->firstOrFail();
 
@@ -93,8 +93,6 @@ class CreditCard
                     return redirect($payment->getCheckoutUrl());
                 }
             } catch (\Exception $e) {
-
-
                 return $this->processUnsuccessfulPayment($e);
             }
         }
@@ -113,11 +111,11 @@ class CreditCard
                 ]),
                 'webhookUrl'  => $this->mollie->company_gateway->webhookUrl(),
                 'metadata' => [
-                        'client_id' => $this->mollie->client->hashed_id,
-                        'hash' => $this->mollie->payment_hash->hash,
-                        'gateway_type_id' => GatewayType::CREDIT_CARD,
-                        'payment_type_id' => PaymentType::CREDIT_CARD_OTHER,
-                    ],
+                    'client_id' => $this->mollie->client->hashed_id,
+                    'hash' => $this->mollie->payment_hash->hash,
+                    'gateway_type_id' => GatewayType::CREDIT_CARD,
+                    'payment_type_id' => PaymentType::CREDIT_CARD_OTHER,
+                ],
                 'cardToken' => $request->gateway_response,
             ];
 
@@ -126,7 +124,7 @@ class CreditCard
                     'name' => $this->mollie->client->name,
                     'email' => $this->mollie->client->present()->email(),
                     'metadata' => [
-                        'id' => $this->mollie->client->hashed_id
+                        'id' => $this->mollie->client->hashed_id,
                     ],
                 ]);
 
@@ -155,7 +153,6 @@ class CreditCard
                 return redirect($payment->getCheckoutUrl());
             }
         } catch (\Exception $e) {
-
             $this->processUnsuccessfulPayment($e);
 
             throw new PaymentFailed($e->getMessage(), $e->getCode());
@@ -210,7 +207,6 @@ class CreditCard
 
     public function processUnsuccessfulPayment(\Exception $e)
     {
-
         $this->mollie->sendFailureMail($e->getMessage());
 
         SystemLogger::dispatch(
diff --git a/app/PaymentDrivers/Mollie/IDEAL.php b/app/PaymentDrivers/Mollie/IDEAL.php
index 1dcb8687c473..0ac4991db5ee 100644
--- a/app/PaymentDrivers/Mollie/IDEAL.php
+++ b/app/PaymentDrivers/Mollie/IDEAL.php
@@ -7,14 +7,13 @@
  *
  * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace App\PaymentDrivers\Mollie;
 
 use App\Exceptions\PaymentFailed;
 use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
-use Illuminate\Http\Request;
 use App\Jobs\Util\SystemLogger;
 use App\Models\GatewayType;
 use App\Models\Payment;
@@ -23,6 +22,7 @@ use App\Models\SystemLog;
 use App\PaymentDrivers\Common\MethodInterface;
 use App\PaymentDrivers\MolliePaymentDriver;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
 use Illuminate\View\View;
 
 class IDEAL implements MethodInterface
@@ -111,7 +111,6 @@ class IDEAL implements MethodInterface
      */
     public function processUnsuccessfulPayment(\Exception $exception): void
     {
-
         $this->mollie->sendFailureMail($exception->getMessage());
 
         SystemLogger::dispatch(
@@ -134,9 +133,9 @@ class IDEAL implements MethodInterface
      */
     public function paymentResponse(PaymentResponseRequest $request)
     {
-        if (!\property_exists($this->mollie->payment_hash->data, 'payment_id')) {
+        if (! \property_exists($this->mollie->payment_hash->data, 'payment_id')) {
             return $this->processUnsuccessfulPayment(
-                new PaymentFailed('Whoops, something went wrong. Missing required [payment_id] parameter. Please contact administrator. Reference hash: ' . $this->mollie->payment_hash->hash)
+                new PaymentFailed('Whoops, something went wrong. Missing required [payment_id] parameter. Please contact administrator. Reference hash: '.$this->mollie->payment_hash->hash)
             );
         }
 
diff --git a/app/PaymentDrivers/Mollie/KBC.php b/app/PaymentDrivers/Mollie/KBC.php
index 3f7818168420..40e30cb31436 100644
--- a/app/PaymentDrivers/Mollie/KBC.php
+++ b/app/PaymentDrivers/Mollie/KBC.php
@@ -13,7 +13,6 @@
 namespace App\PaymentDrivers\Mollie;
 
 use App\Exceptions\PaymentFailed;
-use Illuminate\Http\Request;
 use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
 use App\Jobs\Util\SystemLogger;
 use App\Models\GatewayType;
@@ -23,6 +22,7 @@ use App\Models\SystemLog;
 use App\PaymentDrivers\Common\MethodInterface;
 use App\PaymentDrivers\MolliePaymentDriver;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
 use Illuminate\View\View;
 
 class KBC implements MethodInterface
@@ -102,7 +102,7 @@ class KBC implements MethodInterface
         }
     }
 
-        /**
+    /**
      * Handle unsuccessful payment.
      *
      * @param Exception $exception
@@ -111,7 +111,6 @@ class KBC implements MethodInterface
      */
     public function processUnsuccessfulPayment(\Exception $exception): void
     {
-
         $this->mollie->sendFailureMail($exception->getMessage());
 
         SystemLogger::dispatch(
@@ -136,7 +135,7 @@ class KBC implements MethodInterface
     {
         if (! \property_exists($this->mollie->payment_hash->data, 'payment_id')) {
             return $this->processUnsuccessfulPayment(
-                new PaymentFailed('Whoops, something went wrong. Missing required [payment_id] parameter. Please contact administrator. Reference hash: ' . $this->mollie->payment_hash->hash)
+                new PaymentFailed('Whoops, something went wrong. Missing required [payment_id] parameter. Please contact administrator. Reference hash: '.$this->mollie->payment_hash->hash)
             );
         }
 
diff --git a/app/PaymentDrivers/MolliePaymentDriver.php b/app/PaymentDrivers/MolliePaymentDriver.php
index 6e08cbe3482a..4f25121ca295 100644
--- a/app/PaymentDrivers/MolliePaymentDriver.php
+++ b/app/PaymentDrivers/MolliePaymentDriver.php
@@ -39,7 +39,7 @@ class MolliePaymentDriver extends BaseDriver
     use MakesHash;
 
     /**
-     * @var boolean
+     * @var bool
      */
     public $refundable = true;
 
@@ -294,7 +294,7 @@ class MolliePaymentDriver extends BaseDriver
         }
 
         $this->init();
-        
+
         $codes = [
             'open' => Payment::STATUS_PENDING,
             'canceled' => Payment::STATUS_CANCELLED,
@@ -310,23 +310,21 @@ class MolliePaymentDriver extends BaseDriver
             $payment = $this->gateway->payments->get($request->id);
             $record = Payment::withTrashed()->where('transaction_reference', $request->id)->first();
 
-            if($record){
+            if ($record) {
                 $client = $record->client;
                 $this->client = $client;
-            }
-            else{
-
+            } else {
                 $client = Client::withTrashed()->find($this->decodePrimaryKey($payment->metadata->client_id));
                 $this->client = $client;
-                // sometimes if the user is not returned to the site with a response from Mollie 
+                // sometimes if the user is not returned to the site with a response from Mollie
                 // we may not have a payment record - in these cases we need to re-construct the payment
                 // record from the meta data in the payment hash.
 
-                if($payment && property_exists($payment->metadata, 'hash') && $payment->metadata->hash){
-                    
+                if ($payment && property_exists($payment->metadata, 'hash') && $payment->metadata->hash) {
+
                     /* Harvest Payment Hash*/
                     $payment_hash = PaymentHash::where('hash', $payment->metadata->hash)->first();
-                    
+
                     /* If we are here, then we do not have access to the class payment hash, so lets set it here*/
                     $this->payment_hash = $payment_hash;
 
@@ -336,12 +334,11 @@ class MolliePaymentDriver extends BaseDriver
                         'payment_type' => $payment->metadata->payment_type_id,
                         'transaction_reference' => $payment->id,
                     ];
-                    
+
                     $record = $this->createPayment(
                         $data,
                         $codes[$payment->status]
                     );
-                
                 }
             }
 
@@ -352,10 +349,10 @@ class MolliePaymentDriver extends BaseDriver
 
             $response = SystemLog::EVENT_GATEWAY_FAILURE;
 
-            if($record){
-
-                if(in_array($payment->status, ['canceled','expired','failed']))
+            if ($record) {
+                if (in_array($payment->status, ['canceled', 'expired', 'failed'])) {
                     $record->service()->deletePayment();
+                }
 
                 $record->status_id = $codes[$payment->status];
                 $record->save();
@@ -372,7 +369,6 @@ class MolliePaymentDriver extends BaseDriver
             );
 
             return response()->json([], 200);
-
         } catch (ApiException $e) {
             return response()->json(['message' => $e->getMessage(), 'gatewayStatusCode' => $e->getCode()], 500);
         }
@@ -416,9 +412,9 @@ class MolliePaymentDriver extends BaseDriver
 
     /**
      * Convert the amount to the format that Mollie supports.
-     * 
-     * @param mixed|float $amount 
-     * @return string 
+     *
+     * @param mixed|float $amount
+     * @return string
      */
     public function convertToMollieAmount($amount): string
     {
diff --git a/app/PaymentDrivers/PayFast/CreditCard.php b/app/PaymentDrivers/PayFast/CreditCard.php
index 9e06d77879dd..95831d3ed155 100644
--- a/app/PaymentDrivers/PayFast/CreditCard.php
+++ b/app/PaymentDrivers/PayFast/CreditCard.php
@@ -27,7 +27,6 @@ use Illuminate\Support\Str;
 
 class CreditCard
 {
-
     public $payfast;
 
     public function __construct(PayFastPaymentDriver $payfast)
@@ -35,57 +34,57 @@ class CreditCard
         $this->payfast = $payfast;
     }
 
-/*
-        $data = array();
-        $data['merchant_id'] = $this->getMerchantId();
-        $data['merchant_key'] = $this->getMerchantKey();
-        $data['return_url'] = $this->getReturnUrl();
-        $data['cancel_url'] = $this->getCancelUrl();
-        $data['notify_url'] = $this->getNotifyUrl();
+    /*
+            $data = array();
+            $data['merchant_id'] = $this->getMerchantId();
+            $data['merchant_key'] = $this->getMerchantKey();
+            $data['return_url'] = $this->getReturnUrl();
+            $data['cancel_url'] = $this->getCancelUrl();
+            $data['notify_url'] = $this->getNotifyUrl();
 
-        if ($this->getCard()) {
-            $data['name_first'] = $this->getCard()->getFirstName();
-            $data['name_last'] = $this->getCard()->getLastName();
-            $data['email_address'] = $this->getCard()->getEmail();
-        }
+            if ($this->getCard()) {
+                $data['name_first'] = $this->getCard()->getFirstName();
+                $data['name_last'] = $this->getCard()->getLastName();
+                $data['email_address'] = $this->getCard()->getEmail();
+            }
 
-        $data['m_payment_id'] = $this->getTransactionId();
-        $data['amount'] = $this->getAmount();
-        $data['item_name'] = $this->getDescription();
-        $data['custom_int1'] = $this->getCustomInt1();
-        $data['custom_int2'] = $this->getCustomInt2();
-        $data['custom_int3'] = $this->getCustomInt3();
-        $data['custom_int4'] = $this->getCustomInt4();
-        $data['custom_int5'] = $this->getCustomInt5();
-        $data['custom_str1'] = $this->getCustomStr1();
-        $data['custom_str2'] = $this->getCustomStr2();
-        $data['custom_str3'] = $this->getCustomStr3();
-        $data['custom_str4'] = $this->getCustomStr4();
-        $data['custom_str5'] = $this->getCustomStr5();
+            $data['m_payment_id'] = $this->getTransactionId();
+            $data['amount'] = $this->getAmount();
+            $data['item_name'] = $this->getDescription();
+            $data['custom_int1'] = $this->getCustomInt1();
+            $data['custom_int2'] = $this->getCustomInt2();
+            $data['custom_int3'] = $this->getCustomInt3();
+            $data['custom_int4'] = $this->getCustomInt4();
+            $data['custom_int5'] = $this->getCustomInt5();
+            $data['custom_str1'] = $this->getCustomStr1();
+            $data['custom_str2'] = $this->getCustomStr2();
+            $data['custom_str3'] = $this->getCustomStr3();
+            $data['custom_str4'] = $this->getCustomStr4();
+            $data['custom_str5'] = $this->getCustomStr5();
 
-        if ($this->getPaymentMethod()) {
-            $data['payment_method'] = $this->getPaymentMethod();
-        }
+            if ($this->getPaymentMethod()) {
+                $data['payment_method'] = $this->getPaymentMethod();
+            }
 
-        if (1 == $this->getSubscriptionType()) {
-            $data['subscription_type'] = $this->getSubscriptionType();
-            $data['billing_date'] = $this->getBillingDate();
-            $data['recurring_amount'] = $this->getRecurringAmount();
-            $data['frequency'] = $this->getFrequency();
-            $data['cycles'] = $this->getCycles();
-        }
-        if (2 == $this->getSubscriptionType()) {
-            $data['subscription_type'] = $this->getSubscriptionType();
-        }
+            if (1 == $this->getSubscriptionType()) {
+                $data['subscription_type'] = $this->getSubscriptionType();
+                $data['billing_date'] = $this->getBillingDate();
+                $data['recurring_amount'] = $this->getRecurringAmount();
+                $data['frequency'] = $this->getFrequency();
+                $data['cycles'] = $this->getCycles();
+            }
+            if (2 == $this->getSubscriptionType()) {
+                $data['subscription_type'] = $this->getSubscriptionType();
+            }
 
-        $data['passphrase'] = $this->getParameter('passphrase'); 123456789012aV
-        $data['signature'] = $this->generateSignature($data);
- */
+            $data['passphrase'] = $this->getParameter('passphrase'); 123456789012aV
+            $data['signature'] = $this->generateSignature($data);
+     */
 
     public function authorizeView($data)
     {
         $hash = Str::random(32);
-        
+
         Cache::put($hash, 'cc_auth', 300);
 
         $data = [
@@ -100,7 +99,7 @@ class CreditCard
             'item_description' => 'Credit Card Pre Authorization',
             'subscription_type' => 2,
             'passphrase' => $this->payfast->company_gateway->getConfigField('passphrase'),
-        ];        
+        ];
 
         $data['signature'] = $this->payfast->generateSignature($data);
         $data['gateway'] = $this->payfast;
@@ -112,7 +111,7 @@ class CreditCard
     /*
       'm_payment_id' => NULL,
       'pf_payment_id' => '1409993',
-      'payment_status' => 'COMPLETE', 
+      'payment_status' => 'COMPLETE',
       'item_name' => 'pre-auth',
       'item_description' => NULL,
       'amount_gross' => '5.00',
@@ -137,8 +136,8 @@ class CreditCard
       'signature' => 'ebdb4ca937d0e3f43462841c0afc6ad9',
       'q' => '/payment_notification_webhook/EhbnVYyzJZyccY85hcHIkIzNPI2rtHzznAyyyG73oSxZidAdN9gf8BvAKDomqeHp/4openRe7Az/WPe99p3eLy',
      */
- 	public function authorizeResponse($request)
- 	{
+    public function authorizeResponse($request)
+    {
         $data = $request->all();
 
         $cgt = [];
@@ -157,12 +156,10 @@ class CreditCard
         $token = $this->payfast->storeGatewayToken($cgt, []);
 
         return response()->json([], 200);
-
- 	}  
+    }
 
     public function paymentView($data)
     {
-
         $payfast_data = [
             'merchant_id' => $this->payfast->company_gateway->getConfigField('merchantId'),
             'merchant_key' => $this->payfast->company_gateway->getConfigField('merchantKey'),
@@ -172,16 +169,15 @@ class CreditCard
             'm_payment_id' => $data['payment_hash'],
             'amount' => $data['amount_with_fee'],
             'item_name' => 'purchase',
-            'item_description' => ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number'),
+            'item_description' => ctrans('texts.invoices').': '.collect($data['invoices'])->pluck('invoice_number'),
             'passphrase' => $this->payfast->company_gateway->getConfigField('passphrase'),
-        ];  
+        ];
 
         $payfast_data['signature'] = $this->payfast->generateSignature($payfast_data);
         $payfast_data['gateway'] = $this->payfast;
         $payfast_data['payment_endpoint_url'] = $this->payfast->endpointUrl();
 
         return render('gateways.payfast.pay', array_merge($data, $payfast_data));
-
     }
 
     /*
@@ -225,20 +221,17 @@ class CreditCard
         $this->payfast->payment_hash->data = array_merge((array) $this->payfast->payment_hash->data, $state);
         $this->payfast->payment_hash->save();
 
-        if($response_array['payment_status'] == 'COMPLETE') {
-
+        if ($response_array['payment_status'] == 'COMPLETE') {
             $this->payfast->logSuccessfulGatewayResponse(['response' => $response_array, 'data' => $this->payfast->payment_hash], SystemLog::TYPE_PAYFAST);
 
             return $this->processSuccessfulPayment($response_array);
-        }
-        else {
+        } else {
             $this->processUnsuccessfulPayment($response_array);
         }
     }
 
     private function processSuccessfulPayment($response_array)
     {
-
         $payment_record = [];
         $payment_record['amount'] = $response_array['amount_gross'];
         $payment_record['payment_type'] = PaymentType::CREDIT_CARD_OTHER;
@@ -253,7 +246,7 @@ class CreditCard
     private function processUnsuccessfulPayment($server_response)
     {
         $this->payfast->sendFailureMail($server_response->cancellation_reason);
-        
+
         $message = [
             'server_response' => $server_response,
             'data' => $this->payfast->payment_hash->data,
@@ -270,5 +263,4 @@ class CreditCard
 
         throw new PaymentFailed('Failed to process the payment.', 500);
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/PaymentDrivers/PayFast/Token.php b/app/PaymentDrivers/PayFast/Token.php
index 3aedb3f5922a..e6e676c6f09e 100644
--- a/app/PaymentDrivers/PayFast/Token.php
+++ b/app/PaymentDrivers/PayFast/Token.php
@@ -21,14 +21,13 @@ use App\Models\PaymentHash;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
 use App\PaymentDrivers\PayFastPaymentDriver;
+use GuzzleHttp\RequestOptions;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
-use GuzzleHttp\RequestOptions;
 
 class Token
 {
-
     public $payfast;
 
     public function __construct(PayFastPaymentDriver $payfast)
@@ -38,78 +37,75 @@ class Token
 
     public function tokenBilling(ClientGatewayToken $cgt, PaymentHash $payment_hash)
     {
-
         $amount = array_sum(array_column($payment_hash->invoices(), 'amount')) + $payment_hash->fee_total;
-		$amount = round(($amount * pow(10, $this->payfast->client->currency()->precision)),0);
+        $amount = round(($amount * pow(10, $this->payfast->client->currency()->precision)), 0);
 
-		$header =[
+        $header = [
             'merchant-id' => $this->payfast->company_gateway->getConfigField('merchantId'),
             'version' => 'v1',
             'timestamp' => now()->format('c'),
-		];
+        ];
 
         $body = [
             'amount' => $amount,
             'item_name' => 'purchase',
-            'item_description' => ctrans('texts.invoices') . ': ' . collect($payment_hash->invoices())->pluck('invoice_number'),
+            'item_description' => ctrans('texts.invoices').': '.collect($payment_hash->invoices())->pluck('invoice_number'),
             'm_payment_id' => $payment_hash->hash,
-        ];        
-        
+        ];
+
         $header['signature'] = $this->payfast->generateTokenSignature(array_merge($body, $header));
 
         // nlog($header['signature']);
 
         $result = $this->send($header, $body, $cgt->token);
-
     }
 
-    protected function generate_parameter_string( $api_data, $sort_data_before_merge = true, $skip_empty_values = true ) {
+    protected function generate_parameter_string($api_data, $sort_data_before_merge = true, $skip_empty_values = true)
+    {
 
         // if sorting is required the passphrase should be added in before sort.
-        if ( ! empty( $this->payfast->company_gateway->getConfigField('passphrase') ) && $sort_data_before_merge ) 
+        if (! empty($this->payfast->company_gateway->getConfigField('passphrase')) && $sort_data_before_merge) {
             $api_data['passphrase'] = $this->payfast->company_gateway->getConfigField('passphrase');
+        }
 
-        if ( $sort_data_before_merge ) {
-            ksort( $api_data );
+        if ($sort_data_before_merge) {
+            ksort($api_data);
         }
 
         // concatenate the array key value pairs.
         $parameter_string = '';
-        foreach ( $api_data as $key => $val ) {
-
-            if ( $skip_empty_values && empty( $val ) ) {
+        foreach ($api_data as $key => $val) {
+            if ($skip_empty_values && empty($val)) {
                 continue;
             }
 
-            if ( 'signature' !== $key ) {
-                $val = urlencode( $val );
+            if ('signature' !== $key) {
+                $val = urlencode($val);
                 $parameter_string .= "$key=$val&";
             }
         }
         // when not sorting passphrase should be added to the end before md5
-        if ( $sort_data_before_merge ) {
-            $parameter_string = rtrim( $parameter_string, '&' );
-        } elseif ( ! empty( $this->pass_phrase ) ) {
-            $parameter_string .= 'passphrase=' . urlencode( $this->payfast->company_gateway->getConfigField('passphrase') );
+        if ($sort_data_before_merge) {
+            $parameter_string = rtrim($parameter_string, '&');
+        } elseif (! empty($this->pass_phrase)) {
+            $parameter_string .= 'passphrase='.urlencode($this->payfast->company_gateway->getConfigField('passphrase'));
         } else {
-            $parameter_string = rtrim( $parameter_string, '&' );
+            $parameter_string = rtrim($parameter_string, '&');
         }
 
         // nlog($parameter_string);
 
         return $parameter_string;
-
     }
 
     private function genSig($data)
     {
-    	$fields = [];
+        $fields = [];
 
-    	ksort($data);
+        ksort($data);
 
-        foreach($data as $key => $value)
-        {
-        	if (!empty($data[$key])) {
+        foreach ($data as $key => $value) {
+            if (! empty($data[$key])) {
                 $fields[$key] = $data[$key];
             }
         }
@@ -121,24 +117,19 @@ class Token
 
     private function send($headers, $body, $token)
     {
-    	$client =  new \GuzzleHttp\Client(
+        $client = new \GuzzleHttp\Client(
         [
             'headers' => $headers,
         ]);
 
         try {
-            $response = $client->post("https://api.payfast.co.za/subscriptions/{$token}/adhoc?testing=true",[
-                RequestOptions::JSON => ['body' => $body], RequestOptions::ALLOW_REDIRECTS => false
+            $response = $client->post("https://api.payfast.co.za/subscriptions/{$token}/adhoc?testing=true", [
+                RequestOptions::JSON => ['body' => $body], RequestOptions::ALLOW_REDIRECTS => false,
             ]);
 
-            return json_decode($response->getBody(),true);
-        }
-        catch(\Exception $e)
-        {
-
-        	nlog($e->getMessage());
-
+            return json_decode($response->getBody(), true);
+        } catch (\Exception $e) {
+            nlog($e->getMessage());
         }
     }
 }
-
diff --git a/app/PaymentDrivers/PayFastPaymentDriver.php b/app/PaymentDrivers/PayFastPaymentDriver.php
index d66945a12ecf..9472246d2bb4 100644
--- a/app/PaymentDrivers/PayFastPaymentDriver.php
+++ b/app/PaymentDrivers/PayFastPaymentDriver.php
@@ -50,38 +50,35 @@ class PayFastPaymentDriver extends BaseDriver
         $types = [];
 
         // if($this->client->currency()->code == 'ZAR' || $this->client->currency()->code == 'USD')
-        if($this->client->currency()->code == 'ZAR')
+        if ($this->client->currency()->code == 'ZAR') {
             $types[] = GatewayType::CREDIT_CARD;
+        }
 
         return $types;
     }
 
     public function endpointUrl()
     {
-        if($this->company_gateway->getConfigField('testMode'))
+        if ($this->company_gateway->getConfigField('testMode')) {
             return 'https://sandbox.payfast.co.za/eng/process';
+        }
 
         return 'https://www.payfast.co.za/eng/process';
     }
 
     public function init()
     {
-
-        try{
-
+        try {
             $this->payfast = new \PayFast\PayFastPayment(
                 [
                     'merchantId' => $this->company_gateway->getConfigField('merchantId'),
                     'merchantKey' => $this->company_gateway->getConfigField('merchantKey'),
                     'passPhrase' => $this->company_gateway->getConfigField('passphrase'),
-                    'testMode' => $this->company_gateway->getConfigField('testMode')
+                    'testMode' => $this->company_gateway->getConfigField('testMode'),
                 ]
             );
-
-        } catch(\Exception $e) {
-
+        } catch (\Exception $e) {
             nlog('##PAYFAST## There was an exception: '.$e->getMessage());
-
         }
 
         return $this;
@@ -91,6 +88,7 @@ class PayFastPaymentDriver extends BaseDriver
     {
         $class = self::$methods[$payment_method_id];
         $this->payment_method = new $class($this);
+
         return $this;
     }
 
@@ -138,56 +136,56 @@ class PayFastPaymentDriver extends BaseDriver
             'itn',
             'm_payment_id',
             'cc_css',
-            'split_payment'
+            'split_payment',
         ];
 
-        foreach($keys as $key)
-        {
-            if (!empty($data[$key])) {
+        foreach ($keys as $key) {
+            if (! empty($data[$key])) {
                 $fields[$key] = $data[$key];
             }
         }
 
-        if($this->company_gateway->getConfigField('passphrase'))
+        if ($this->company_gateway->getConfigField('passphrase')) {
             $fields['passphrase'] = $this->company_gateway->getConfigField('passphrase');
+        }
 
         return md5(http_build_query($fields));
     }
 
     public function generateSignature($data)
     {
-        $fields = array();
+        $fields = [];
 
         // specific order required by PayFast
         // @see https://developers.payfast.co.za/documentation/#checkout-page
-        foreach (array('merchant_id', 'merchant_key', 'return_url', 'cancel_url', 'notify_url', 'name_first',
-                     'name_last', 'email_address', 'cell_number',
-                    /**
-                     * Transaction Details
-                     */
-                    'm_payment_id', 'amount', 'item_name', 'item_description',
-                    /**
-                     * Custom return data
-                     */
-                    'custom_int1', 'custom_int2', 'custom_int3', 'custom_int4', 'custom_int5',
-                    'custom_str1', 'custom_str2', 'custom_str3', 'custom_str4', 'custom_str5',
-                    /**
-                     * Email confirmation
-                     */
-                    'email_confirmation', 'confirmation_address',
-                    /**
-                     * Payment Method
-                     */
-                    'payment_method',
-                    /**
-                     * Subscriptions
-                     */
-                    'subscription_type', 'billing_date', 'recurring_amount', 'frequency', 'cycles',
-                    /**
-                     * Passphrase for md5 signature generation
-                     */
-                    'passphrase') as $key) {
-            if (!empty($data[$key])) {
+        foreach (['merchant_id', 'merchant_key', 'return_url', 'cancel_url', 'notify_url', 'name_first',
+            'name_last', 'email_address', 'cell_number',
+            /**
+             * Transaction Details
+             */
+            'm_payment_id', 'amount', 'item_name', 'item_description',
+            /**
+             * Custom return data
+             */
+            'custom_int1', 'custom_int2', 'custom_int3', 'custom_int4', 'custom_int5',
+            'custom_str1', 'custom_str2', 'custom_str3', 'custom_str4', 'custom_str5',
+            /**
+             * Email confirmation
+             */
+            'email_confirmation', 'confirmation_address',
+            /**
+             * Payment Method
+             */
+            'payment_method',
+            /**
+             * Subscriptions
+             */
+            'subscription_type', 'billing_date', 'recurring_amount', 'frequency', 'cycles',
+            /**
+             * Passphrase for md5 signature generation
+             */
+            'passphrase', ] as $key) {
+            if (! empty($data[$key])) {
                 $fields[$key] = $data[$key];
             }
         }
@@ -197,25 +195,20 @@ class PayFastPaymentDriver extends BaseDriver
         return md5(http_build_query($fields));
     }
 
-
     public function processWebhookRequest(Request $request, Payment $payment = null)
     {
-
         $data = $request->all();
         // nlog("payfast");
         // nlog($data);
 
-        if(array_key_exists('m_payment_id', $data))
-        {
-
+        if (array_key_exists('m_payment_id', $data)) {
             $hash = Cache::get($data['m_payment_id']);
 
-            switch ($hash)
-            {
+            switch ($hash) {
                 case 'cc_auth':
                     $this->setPaymentMethod(GatewayType::CREDIT_CARD)
                          ->authorizeResponse($request);
-                    
+
                     return response()->json([], 200);
 
                     break;
@@ -227,16 +220,13 @@ class PayFastPaymentDriver extends BaseDriver
                     $this->setPaymentMethod(GatewayType::CREDIT_CARD)
                          ->setPaymentHash($payment_hash)
                          ->processPaymentResponse($request);
-            
+
                     return response()->json([], 200);
 
                     break;
             }
-
-
         }
 
         return response()->json([], 200);
-
     }
 }
diff --git a/app/PaymentDrivers/PayPalExpressPaymentDriver.php b/app/PaymentDrivers/PayPalExpressPaymentDriver.php
index d4904e7b71dd..86cad72f4aca 100644
--- a/app/PaymentDrivers/PayPalExpressPaymentDriver.php
+++ b/app/PaymentDrivers/PayPalExpressPaymentDriver.php
@@ -138,7 +138,7 @@ class PayPalExpressPaymentDriver extends BaseDriver
             $payment = $this->createPayment($data, \App\Models\Payment::STATUS_COMPLETED);
 
             SystemLogger::dispatch(
-                ['response' => (array)$response->getData(), 'data' => $data],
+                ['response' => (array) $response->getData(), 'data' => $data],
                 SystemLog::CATEGORY_GATEWAY_RESPONSE,
                 SystemLog::EVENT_GATEWAY_SUCCESS,
                 SystemLog::TYPE_PAYPAL,
@@ -149,10 +149,9 @@ class PayPalExpressPaymentDriver extends BaseDriver
             return redirect()->route('client.payments.show', ['payment' => $this->encodePrimaryKey($payment->id)]);
         }
 
-        if (!$response->isSuccessful()) {
-
+        if (! $response->isSuccessful()) {
             $data = $response->getData();
-            
+
             $this->sendFailureMail($response->getMessage() ?: '');
 
             $message = [
@@ -175,7 +174,6 @@ class PayPalExpressPaymentDriver extends BaseDriver
 
     public function generatePaymentDetails(array $data)
     {
-
         $_invoice = collect($this->payment_hash->data->invoices)->first();
         $invoice = Invoice::withTrashed()->find($this->decodePrimaryKey($_invoice->invoice_id));
 
@@ -186,18 +184,18 @@ class PayPalExpressPaymentDriver extends BaseDriver
             'transactionType' => 'Purchase',
             'clientIp' => request()->getClientIp(),
             // 'amount' => round(($data['total']['amount_with_fee'] + $this->fee),2),
-            'amount' => round($data['total']['amount_with_fee'],2),
+            'amount' => round($data['total']['amount_with_fee'], 2),
             'returnUrl' => route('client.payments.response', [
                 'company_gateway_id' => $this->company_gateway->id,
                 'payment_hash' => $this->payment_hash->hash,
                 'payment_method_id' => GatewayType::PAYPAL,
             ]),
-            'cancelUrl' => $this->client->company->domain() . '/client/invoices',
+            'cancelUrl' => $this->client->company->domain().'/client/invoices',
             'description' => implode(',', collect($this->payment_hash->data->invoices)
                 ->map(function ($invoice) {
                     return sprintf('%s: %s', ctrans('texts.invoice_number'), $invoice->invoice_number);
                 })->toArray()),
-            'transactionId' => $this->payment_hash->hash . '-' . time(),
+            'transactionId' => $this->payment_hash->hash.'-'.time(),
             'ButtonSource' => 'InvoiceNinja_SP',
             'solutionType' => 'Sole',
         ];
@@ -205,35 +203,31 @@ class PayPalExpressPaymentDriver extends BaseDriver
 
     public function generatePaymentItems(array $data)
     {
-
         $_invoice = collect($this->payment_hash->data->invoices)->first();
         $invoice = Invoice::withTrashed()->find($this->decodePrimaryKey($_invoice->invoice_id));
 
         $items = [];
 
         $items[] = new Item([
-                'name' => " ",
-                'description' => ctrans('texts.invoice_number') . "# " . $invoice->number,
-                'price' => $data['total']['amount_with_fee'],
-                'quantity' => 1,
-            ]);
+            'name' => ' ',
+            'description' => ctrans('texts.invoice_number').'# '.$invoice->number,
+            'price' => $data['total']['amount_with_fee'],
+            'quantity' => 1,
+        ]);
 
         return $items;
-
     }
 
     private function feeCalc($invoice, $invoice_total)
     {
-
         $invoice->service()->removeUnpaidGatewayFees();
         $invoice = $invoice->fresh();
-        
+
         $balance = floatval($invoice->balance);
 
         $_updated_invoice = $invoice->service()->addGatewayFee($this->company_gateway, GatewayType::PAYPAL, $invoice_total)->save();
 
-        if(floatval($_updated_invoice->balance) > $balance){
-
+        if (floatval($_updated_invoice->balance) > $balance) {
             $fee = floatval($_updated_invoice->balance) - $balance;
 
             $this->payment_hash->fee_total = $fee;
@@ -244,5 +238,4 @@ class PayPalExpressPaymentDriver extends BaseDriver
 
         return 0;
     }
-
 }
diff --git a/app/PaymentDrivers/PayTrace/CreditCard.php b/app/PaymentDrivers/PayTrace/CreditCard.php
index 0f60514ed914..403ca22ed6fe 100644
--- a/app/PaymentDrivers/PayTrace/CreditCard.php
+++ b/app/PaymentDrivers/PayTrace/CreditCard.php
@@ -41,7 +41,6 @@ class CreditCard
 
     public function authorizeView($data)
     {
-        
         $data['client_key'] = $this->paytrace->getAuthToken();
         $data['gateway'] = $this->paytrace;
 
@@ -55,17 +54,16 @@ class CreditCard
 
     //if(!$response->success)
     //handle failure
-        
- 	public function authorizeResponse($request)
- 	{
+
+    public function authorizeResponse($request)
+    {
         $data = $request->all();
-        
-        $response = $this->createCustomer($data);   
+
+        $response = $this->createCustomer($data);
 
         return redirect()->route('client.payment_methods.index');
+    }
 
- 	}  
-    
     //  "_token" => "Vl1xHflBYQt9YFSaNCPTJKlY5x3rwcFE9kvkw71I"
     //   "company_gateway_id" => "1"
     //   "HPF_Token" => "e484a92c-90ed-4468-ac4d-da66824c75de"
@@ -86,7 +84,7 @@ class CreditCard
     //     "state":"WA",
     //     "zip":"85284"
     // }
-    
+
     private function createCustomer($data)
     {
         $post_data = [
@@ -99,16 +97,12 @@ class CreditCard
 
         $response = $this->paytrace->gatewayRequest('/v1/customer/pt_protect_create', $post_data);
 
-        if(!$response->success)
-        {
-
+        if (! $response->success) {
             $error = 'Error creating customer in gateway';
             $error_code = isset($response->response_code) ? $response->response_code : 'PT_ERR';
 
-            if(isset($response->errors))
-            {
-                foreach($response->errors as $err)
-                {
+            if (isset($response->errors)) {
+                foreach ($response->errors as $err) {
                     $error = end($err);
                 }
             }
@@ -150,43 +144,42 @@ class CreditCard
         ]);
 
         return $profile->customers[0];
-        
     }
 
     private function buildBillingAddress()
     {
-        return [
-                'name' => $this->paytrace->client->present()->name(),
-                'street_address' => $this->paytrace->client->address1,
-                'city' => $this->paytrace->client->city,
-                'state' => $this->paytrace->client->state,
-                'zip' => $this->paytrace->client->postal_code
-            ];
+        $data = [
+            'name' => $this->paytrace->client->present()->name(),
+            'street_address' => $this->paytrace->client->address1,
+            'city' => $this->paytrace->client->city,
+            'state' => $this->paytrace->client->state,
+            'zip' => $this->paytrace->client->postal_code,
+        ];
+
+        nlog($data);
     }
 
     public function paymentView($data)
     {
-
         $data['client_key'] = $this->paytrace->getAuthToken();
         $data['gateway'] = $this->paytrace;
 
         return render('gateways.paytrace.pay', $data);
-
     }
 
     public function paymentResponse(Request $request)
     {
         $response_array = $request->all();
 
-        if($request->token){
+        if ($request->token) {
             $token = ClientGatewayToken::find($this->decodePrimaryKey($request->token));
+
             return $this->processTokenPayment($token->token, $request);
         }
 
         if ($request->has('store_card') && $request->input('store_card') === true) {
-
             $response = $this->createCustomer($request->all());
-            
+
             return $this->processTokenPayment($response->customer_id, $request);
         }
 
@@ -198,20 +191,19 @@ class CreditCard
             'billing_address' => $this->buildBillingAddress(),
             'amount' => $request->input('amount_with_fee'),
             'invoice_id' => $this->harvestInvoiceId(),
-        ];        
+        ];
 
         $response = $this->paytrace->gatewayRequest('/v1/transactions/sale/pt_protect', $data);
 
-        if($response->success)
+        if ($response->success) {
             return $this->processSuccessfulPayment($response);
+        }
 
         return $this->processUnsuccessfulPayment($response);
-
     }
 
     public function processTokenPayment($token, $request)
     {
-
         $data = [
             'customer_id' => $token,
             'integrator_id' =>  $this->paytrace->company_gateway->getConfigField('integratorId'),
@@ -220,7 +212,7 @@ class CreditCard
 
         $response = $this->paytrace->gatewayRequest('/v1/transactions/sale/by_customer', $data);
 
-        if($response->success){
+        if ($response->success) {
             $this->paytrace->logSuccessfulGatewayResponse(['response' => $response, 'data' => $this->paytrace->payment_hash], SystemLog::TYPE_PAYTRACE);
 
             return $this->processSuccessfulPayment($response);
@@ -228,16 +220,17 @@ class CreditCard
 
         return $this->processUnsuccessfulPayment($response);
     }
-    
+
     private function harvestInvoiceId()
     {
         $_invoice = collect($this->paytrace->payment_hash->data->invoices)->first();
         $invoice = Invoice::withTrashed()->find($this->decodePrimaryKey($_invoice->invoice_id));
 
-        if($invoice)
-            return ctrans('texts.invoice_number') . "# " . $invoice->number;
+        if ($invoice) {
+            return ctrans('texts.invoice_number').'# '.$invoice->number;
+        }
 
-        return ctrans('texts.invoice_number') . "####";
+        return ctrans('texts.invoice_number').'####';
     }
 
     private function processSuccessfulPayment($response)
@@ -253,16 +246,15 @@ class CreditCard
         $payment = $this->paytrace->createPayment($payment_record, Payment::STATUS_COMPLETED);
 
         return redirect()->route('client.payments.show', ['payment' => $this->encodePrimaryKey($payment->id)]);
-
     }
 
     private function processUnsuccessfulPayment($response)
     {
-        
         $error = $response->status_message;
 
-        if(property_exists($response, 'approval_message') && $response->approval_message)
+        if (property_exists($response, 'approval_message') && $response->approval_message) {
             $error .= " - {$response->approval_message}";
+        }
 
         $error_code = property_exists($response, 'approval_message') ? $response->approval_message : 'Undefined code';
 
@@ -273,7 +265,5 @@ class CreditCard
         ];
 
         return $this->paytrace->processUnsuccessfulTransaction($data);
-
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/PaymentDrivers/PaytracePaymentDriver.php b/app/PaymentDrivers/PaytracePaymentDriver.php
index 73463b458b95..f3b3a325d75f 100644
--- a/app/PaymentDrivers/PaytracePaymentDriver.php
+++ b/app/PaymentDrivers/PaytracePaymentDriver.php
@@ -26,16 +26,16 @@ use App\Utils\Traits\MakesHash;
 class PaytracePaymentDriver extends BaseDriver
 {
     use MakesHash;
-    
-    public $refundable = true; 
 
-    public $token_billing = true; 
+    public $refundable = true;
 
-    public $can_authorise_credit_card = true; 
+    public $token_billing = true;
 
-    public $gateway; 
+    public $can_authorise_credit_card = true;
 
-    public $payment_method; 
+    public $gateway;
+
+    public $payment_method;
 
     public static $methods = [
         GatewayType::CREDIT_CARD => CreditCard::class, //maps GatewayType => Implementation class
@@ -53,7 +53,7 @@ class PaytracePaymentDriver extends BaseDriver
     {
         $types = [];
 
-            $types[] = GatewayType::CREDIT_CARD;
+        $types[] = GatewayType::CREDIT_CARD;
 
         return $types;
     }
@@ -63,6 +63,7 @@ class PaytracePaymentDriver extends BaseDriver
     {
         $class = self::$methods[$payment_method_id];
         $this->payment_method = new $class($this);
+
         return $this;
     }
 
@@ -96,24 +97,21 @@ class PaytracePaymentDriver extends BaseDriver
             'amount' => $amount,
             //'customer_id' => $cgt->token,
             'transaction_id' => $payment->transaction_reference,
-            'integrator_id' => '959195xd1CuC'
+            'integrator_id' => '959195xd1CuC',
         ];
 
         $response = $this->gatewayRequest('/v1/transactions/refund/for_transaction', $data);
 
-        if($response && $response->success)
-        {
-
+        if ($response && $response->success) {
             SystemLogger::dispatch(['server_response' => $response, 'data' => $data], SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_SUCCESS, SystemLog::TYPE_PAYTRACE, $this->client, $this->client->company);
 
-                return [
-                    'transaction_reference' => $response->transaction_id,
-                    'transaction_response' => json_encode($response),
-                    'success' => true,
-                    'description' => $response->status_message,
-                    'code' => $response->response_code,
-                ];
-
+            return [
+                'transaction_reference' => $response->transaction_id,
+                'transaction_response' => json_encode($response),
+                'success' => true,
+                'description' => $response->status_message,
+                'code' => $response->response_code,
+            ];
         }
 
         SystemLogger::dispatch(['server_response' => $response, 'data' => $data], SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_PAYTRACE, $this->client, $this->client->company);
@@ -125,7 +123,6 @@ class PaytracePaymentDriver extends BaseDriver
             'description' => $response->status_message,
             'code' => 422,
         ];
-
     }
 
     public function tokenBilling(ClientGatewayToken $cgt, PaymentHash $payment_hash)
@@ -140,8 +137,7 @@ class PaytracePaymentDriver extends BaseDriver
 
         $response = $this->gatewayRequest('/v1/transactions/sale/by_customer', $data);
 
-        if($response && $response->success)
-        {
+        if ($response && $response->success) {
             $data = [
                 'gateway_type_id' => $cgt->gateway_type_id,
                 'payment_type' => PaymentType::CREDIT_CARD_OTHER,
@@ -161,8 +157,9 @@ class PaytracePaymentDriver extends BaseDriver
 
         $error = $response->status_message;
 
-        if(property_exists($response, 'approval_message') && $response->approval_message)
+        if (property_exists($response, 'approval_message') && $response->approval_message) {
             $error .= " - {$response->approval_message}";
+        }
 
         $data = [
             'response' => $response,
@@ -194,31 +191,30 @@ class PaytracePaymentDriver extends BaseDriver
             $fields[] = ['name' => 'client_phone', 'label' => ctrans('texts.client_phone'), 'type' => 'tel', 'validation' => 'required'];
         }
 
-        if ($this->company_gateway->require_billing_address) {
             $fields[] = ['name' => 'client_address_line_1', 'label' => ctrans('texts.address1'), 'type' => 'text', 'validation' => 'required'];
+
+        if ($this->company_gateway->require_billing_address) {
             $fields[] = ['name' => 'client_city', 'label' => ctrans('texts.city'), 'type' => 'text', 'validation' => 'required'];
             $fields[] = ['name' => 'client_state', 'label' => ctrans('texts.state'), 'type' => 'text', 'validation' => 'required'];
             $fields[] = ['name' => 'client_country_id', 'label' => ctrans('texts.country'), 'type' => 'text', 'validation' => 'required'];
         }
 
-        if($this->company_gateway->require_postal_code) {
+        // if ($this->company_gateway->require_postal_code) {
             $fields[] = ['name' => 'client_postal_code', 'label' => ctrans('texts.postal_code'), 'type' => 'text', 'validation' => 'required'];
-        }
+            $fields[] = ['name' => 'client_shipping_city', 'label' => ctrans('texts.shipping_city'), 'type' => 'text', 'validation' => 'required'];
+            $fields[] = ['name' => 'client_shipping_state', 'label' => ctrans('texts.shipping_state'), 'type' => 'text', 'validation' => 'required'];
+
+        // }
 
         if ($this->company_gateway->require_shipping_address) {
             $fields[] = ['name' => 'client_shipping_address_line_1', 'label' => ctrans('texts.shipping_address1'), 'type' => 'text', 'validation' => 'required'];
-            $fields[] = ['name' => 'client_shipping_city', 'label' => ctrans('texts.shipping_city'), 'type' => 'text', 'validation' => 'required'];
-            $fields[] = ['name' => 'client_shipping_state', 'label' => ctrans('texts.shipping_state'), 'type' => 'text', 'validation' => 'required'];
             $fields[] = ['name' => 'client_shipping_postal_code', 'label' => ctrans('texts.shipping_postal_code'), 'type' => 'text', 'validation' => 'required'];
             $fields[] = ['name' => 'client_shipping_country_id', 'label' => ctrans('texts.shipping_country'), 'type' => 'text', 'validation' => 'required'];
         }
 
-
         return $fields;
     }
 
-
-
     public function processWebhookRequest(PaymentWebhookRequest $request, Payment $payment = null)
     {
     }
@@ -226,47 +222,45 @@ class PaytracePaymentDriver extends BaseDriver
     /*Helpers*/
     private function generateAuthHeaders()
     {
-
         $url = 'https://api.paytrace.com/oauth/token';
         $data = [
             'grant_type' => 'password',
             'username' => $this->company_gateway->getConfigField('username'),
-            'password' => $this->company_gateway->getConfigField('password')
+            'password' => $this->company_gateway->getConfigField('password'),
         ];
 
         $response = CurlUtils::post($url, $data, $headers = false);
 
         $auth_data = json_decode($response);
 
-        if(!property_exists($auth_data, 'access_token'))
+        if (! property_exists($auth_data, 'access_token')) {
             throw new SystemError('Error authenticating with PayTrace');
+        }
 
-            $headers = [];
-            $headers[] = 'Content-type: application/json';
-            $headers[] = 'Authorization: Bearer '.$auth_data->access_token;
+        $headers = [];
+        $headers[] = 'Content-type: application/json';
+        $headers[] = 'Authorization: Bearer '.$auth_data->access_token;
 
         return $headers;
-
     }
 
     public function getAuthToken()
     {
-
         $headers = $this->generateAuthHeaders();
 
         $response = CurlUtils::post('https://api.paytrace.com/v1/payment_fields/token/create', [], $headers);
 
         $response = json_decode($response);
 
-        if($response)
+        if ($response) {
             return $response->clientKey;
+        }
 
         return false;
     }
 
     public function gatewayRequest($uri, $data, $headers = false)
     {
-        
         $base_url = "https://api.paytrace.com{$uri}";
 
         $headers = $this->generateAuthHeaders();
@@ -275,10 +269,10 @@ class PaytracePaymentDriver extends BaseDriver
 
         $response = json_decode($response);
 
-        if($response)
+        if ($response) {
             return $response;
+        }
 
         return false;
-
     }
 }
diff --git a/app/PaymentDrivers/Razorpay/Hosted.php b/app/PaymentDrivers/Razorpay/Hosted.php
index ac4a01217885..181991b989cf 100644
--- a/app/PaymentDrivers/Razorpay/Hosted.php
+++ b/app/PaymentDrivers/Razorpay/Hosted.php
@@ -1,6 +1,5 @@
 <?php
 
-
 /**
  * Invoice Ninja (https://invoiceninja.com).
  *
@@ -8,14 +7,13 @@
  *
  * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace App\PaymentDrivers\Razorpay;
 
 use App\Exceptions\PaymentFailed;
 use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
-use Illuminate\Http\Request;
 use App\Jobs\Util\SystemLogger;
 use App\Models\GatewayType;
 use App\Models\Payment;
@@ -25,6 +23,7 @@ use App\PaymentDrivers\Common\MethodInterface;
 use App\PaymentDrivers\RazorpayPaymentDriver;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
 use Illuminate\View\View;
 use Razorpay\Api\Errors\SignatureVerificationError;
 
@@ -63,9 +62,9 @@ class Hosted implements MethodInterface
 
     /**
      * Payment view for the Razorpay.
-     * 
-     * @param array $data 
-     * @return View 
+     *
+     * @param array $data
+     * @return View
      */
     public function paymentView(array $data): View
     {
@@ -92,9 +91,9 @@ class Hosted implements MethodInterface
 
     /**
      * Handle payments page for Razorpay.
-     * 
-     * @param PaymentResponseRequest $request 
-     * @return void 
+     *
+     * @param PaymentResponseRequest $request
+     * @return void
      */
     public function paymentResponse(PaymentResponseRequest $request)
     {
@@ -105,27 +104,25 @@ class Hosted implements MethodInterface
         ]);
 
         if (! property_exists($this->razorpay->payment_hash->data, 'order_id')) {
+            $this->razorpay->sendFailureMail('Missing [order_id] property. ');
 
-            $this->razorpay->sendFailureMail("Missing [order_id] property. ");
-            
-            throw new PaymentFailed('Missing [order_id] property. Please contact the administrator. Reference: ' . $this->razorpay->payment_hash->hash);
+            throw new PaymentFailed('Missing [order_id] property. Please contact the administrator. Reference: '.$this->razorpay->payment_hash->hash);
         }
-        
+
         try {
             $attributes = [
                 'razorpay_order_id' => $this->razorpay->payment_hash->data->order_id,
                 'razorpay_payment_id' => $request->razorpay_payment_id,
                 'razorpay_signature' => $request->razorpay_signature,
             ];
-    
+
             $this->razorpay->gateway->utility->verifyPaymentSignature($attributes);
 
             return $this->processSuccessfulPayment($request->razorpay_payment_id);
-        }
-        catch (SignatureVerificationError $exception) {
+        } catch (SignatureVerificationError $exception) {
             return $this->processUnsuccessfulPayment($exception);
         }
-    } 
+    }
 
     /**
      * Handle the successful payment for Razorpay.
@@ -165,7 +162,6 @@ class Hosted implements MethodInterface
      */
     public function processUnsuccessfulPayment(\Exception $exception): void
     {
-
         $this->razorpay->sendFailureMail($exception->getMessage());
 
         SystemLogger::dispatch(
@@ -178,6 +174,5 @@ class Hosted implements MethodInterface
         );
 
         throw new PaymentFailed($exception->getMessage(), $exception->getCode());
-    
     }
 }
diff --git a/app/PaymentDrivers/RazorpayPaymentDriver.php b/app/PaymentDrivers/RazorpayPaymentDriver.php
index f835512a85dd..cfa671f5bd1c 100644
--- a/app/PaymentDrivers/RazorpayPaymentDriver.php
+++ b/app/PaymentDrivers/RazorpayPaymentDriver.php
@@ -6,7 +6,7 @@
  *
  * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace App\PaymentDrivers;
@@ -42,7 +42,7 @@ class RazorpayPaymentDriver extends BaseDriver
     public function init(): self
     {
         $this->gateway = new \Razorpay\Api\Api(
-            $this->company_gateway->getConfigField('apiKey'), 
+            $this->company_gateway->getConfigField('apiKey'),
             $this->company_gateway->getConfigField('apiSecret'),
         );
 
@@ -85,15 +85,19 @@ class RazorpayPaymentDriver extends BaseDriver
         return $this->payment_method->paymentResponse($request);
     }
 
-    public function refund(Payment $payment, $amount, $return_client_response = false) {}
+    public function refund(Payment $payment, $amount, $return_client_response = false)
+    {
+    }
 
-    public function tokenBilling(ClientGatewayToken $cgt, PaymentHash $payment_hash) {}
+    public function tokenBilling(ClientGatewayToken $cgt, PaymentHash $payment_hash)
+    {
+    }
 
     /**
      * Convert the amount to the format that Razorpay supports.
-     * 
-     * @param mixed|float $amount 
-     * @return int 
+     *
+     * @param mixed|float $amount
+     * @return int
      */
     public function convertToRazorpayAmount($amount): int
     {
diff --git a/app/PaymentDrivers/Sample/CreditCard.php b/app/PaymentDrivers/Sample/CreditCard.php
index fbe7e3888aa1..fb262eebd399 100644
--- a/app/PaymentDrivers/Sample/CreditCard.php
+++ b/app/PaymentDrivers/Sample/CreditCard.php
@@ -38,22 +38,18 @@ class CreditCard
 
     public function authorizeView($data)
     {
-
     }
 
     public function authorizeRequest($request)
     {
-
     }
 
     public function paymentView($data)
     {
-    
     }
 
     public function processPaymentResponse($request)
     {
-        
     }
 
     /* This method is stubbed ready to go - you just need to harvest the equivalent 'transaction_reference' */
@@ -70,7 +66,6 @@ class CreditCard
         $payment = $this->driver_class->createPayment($payment_record, Payment::STATUS_COMPLETED);
 
         return redirect()->route('client.payments.show', ['payment' => $this->encodePrimaryKey($payment->id)]);
-
     }
 
     private function processUnsuccessfulPayment($response)
@@ -90,10 +85,8 @@ class CreditCard
         ];
 
         return $this->driver_class->processUnsuccessfulTransaction($data);
-
     }
 
-
     /* Helpers */
 
     /*
@@ -102,11 +95,7 @@ class CreditCard
       Some considerations after a succesful transaction include:
 
       Logging of events: success +/- failure
-      Recording a payment 
+      Recording a payment
       Notifications
      */
-
-
-
-
-}
\ No newline at end of file
+}
diff --git a/app/PaymentDrivers/Sample/PaymentDriver.php b/app/PaymentDrivers/Sample/PaymentDriver.php
index 631208df25bb..c8d4b78a8089 100644
--- a/app/PaymentDrivers/Sample/PaymentDriver.php
+++ b/app/PaymentDrivers/Sample/PaymentDriver.php
@@ -50,7 +50,7 @@ class PaymentDriver extends BaseDriver
     {
         $types = [];
 
-            $types[] = GatewayType::CREDIT_CARD;
+        $types[] = GatewayType::CREDIT_CARD;
 
         return $types;
     }
@@ -60,6 +60,7 @@ class PaymentDriver extends BaseDriver
     {
         $class = self::$methods[$payment_method_id];
         $this->payment_method = new $class($this);
+
         return $this;
     }
 
diff --git a/app/PaymentDrivers/Sample/resources/pay.blade.php b/app/PaymentDrivers/Sample/resources/pay.blade.php
index 4f8841bca6bb..ea05015e1c90 100644
--- a/app/PaymentDrivers/Sample/resources/pay.blade.php
+++ b/app/PaymentDrivers/Sample/resources/pay.blade.php
@@ -25,7 +25,7 @@
                         data-token="{{ $token->token }}"
                         name="payment-type"
                         class="form-radio cursor-pointer toggle-payment-with-token"/>
-                    <span class="ml-1 cursor-pointer">**** {{ optional($token->meta)->last4 }}</span>
+                    <span class="ml-1 cursor-pointer">**** {{ $token->meta?->last4 }}</span>
                 </label>
             @endforeach
         @endisset
diff --git a/app/PaymentDrivers/Square/CreditCard.php b/app/PaymentDrivers/Square/CreditCard.php
index d89a4f1a367e..84fd4bea0082 100644
--- a/app/PaymentDrivers/Square/CreditCard.php
+++ b/app/PaymentDrivers/Square/CreditCard.php
@@ -13,7 +13,6 @@
 namespace App\PaymentDrivers\Square;
 
 use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
-use Illuminate\Http\Request;
 use App\Models\ClientGatewayToken;
 use App\Models\GatewayType;
 use App\Models\Payment;
@@ -22,6 +21,7 @@ use App\PaymentDrivers\Common\MethodInterface;
 use App\PaymentDrivers\SquarePaymentDriver;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Illuminate\View\View;
 use Square\Http\ApiResponse;
@@ -76,22 +76,24 @@ class CreditCard implements MethodInterface
     {
         $client = new \stdClass;
 
-        $client->addressLines = [ $this->square_driver->client->address1 ?: '', $this->square_driver->client->address2 ?: ''];
+        $country = $this->square_driver->client->country ? $this->square_driver->client->country->iso_3166_2 : $this->square_driver->client->company->country()->iso_3166_2;
+
+        $client->addressLines = [$this->square_driver->client->address1 ?: '', $this->square_driver->client->address2 ?: ''];
         $client->givenName = $this->square_driver->client->present()->first_name();
         $client->familyName = $this->square_driver->client->present()->last_name();
         $client->email = $this->square_driver->client->present()->email;
         $client->phone = $this->square_driver->client->phone;
         $client->city = $this->square_driver->client->city;
         $client->region = $this->square_driver->client->state;
-        $client->country = $this->square_driver->client->country->iso_3166_2;
+        $client->country = $country;
 
-        return (array)$client;
+        return (array) $client;
     }
 
     public function paymentResponse(PaymentResponseRequest $request)
     {
         $token = $request->sourceId;
-        
+
         $amount = $this->square_driver->convertAmount(
             $this->square_driver->payment_hash->data->amount_with_fee
         );
@@ -159,10 +161,6 @@ class CreditCard implements MethodInterface
         return $this->square_driver->processUnsuccessfulTransaction($data);
     }
 
-
-
-
-
     private function findOrCreateClient()
     {
         $email_address = new \Square\Models\CustomerTextFilter();
@@ -189,14 +187,13 @@ class CreditCard implements MethodInterface
             $customers = $api_response->getBody();
             $customers = json_decode($customers);
 
-            if (count([$api_response->getBody(),1]) == 0) {
+            if (count([$api_response->getBody(), 1]) == 0) {
                 $customers = false;
             }
         } else {
             $errors = $api_response->getErrors();
         }
 
-
         if (property_exists($customers, 'customers')) {
             return $customers->customers[0]->id;
         }
@@ -207,6 +204,8 @@ class CreditCard implements MethodInterface
     private function createClient()
     {
 
+        $country = $this->square_driver->client->country ? $this->square_driver->client->country->iso_3166_2 : $this->square_driver->client->company->country()->iso_3166_2;
+
         /* Step two - create the customer */
         $billing_address = new \Square\Models\Address();
         $billing_address->setAddressLine1($this->square_driver->client->address1);
@@ -214,7 +213,7 @@ class CreditCard implements MethodInterface
         $billing_address->setLocality($this->square_driver->client->city);
         $billing_address->setAdministrativeDistrictLevel1($this->square_driver->client->state);
         $billing_address->setPostalCode($this->square_driver->client->postal_code);
-        $billing_address->setCountry($this->square_driver->client->country->iso_3166_2);
+        $billing_address->setCountry($country);
 
         $body = new \Square\Models\CreateCustomerRequest();
         $body->setGivenName($this->square_driver->client->present()->name());
@@ -233,9 +232,11 @@ class CreditCard implements MethodInterface
 
         if ($api_response->isSuccess()) {
             $result = $api_response->getResult();
+
             return $result->getCustomer()->getId();
         } else {
             $errors = $api_response->getErrors();
+
             return $this->processUnsuccessfulPayment($errors);
         }
     }
diff --git a/app/PaymentDrivers/SquarePaymentDriver.php b/app/PaymentDrivers/SquarePaymentDriver.php
index 4a4233d52d91..7da2c4c74d16 100644
--- a/app/PaymentDrivers/SquarePaymentDriver.php
+++ b/app/PaymentDrivers/SquarePaymentDriver.php
@@ -69,6 +69,7 @@ class SquarePaymentDriver extends BaseDriver
     {
         $class = self::$methods[$payment_method_id];
         $this->payment_method = new $class($this);
+
         return $this;
     }
 
@@ -190,7 +191,6 @@ class SquarePaymentDriver extends BaseDriver
     {
     }
 
-
     public function getClientRequiredFields(): array
     {
         $fields = [];
@@ -231,7 +231,6 @@ class SquarePaymentDriver extends BaseDriver
             $fields[] = ['name' => 'client_shipping_country_id', 'label' => ctrans('texts.shipping_country'), 'type' => 'text', 'validation' => 'required'];
         }
 
-
         return $fields;
     }
 
@@ -244,11 +243,11 @@ class SquarePaymentDriver extends BaseDriver
         }
 
         if ($precision == 1) {
-            return $amount*10;
+            return $amount * 10;
         }
 
         if ($precision == 2) {
-            return $amount*100;
+            return $amount * 100;
         }
 
         return $amount;
diff --git a/app/PaymentDrivers/Stripe/ACH.php b/app/PaymentDrivers/Stripe/ACH.php
index f3b57eb03978..24c1a28190e4 100644
--- a/app/PaymentDrivers/Stripe/ACH.php
+++ b/app/PaymentDrivers/Stripe/ACH.php
@@ -69,7 +69,6 @@ class ACH
 
         try {
             $source = Customer::createSource($customer->id, ['source' => $stripe_response->token->id], $this->stripe->stripe_connect_auth);
-
         } catch (InvalidRequestException $e) {
             throw new PaymentFailed($e->getMessage(), $e->getCode());
         }
@@ -81,7 +80,7 @@ class ACH
         $mailer = new NinjaMailerObject();
 
         $mailer->mailable = new ACHVerificationNotification(
-            auth()->guard('contact')->user()->client->company, 
+            auth()->guard('contact')->user()->client->company,
             route('client.contact_login', ['contact_key' => auth()->guard('contact')->user()->contact_key, 'next' => $verification])
         );
 
@@ -141,11 +140,10 @@ class ACH
             return back()->with('error', $e->getMessage());
         }
     }
-    
+
     /**
      * Make a payment WITH instant verification.
      */
-    
     public function paymentView(array $data)
     {
         $data['gateway'] = $this->stripe;
@@ -156,16 +154,15 @@ class ACH
 
         $intent = false;
 
-        if(count($data['tokens']) == 0)
-        {
-            $intent = 
+        if (count($data['tokens']) == 0) {
+            $intent =
             $this->stripe->createPaymentIntent([
                 'amount' => $data['amount'],
                 'currency' => $data['currency'],
                 'setup_future_usage' => 'off_session',
                 'customer' => $data['customer']->id,
                 'payment_method_types' => ['us_bank_account'],
-              ]
+            ]
             );
         }
 
@@ -176,7 +173,6 @@ class ACH
 
     public function tokenBilling(ClientGatewayToken $cgt, PaymentHash $payment_hash)
     {
-
         $amount = array_sum(array_column($payment_hash->invoices(), 'amount')) + $payment_hash->fee_total;
         $invoice = Invoice::whereIn('id', $this->transformKeys(array_column($payment_hash->invoices(), 'invoice_id')))
                           ->withTrashed()
@@ -188,15 +184,15 @@ class ACH
             $description = "Payment with no invoice for amount {$amount} for client {$this->stripe->client->present()->name()}";
         }
 
-        if(substr($cgt->token, 0, 2) === "pm")
+        if (substr($cgt->token, 0, 2) === 'pm') {
             return $this->paymentIntentTokenBilling($amount, $invoice, $description, $cgt, false);
+        }
 
         $this->stripe->init();
 
         $response = null;
 
         try {
-
             $state = [
                 'gateway_type_id' => GatewayType::BANK_TRANSFER,
                 'amount' => $this->stripe->convertToStripeAmount($amount, $this->stripe->client->currency()->precision, $this->stripe->client->currency()),
@@ -213,8 +209,7 @@ class ACH
                 'description' => $description,
             ], $this->stripe->stripe_connect_auth);
 
-
-            $payment_hash->data = array_merge((array)$payment_hash->data, $state);
+            $payment_hash->data = array_merge((array) $payment_hash->data, $state);
             $payment_hash->save();
 
             if ($state['charge']->status === 'pending' && is_null($state['charge']->failure_message)) {
@@ -229,9 +224,6 @@ class ACH
 
             throw new PaymentFailed($e->getMessage(), $e->getCode());
         }
-        
-
-
     }
 
     public function paymentIntentTokenBilling($amount, $invoice, $description, $cgt, $client_present = true)
@@ -240,28 +232,27 @@ class ACH
 
         try {
             $data = [
-              'amount' => $this->stripe->convertToStripeAmount($amount, $this->stripe->client->currency()->precision, $this->stripe->client->currency()),
-              'currency' => $this->stripe->client->getCurrencyCode(),
-              'payment_method' => $cgt->token,
-              'customer' => $cgt->gateway_customer_reference,
-              'confirm' => true,
-              'description' => $description,
-              'metadata' => [
-                'payment_hash' => $this->stripe->payment_hash->hash,
-                'gateway_type_id' => $cgt->gateway_type_id,
+                'amount' => $this->stripe->convertToStripeAmount($amount, $this->stripe->client->currency()->precision, $this->stripe->client->currency()),
+                'currency' => $this->stripe->client->getCurrencyCode(),
+                'payment_method' => $cgt->token,
+                'customer' => $cgt->gateway_customer_reference,
+                'confirm' => true,
+                'description' => $description,
+                'metadata' => [
+                    'payment_hash' => $this->stripe->payment_hash->hash,
+                    'gateway_type_id' => $cgt->gateway_type_id,
                 ],
             ];
 
-            if($cgt->gateway_type_id == GatewayType::BANK_TRANSFER)
+            if ($cgt->gateway_type_id == GatewayType::BANK_TRANSFER) {
                 $data['payment_method_types'] = ['us_bank_account'];
+            }
 
             $response = $this->stripe->createPaymentIntent($data, $this->stripe->stripe_connect_auth);
 
             SystemLogger::dispatch($response, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_SUCCESS, SystemLog::TYPE_STRIPE, $this->stripe->client, $this->stripe->client->company);
-
-        }catch(\Exception $e) {
-
-            $data =[
+        } catch (\Exception $e) {
+            $data = [
                 'status' => '',
                 'error_type' => '',
                 'error_code' => '',
@@ -270,23 +261,23 @@ class ACH
             ];
 
             switch ($e) {
-                case ($e instanceof CardException):
+                case $e instanceof CardException:
                     $data['status'] = $e->getHttpStatus();
                     $data['error_type'] = $e->getError()->type;
                     $data['error_code'] = $e->getError()->code;
                     $data['param'] = $e->getError()->param;
                     $data['message'] = $e->getError()->message;
                 break;
-                case ($e instanceof RateLimitException):
+                case $e instanceof RateLimitException:
                     $data['message'] = 'Too many requests made to the API too quickly';
                 break;
-                case ($e instanceof InvalidRequestException):
+                case $e instanceof InvalidRequestException:
                     $data['message'] = 'Invalid parameters were supplied to Stripe\'s API';
                 break;
-                case ($e instanceof AuthenticationException):
+                case $e instanceof AuthenticationException:
                     $data['message'] = 'Authentication with Stripe\'s API failed';
                 break;
-                case ($e instanceof ApiErrorException):
+                case $e instanceof ApiErrorException:
                     $data['message'] = 'Network communication with Stripe failed';
                 break;
 
@@ -298,7 +289,7 @@ class ACH
             $this->stripe->processInternallyFailedPayment($this->stripe, $e);
 
             SystemLogger::dispatch($data, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_STRIPE, $this->stripe->client, $this->stripe->client->company);
-        }  
+        }
 
         if (! $response) {
             return false;
@@ -320,7 +311,7 @@ class ACH
         $this->stripe->payment_hash->payment_id = $payment->id;
         $this->stripe->payment_hash->save();
 
-        if($client_present){
+        if ($client_present) {
             return redirect()->route('client.payments.show', ['payment' => $this->stripe->encodePrimaryKey($payment->id)]);
         }
 
@@ -329,17 +320,16 @@ class ACH
 
     public function handlePaymentIntentResponse($request)
     {
-
         $response = json_decode($request->gateway_response);
         $bank_account_response = json_decode($request->bank_account_response);
-        
+
         $method = $bank_account_response->payment_method->us_bank_account;
         $method->id = $response->payment_method;
         $method->state = 'authorized';
 
-        $this->stripe->payment_hash = PaymentHash::where("hash", $request->input("payment_hash"))->first();
+        $this->stripe->payment_hash = PaymentHash::where('hash', $request->input('payment_hash'))->first();
 
-        if($response->id && $response->status === "processing") {
+        if ($response->id && $response->status === 'processing') {
             $payment_intent = PaymentIntent::retrieve($response->id, $this->stripe->stripe_connect_auth);
 
             $state = [
@@ -348,12 +338,12 @@ class ACH
                 'currency' => $response->currency,
                 'customer' => $request->customer,
                 'source' => $response->payment_method,
-                'charge' => $response
+                'charge' => $response,
             ];
 
-            $this->stripe->payment_hash->data = array_merge((array)$this->stripe->payment_hash->data, $state);
+            $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, $state);
             $this->stripe->payment_hash->save();
-            
+
             $customer = $this->stripe->getCustomer($request->customer);
 
             $this->storePaymentMethod($method, GatewayType::BANK_TRANSFER, $customer);
@@ -361,10 +351,8 @@ class ACH
             return $this->processPendingPayment($state, true);
         }
 
-        if($response->next_action){
-
+        if ($response->next_action) {
         }
-
     }
 
     public function processPendingPaymentIntent($state, $client_present = true)
@@ -390,29 +378,28 @@ class ACH
             $this->stripe->client->company,
         );
 
-        if(!$client_present)
+        if (! $client_present) {
             return $payment;
+        }
 
         return redirect()->route('client.payments.show', ['payment' => $this->stripe->encodePrimaryKey($payment->id)]);
     }
 
-
-
     public function paymentResponse($request)
     {
-
         $this->stripe->init();
 
         //it may be a payment intent here.
-        if($request->input('client_secret') != '')
+        if ($request->input('client_secret') != '') {
             return $this->handlePaymentIntentResponse($request);
+        }
 
         $source = ClientGatewayToken::query()
             ->where('id', $this->decodePrimaryKey($request->source))
             ->where('company_id', auth()->guard('contact')->user()->client->company->id)
             ->first();
 
-        if (!$source) {
+        if (! $source) {
             throw new PaymentFailed(ctrans('texts.payment_token_not_found'), 401);
         }
 
@@ -427,7 +414,7 @@ class ACH
         $state = array_merge($state, $request->all());
         $state['source'] = $source->token;
 
-        $this->stripe->payment_hash->data = array_merge((array)$this->stripe->payment_hash->data, $state);
+        $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, $state);
         $this->stripe->payment_hash->save();
 
         $amount = array_sum(array_column($this->stripe->payment_hash->invoices(), 'amount')) + $this->stripe->payment_hash->fee_total;
@@ -441,8 +428,9 @@ class ACH
             $description = "Payment with no invoice for amount {$amount} for client {$this->stripe->client->present()->name()}";
         }
 
-        if(substr($source->token, 0, 2) === "pm")
+        if (substr($source->token, 0, 2) === 'pm') {
             return $this->paymentIntentTokenBilling($amount, $invoice, $description, $source);
+        }
 
         try {
             $state['charge'] = \Stripe\Charge::create([
@@ -455,7 +443,7 @@ class ACH
 
             $state = array_merge($state, $request->all());
 
-            $this->stripe->payment_hash->data = array_merge((array)$this->stripe->payment_hash->data, $state);
+            $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, $state);
             $this->stripe->payment_hash->save();
 
             if ($state['charge']->status === 'pending' && is_null($state['charge']->failure_message)) {
@@ -472,7 +460,6 @@ class ACH
         }
     }
 
-
     public function processPendingPayment($state, $client_present = true)
     {
         $this->stripe->init();
@@ -496,8 +483,9 @@ class ACH
             $this->stripe->client->company,
         );
 
-        if(!$client_present)
+        if (! $client_present) {
             return $payment;
+        }
 
         return redirect()->route('client.payments.show', ['payment' => $this->stripe->encodePrimaryKey($payment->id)]);
     }
diff --git a/app/PaymentDrivers/Stripe/ACSS.php b/app/PaymentDrivers/Stripe/ACSS.php
index 3aaf73fed1bf..e9255b3bbbae 100644
--- a/app/PaymentDrivers/Stripe/ACSS.php
+++ b/app/PaymentDrivers/Stripe/ACSS.php
@@ -47,6 +47,7 @@ class ACSS
 
         return render('gateways.stripe.acss.authorize', array_merge($data));
     }
+
     public function authorizeResponse(Request $request)
     {
         $stripe_response = json_decode($request->input('gateway_response'));
@@ -128,7 +129,7 @@ class ACSS
     public function paymentView(array $data)
     {
         $this->stripe->init();
-        
+
         $data['gateway'] = $this->stripe;
         $data['return_url'] = $this->buildReturnUrl();
         $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
@@ -142,7 +143,7 @@ class ACSS
             'setup_future_usage' => 'off_session',
             'payment_method_types' => ['acss_debit'],
             'customer' => $this->stripe->findOrCreateCustomer(),
-            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
+            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices').': '.collect($data['invoices'])->pluck('invoice_number')),
             'metadata' => [
                 'payment_hash' => $this->stripe->payment_hash->hash,
                 'gateway_type_id' => GatewayType::ACSS,
@@ -152,11 +153,11 @@ class ACSS
                     'mandate_options' => [
                         'payment_schedule' => 'combined',
                         'interval_description' => 'when any invoice becomes due',
-                        'transaction_type' => 'personal' // TODO: check if is company or personal https://stripe.com/docs/payments/acss-debit
+                        'transaction_type' => 'personal', // TODO: check if is company or personal https://stripe.com/docs/payments/acss-debit
                     ],
-                'verification_method' => 'instant',
-                ]
-            ]
+                    'verification_method' => 'instant',
+                ],
+            ],
         ], $this->stripe->stripe_connect_auth);
 
         $data['pi_client_secret'] = $intent->client_secret;
@@ -187,6 +188,7 @@ class ACSS
             // $this->storePaymentMethod($gateway_response);
             return $this->processSuccessfulPayment($gateway_response->id);
         }
+
         return $this->processUnsuccessfulPayment();
     }
 
@@ -244,7 +246,6 @@ class ACSS
 
     private function storePaymentMethod($intent)
     {
-
         try {
             $method = $this->stripe->getStripePaymentMethod($intent->payment_method);
 
diff --git a/app/PaymentDrivers/Stripe/ApplePay.php b/app/PaymentDrivers/Stripe/ApplePay.php
index 933d2c0d6ba8..b584fd666e37 100644
--- a/app/PaymentDrivers/Stripe/ApplePay.php
+++ b/app/PaymentDrivers/Stripe/ApplePay.php
@@ -19,8 +19,8 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\StripePaymentDriver;
 use App\PaymentDrivers\Stripe\CreditCard;
+use App\PaymentDrivers\StripePaymentDriver;
 use App\Utils\Ninja;
 
 class ApplePay
@@ -45,14 +45,14 @@ class ApplePay
         $data['stripe_amount'] = $this->stripe_driver->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe_driver->client->currency()->precision, $this->stripe_driver->client->currency());
         $data['invoices'] = $this->stripe_driver->payment_hash->invoices();
 
-        $data['intent'] =  \Stripe\PaymentIntent::create([
-                              'amount' => $data['stripe_amount'],
-                              'currency' => $this->stripe_driver->client->getCurrencyCode(),
-                              'metadata' => [
-                                    'payment_hash' => $this->stripe_driver->payment_hash->hash,
-                                    'gateway_type_id' => GatewayType::APPLE_PAY,
-                                ],
-                            ], $this->stripe_driver->stripe_connect_auth);
+        $data['intent'] = \Stripe\PaymentIntent::create([
+            'amount' => $data['stripe_amount'],
+            'currency' => $this->stripe_driver->client->getCurrencyCode(),
+            'metadata' => [
+                'payment_hash' => $this->stripe_driver->payment_hash->hash,
+                'gateway_type_id' => GatewayType::APPLE_PAY,
+            ],
+        ], $this->stripe_driver->stripe_connect_auth);
 
         $this->stripe_driver->payment_hash->data = array_merge((array) $this->stripe_driver->payment_hash->data, ['stripe_amount' => $data['stripe_amount']]);
         $this->stripe_driver->payment_hash->save();
@@ -60,10 +60,8 @@ class ApplePay
         return render('gateways.stripe.applepay.pay', $data);
     }
 
-
     public function paymentResponse(PaymentResponseRequest $request)
     {
-
         $this->stripe_driver->init();
 
         $state = [
@@ -83,38 +81,26 @@ class ApplePay
         $response_handler = new CreditCard($this->stripe_driver);
 
         if ($server_response->status == 'succeeded') {
-
             $this->stripe_driver->logSuccessfulGatewayResponse(['response' => json_decode($request->gateway_response), 'data' => $this->stripe_driver->payment_hash], SystemLog::TYPE_STRIPE);
 
             return $response_handler->processSuccessfulPayment();
         }
 
         return $response_handler->processUnsuccessfulPayment($server_response);
-
-
     }
 
-
     private function registerDomain()
     {
-        if(Ninja::isHosted())
-        {
-        
+        if (Ninja::isHosted()) {
             $domain = isset($this->stripe_driver->company_gateway->company->portal_domain) ? $this->stripe_driver->company_gateway->company->portal_domain : $this->stripe_driver->company_gateway->company->domain();
 
             \Stripe\ApplePayDomain::create([
-              'domain_name' => $domain,
+                'domain_name' => $domain,
             ], $this->stripe_driver->stripe_connect_auth);
-            
-        }
-        else {
-
+        } else {
             \Stripe\ApplePayDomain::create([
-              'domain_name' => config('ninja.app_url'),
+                'domain_name' => config('ninja.app_url'),
             ]);
-
         }
-
-    }   
+    }
 }
-
diff --git a/app/PaymentDrivers/Stripe/BECS.php b/app/PaymentDrivers/Stripe/BECS.php
index 07f526d80ea7..942135eca767 100644
--- a/app/PaymentDrivers/Stripe/BECS.php
+++ b/app/PaymentDrivers/Stripe/BECS.php
@@ -40,7 +40,7 @@ class BECS
     public function paymentView(array $data)
     {
         $this->stripe->init();
-        
+
         $data['gateway'] = $this->stripe;
         $data['payment_method_id'] = GatewayType::BECS;
         $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
@@ -55,7 +55,7 @@ class BECS
             'payment_method_types' => ['au_becs_debit'],
             'setup_future_usage' => 'off_session',
             'customer' => $this->stripe->findOrCreateCustomer(),
-            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
+            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices').': '.collect($data['invoices'])->pluck('invoice_number')),
             'metadata' => [
                 'payment_hash' => $this->stripe->payment_hash->hash,
                 'gateway_type_id' => GatewayType::BECS,
@@ -139,7 +139,6 @@ class BECS
         throw new PaymentFailed('Failed to process the payment.', 500);
     }
 
-
     private function storePaymentMethod($intent)
     {
         try {
diff --git a/app/PaymentDrivers/Stripe/Bancontact.php b/app/PaymentDrivers/Stripe/Bancontact.php
index fcc257d9bf5f..ae58f1b504ed 100644
--- a/app/PaymentDrivers/Stripe/Bancontact.php
+++ b/app/PaymentDrivers/Stripe/Bancontact.php
@@ -38,7 +38,7 @@ class Bancontact
     public function paymentView(array $data)
     {
         $this->stripe->init();
-        
+
         $data['gateway'] = $this->stripe;
         $data['return_url'] = $this->buildReturnUrl();
         $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
@@ -51,7 +51,7 @@ class Bancontact
             'currency' => 'eur',
             'payment_method_types' => ['bancontact'],
             'customer' => $this->stripe->findOrCreateCustomer(),
-            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
+            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices').': '.collect($data['invoices'])->pluck('invoice_number')),
             'metadata' => [
                 'payment_hash' => $this->stripe->payment_hash->hash,
                 'gateway_type_id' => GatewayType::BANCONTACT,
diff --git a/app/PaymentDrivers/Stripe/BrowserPay.php b/app/PaymentDrivers/Stripe/BrowserPay.php
index 1bbb8d45bb95..6840421f3e28 100644
--- a/app/PaymentDrivers/Stripe/BrowserPay.php
+++ b/app/PaymentDrivers/Stripe/BrowserPay.php
@@ -7,7 +7,7 @@
  *
  * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace App\PaymentDrivers\Stripe;
@@ -70,7 +70,7 @@ class BrowserPay implements MethodInterface
             'amount' => $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency()),
             'currency' => $this->stripe->client->getCurrencyCode(),
             'customer' => $this->stripe->findOrCreateCustomer(),
-            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
+            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices').': '.collect($data['invoices'])->pluck('invoice_number')),
             'metadata' => [
                 'payment_hash' => $this->stripe->payment_hash->hash,
                 'gateway_type_id' => GatewayType::APPLE_PAY,
@@ -90,7 +90,7 @@ class BrowserPay implements MethodInterface
                 'amount' => $payment_intent_data['amount'],
             ],
             'requestPayerName' => true,
-            'requestPayerEmail' => true
+            'requestPayerEmail' => true,
         ];
 
         return render('gateways.stripe.browser_pay.pay', $data);
@@ -105,7 +105,7 @@ class BrowserPay implements MethodInterface
     public function paymentResponse(PaymentResponseRequest $request)
     {
         $gateway_response = json_decode($request->gateway_response);
-        
+
         $this->stripe->payment_hash
             ->withData('gateway_response', $gateway_response)
             ->withData('payment_intent', PaymentIntent::retrieve($gateway_response->id, $this->stripe->stripe_connect_auth));
@@ -200,8 +200,9 @@ class BrowserPay implements MethodInterface
 
         $domain = $this->getAppleDomain();
 
-        if(!$domain)
+        if (! $domain) {
             throw new PaymentFailed('Unable to register Domain with Apple Pay', 500);
+        }
 
         $response = ApplePayDomain::create([
             'domain_name' => $domain,
@@ -210,34 +211,24 @@ class BrowserPay implements MethodInterface
         $config->apple_pay_domain_id = $response->id;
 
         $this->stripe->company_gateway->setConfig($config);
-        
+
         $this->stripe->company_gateway->save();
     }
 
-
     private function getAppleDomain()
     {
-
         $domain = '';
 
-        if(Ninja::isHosted())
-        {
-
-            if($this->stripe->company_gateway->company->portal_mode == 'domain'){
+        if (Ninja::isHosted()) {
+            if ($this->stripe->company_gateway->company->portal_mode == 'domain') {
                 $domain = $this->stripe->company_gateway->company->portal_domain;
+            } else {
+                $domain = $this->stripe->company_gateway->company->subdomain.'.'.config('ninja.app_domain');
             }
-            else{
-                $domain = $this->stripe->company_gateway->company->subdomain . '.' . config('ninja.app_domain');
-            }
-
-        }
-        else {
-
+        } else {
             $domain = config('ninja.app_url');
         }
 
-        return str_replace("https://", "", $domain);
-
+        return str_replace('https://', '', $domain);
     }
-
 }
diff --git a/app/PaymentDrivers/Stripe/Charge.php b/app/PaymentDrivers/Stripe/Charge.php
index 2683dd2f0241..d9f7253a4e32 100644
--- a/app/PaymentDrivers/Stripe/Charge.php
+++ b/app/PaymentDrivers/Stripe/Charge.php
@@ -20,8 +20,8 @@ use App\Models\Invoice;
 use App\Models\PaymentHash;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\StripePaymentDriver;
 use App\PaymentDrivers\Stripe\ACH;
+use App\PaymentDrivers\StripePaymentDriver;
 use App\Utils\Ninja;
 use App\Utils\Traits\MakesHash;
 use Stripe\Exception\ApiConnectionException;
@@ -53,8 +53,9 @@ class Charge
      */
     public function tokenBilling(ClientGatewayToken $cgt, PaymentHash $payment_hash)
     {
-        if($cgt->gateway_type_id == GatewayType::BANK_TRANSFER)
+        if ($cgt->gateway_type_id == GatewayType::BANK_TRANSFER) {
             return (new ACH($this->stripe))->tokenBilling($cgt, $payment_hash);
+        }
 
         $amount = array_sum(array_column($payment_hash->invoices(), 'amount')) + $payment_hash->fee_total;
         $invoice = Invoice::whereIn('id', $this->transformKeys(array_column($payment_hash->invoices(), 'invoice_id')))->withTrashed()->first();
@@ -70,29 +71,28 @@ class Charge
         $response = null;
 
         try {
-
             $data = [
-              'amount' => $this->stripe->convertToStripeAmount($amount, $this->stripe->client->currency()->precision, $this->stripe->client->currency()),
-              'currency' => $this->stripe->client->getCurrencyCode(),
-              'payment_method' => $cgt->token,
-              'customer' => $cgt->gateway_customer_reference,
-              'confirm' => true,
-              'description' => $description,
-              'metadata' => [
-                'payment_hash' => $payment_hash->hash,
-                'gateway_type_id' => $cgt->gateway_type_id,
+                'amount' => $this->stripe->convertToStripeAmount($amount, $this->stripe->client->currency()->precision, $this->stripe->client->currency()),
+                'currency' => $this->stripe->client->getCurrencyCode(),
+                'payment_method' => $cgt->token,
+                'customer' => $cgt->gateway_customer_reference,
+                'confirm' => true,
+                'description' => $description,
+                'metadata' => [
+                    'payment_hash' => $payment_hash->hash,
+                    'gateway_type_id' => $cgt->gateway_type_id,
                 ],
             ];
 
-            if($cgt->gateway_type_id == GatewayType::SEPA)
+            if ($cgt->gateway_type_id == GatewayType::SEPA) {
                 $data['payment_method_types'] = ['sepa_debit'];
+            }
 
             $response = $this->stripe->createPaymentIntent($data, $this->stripe->stripe_connect_auth);
-            
+
             SystemLogger::dispatch($response, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_SUCCESS, SystemLog::TYPE_STRIPE, $this->stripe->client, $this->stripe->client->company);
         } catch (\Exception $e) {
-
-            $data =[
+            $data = [
                 'status' => '',
                 'error_type' => '',
                 'error_code' => '',
@@ -101,23 +101,23 @@ class Charge
             ];
 
             switch ($e) {
-                case ($e instanceof CardException):
+                case $e instanceof CardException:
                     $data['status'] = $e->getHttpStatus();
                     $data['error_type'] = $e->getError()->type;
                     $data['error_code'] = $e->getError()->code;
                     $data['param'] = $e->getError()->param;
                     $data['message'] = $e->getError()->message;
                 break;
-                case ($e instanceof RateLimitException):
+                case $e instanceof RateLimitException:
                     $data['message'] = 'Too many requests made to the API too quickly';
                 break;
-                case ($e instanceof InvalidRequestException):
+                case $e instanceof InvalidRequestException:
                     $data['message'] = 'Invalid parameters were supplied to Stripe\'s API';
                 break;
-                case ($e instanceof AuthenticationException):
+                case $e instanceof AuthenticationException:
                     $data['message'] = 'Authentication with Stripe\'s API failed';
                 break;
-                case ($e instanceof ApiErrorException):
+                case $e instanceof ApiErrorException:
                     $data['message'] = 'Network communication with Stripe failed';
                 break;
 
@@ -129,16 +129,17 @@ class Charge
             $this->stripe->processInternallyFailedPayment($this->stripe, $e);
 
             SystemLogger::dispatch($data, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_STRIPE, $this->stripe->client, $this->stripe->client->company);
-        }  
+        }
 
         if (! $response) {
             return false;
         }
 
-        if($cgt->gateway_type_id == GatewayType::SEPA)
+        if ($cgt->gateway_type_id == GatewayType::SEPA) {
             $payment_method_type = PaymentType::SEPA;
-        else
+        } else {
             $payment_method_type = $response->charges->data[0]->payment_method_details->card->brand;
+        }
 
         $data = [
             'gateway_type_id' => $cgt->gateway_type_id,
@@ -187,4 +188,4 @@ class Charge
                 break;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/PaymentDrivers/Stripe/Connect/Account.php b/app/PaymentDrivers/Stripe/Connect/Account.php
index 050a1db9d11c..e3fc49c29486 100644
--- a/app/PaymentDrivers/Stripe/Connect/Account.php
+++ b/app/PaymentDrivers/Stripe/Connect/Account.php
@@ -46,6 +46,4 @@ class Account
             'type' => 'account_onboarding',
         ]);
     }
-
-
 }
diff --git a/app/PaymentDrivers/Stripe/Connect/ConnectOauth.php b/app/PaymentDrivers/Stripe/Connect/ConnectOauth.php
index cc4d9aa876f9..6cc84fd51e50 100644
--- a/app/PaymentDrivers/Stripe/Connect/ConnectOauth.php
+++ b/app/PaymentDrivers/Stripe/Connect/ConnectOauth.php
@@ -16,58 +16,43 @@ use Stripe\Stripe;
 
 class ConnectOauth
 {
-
-	/**
-	 * Response payload
-	 *   "token_type": "bearer",
+    /**
+     * Response payload
+     *   "token_type": "bearer",
          "stripe_publishable_key": "{PUBLISHABLE_KEY}",
-		 "scope": "read_write",
-		 "livemode": false,
-  	 	 "stripe_user_id": "{ACCOUNT_ID}",
-  		 "refresh_token": "{REFRESH_TOKEN}",
-		 "access_token": "{ACCESS_TOKEN}"
-	 */
-	public function getAccountId($code)
-	{
+         "scope": "read_write",
+         "livemode": false,
+          "stripe_user_id": "{ACCOUNT_ID}",
+         "refresh_token": "{REFRESH_TOKEN}",
+         "access_token": "{ACCESS_TOKEN}"
+     */
+    public function getAccountId($code)
+    {
+        Stripe::setApiKey(config('ninja.ninja_stripe_key'));
 
- 		Stripe::setApiKey(config('ninja.ninja_stripe_key'));
+        $response = \Stripe\OAuth::token([
+            'grant_type' => 'authorization_code',
+            'code' => $code,
+        ]);
 
-		$response = \Stripe\OAuth::token([
-		  'grant_type' => 'authorization_code',
-		  'code' => $code,
-		]);
+        // Access the connected account id in the response
+        $connected_account_id = $response->stripe_user_id;
 
-		// Access the connected account id in the response
-		$connected_account_id = $response->stripe_user_id;
+        return $response;
+        //return $connected_account_id;
+    }
 
-		return $response;
-		//return $connected_account_id;
-	}
-
-
-	/**
-	 * Revokes access to Stripe from Invoice Ninja 
-	 * for the given account id
-	 */
-	public function revoke($account_id)
-	{
-
- 		Stripe::setApiKey(config('ninja.ninja_stripe_key'));
-
-		\Stripe\OAuth::deauthorize([
-		  'client_id' => config('ninja.ninja_stripe_key'),
-		  'stripe_user_id' => $account_id,
-		]);
-
-	}
+    /**
+     * Revokes access to Stripe from Invoice Ninja
+     * for the given account id
+     */
+    public function revoke($account_id)
+    {
+        Stripe::setApiKey(config('ninja.ninja_stripe_key'));
 
+        \Stripe\OAuth::deauthorize([
+            'client_id' => config('ninja.ninja_stripe_key'),
+            'stripe_user_id' => $account_id,
+        ]);
+    }
 }
-
-
-
-
-
-
-
-
-
diff --git a/app/PaymentDrivers/Stripe/Connect/Verify.php b/app/PaymentDrivers/Stripe/Connect/Verify.php
index 043b090520aa..84ea32987803 100644
--- a/app/PaymentDrivers/Stripe/Connect/Verify.php
+++ b/app/PaymentDrivers/Stripe/Connect/Verify.php
@@ -37,7 +37,6 @@ class Verify
     use MakesHash;
 
     /** @var StripePaymentDriver */
-
     public $stripe;
 
     public function __construct(StripePaymentDriver $stripe)
@@ -49,32 +48,28 @@ class Verify
     {
         $this->stripe->init();
 
-        if($this->stripe->stripe_connect && strlen($this->stripe->company_gateway->getConfigField('account_id')) < 1)
+        if ($this->stripe->stripe_connect && strlen($this->stripe->company_gateway->getConfigField('account_id')) < 1) {
             throw new StripeConnectFailure('Stripe Connect has not been configured');
+        }
 
         $total_stripe_customers = 0;
 
         $starting_after = null;
 
         do {
-        
-            $customers = Customer::all(['limit' => 100, 'starting_after' => $starting_after], $this->stripe->stripe_connect_auth);  
+            $customers = Customer::all(['limit' => 100, 'starting_after' => $starting_after], $this->stripe->stripe_connect_auth);
 
             $total_stripe_customers += count($customers->data);
             $starting_after = end($customers->data)['id'];
+        } while ($customers->has_more);
 
-        } while($customers->has_more);
-
-
-        $stripe_customers = $this->stripe->company_gateway->client_gateway_tokens->map(function ($cgt){
-
+        $stripe_customers = $this->stripe->company_gateway->client_gateway_tokens->map(function ($cgt) {
             $customer = Customer::retrieve($cgt->gateway_customer_reference, $this->stripe->stripe_connect_auth);
 
             return [
-                'customer' => $cgt->gateway_customer_reference, 
-                'record' => $customer
+                'customer' => $cgt->gateway_customer_reference,
+                'record' => $customer,
             ];
-
         });
 
         $data = [
@@ -84,4 +79,4 @@ class Verify
 
         return response()->json($data, 200);
     }
-}
\ No newline at end of file
+}
diff --git a/app/PaymentDrivers/Stripe/CreditCard.php b/app/PaymentDrivers/Stripe/CreditCard.php
index 0df84b28e527..f0ca05eaa34d 100644
--- a/app/PaymentDrivers/Stripe/CreditCard.php
+++ b/app/PaymentDrivers/Stripe/CreditCard.php
@@ -20,6 +20,7 @@ use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
 use App\PaymentDrivers\StripePaymentDriver;
+use App\PaymentDrivers\Stripe\Jobs\UpdateCustomer;
 use Stripe\PaymentIntent;
 use Stripe\PaymentMethod;
 
@@ -59,12 +60,10 @@ class CreditCard
     public function paymentView(array $data)
     {
 
-
         // $description = $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')) . " for client {$this->stripe->client->present()->name()}";
-        $invoice_numbers =  collect($data['invoices'])->pluck('invoice_number')->implode(',');
+        $invoice_numbers = collect($data['invoices'])->pluck('invoice_number')->implode(',');
         $description = "Invoices: {$invoice_numbers} for {$data['total']['amount_with_fee']} for client {$this->stripe->client->present()->name()}";
 
-
         $payment_intent_data = [
             'amount' => $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency()),
             'currency' => $this->stripe->client->getCurrencyCode(),
@@ -89,8 +88,11 @@ class CreditCard
         // return iconv("UTF-8", "ISO-8859-1//TRANSLIT", $this->decode_encoded_utf8($string));
     }
 
-    private function decode_encoded_utf8($string){
-        return preg_replace_callback('#\\\\u([0-9a-f]{4})#ism', function($matches) { return mb_convert_encoding(pack("H*", $matches[1]), "UTF-8", "UCS-2BE"); }, $string);
+    private function decode_encoded_utf8($string)
+    {
+        return preg_replace_callback('#\\\\u([0-9a-f]{4})#ism', function ($matches) {
+            return mb_convert_encoding(pack('H*', $matches[1]), 'UTF-8', 'UCS-2BE');
+        }, $string);
     }
 
     public function paymentResponse(PaymentResponseRequest $request)
@@ -105,7 +107,7 @@ class CreditCard
         $state = array_merge($state, $request->all());
         $state['store_card'] = boolval($state['store_card']);
 
-        if ($request->has('token') && !is_null($request->token)) {
+        if ($request->has('token') && ! is_null($request->token)) {
             $state['store_card'] = false;
         }
 
@@ -118,7 +120,6 @@ class CreditCard
         $server_response = $this->stripe->payment_hash->data->server_response;
 
         if ($server_response->status == 'succeeded') {
-
             $this->stripe->logSuccessfulGatewayResponse(['response' => json_decode($request->gateway_response), 'data' => $this->stripe->payment_hash], SystemLog::TYPE_STRIPE);
 
             return $this->processSuccessfulPayment();
@@ -129,6 +130,8 @@ class CreditCard
 
     public function processSuccessfulPayment()
     {
+        UpdateCustomer::dispatch($this->stripe->company_gateway->company->company_key, $this->stripe->company_gateway->id, $this->stripe->client->id);
+
         $stripe_method = $this->stripe->getStripePaymentMethod($this->stripe->payment_hash->data->server_response->payment_method);
 
         $data = [
diff --git a/app/PaymentDrivers/Stripe/EPS.php b/app/PaymentDrivers/Stripe/EPS.php
index 677397b21593..6a9b6a56e2f8 100644
--- a/app/PaymentDrivers/Stripe/EPS.php
+++ b/app/PaymentDrivers/Stripe/EPS.php
@@ -38,7 +38,7 @@ class EPS
     public function paymentView(array $data)
     {
         $this->stripe->init();
-        
+
         $data['gateway'] = $this->stripe;
         $data['return_url'] = $this->buildReturnUrl();
         $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
@@ -51,7 +51,7 @@ class EPS
             'currency' => 'eur',
             'payment_method_types' => ['eps'],
             'customer' => $this->stripe->findOrCreateCustomer(),
-            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
+            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices').': '.collect($data['invoices'])->pluck('invoice_number')),
             'metadata' => [
                 'payment_hash' => $this->stripe->payment_hash->hash,
                 'gateway_type_id' => GatewayType::EPS,
diff --git a/app/PaymentDrivers/Stripe/FPX.php b/app/PaymentDrivers/Stripe/FPX.php
index dd415ea39808..914442e1edd8 100644
--- a/app/PaymentDrivers/Stripe/FPX.php
+++ b/app/PaymentDrivers/Stripe/FPX.php
@@ -39,7 +39,7 @@ class FPX
     public function paymentView(array $data)
     {
         $this->stripe->init();
-        
+
         $data['gateway'] = $this->stripe;
         $data['return_url'] = $this->buildReturnUrl();
         $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
@@ -52,7 +52,7 @@ class FPX
             'currency' => $this->stripe->client->getCurrencyCode(),
             'payment_method_types' => ['fpx'],
             'customer' => $this->stripe->findOrCreateCustomer(),
-            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
+            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices').': '.collect($data['invoices'])->pluck('invoice_number')),
             'metadata' => [
                 'payment_hash' => $this->stripe->payment_hash->hash,
                 'gateway_type_id' => GatewayType::FPX,
diff --git a/app/PaymentDrivers/Stripe/GIROPAY.php b/app/PaymentDrivers/Stripe/GIROPAY.php
index 5dfc098f5446..8655eec5f2fe 100644
--- a/app/PaymentDrivers/Stripe/GIROPAY.php
+++ b/app/PaymentDrivers/Stripe/GIROPAY.php
@@ -38,7 +38,7 @@ class GIROPAY
     public function paymentView(array $data)
     {
         $this->stripe->init();
-        
+
         $data['gateway'] = $this->stripe;
         $data['return_url'] = $this->buildReturnUrl();
         $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
@@ -51,7 +51,7 @@ class GIROPAY
             'currency' => 'eur',
             'payment_method_types' => ['giropay'],
             'customer' => $this->stripe->findOrCreateCustomer(),
-            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
+            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices').': '.collect($data['invoices'])->pluck('invoice_number')),
             'metadata' => [
                 'payment_hash' => $this->stripe->payment_hash->hash,
                 'gateway_type_id' => GatewayType::GIROPAY,
@@ -97,7 +97,7 @@ class GIROPAY
         if (Payment::where('transaction_reference', $payment_intent)->exists()) {
             return redirect()->route('client.payments.index');
         }
-        
+
         $data = [
             'payment_method' => $payment_intent,
             'payment_type' => PaymentType::GIROPAY,
diff --git a/app/PaymentDrivers/Stripe/ImportCustomers.php b/app/PaymentDrivers/Stripe/ImportCustomers.php
index ec962337b5cf..8ecd3dbb5f32 100644
--- a/app/PaymentDrivers/Stripe/ImportCustomers.php
+++ b/app/PaymentDrivers/Stripe/ImportCustomers.php
@@ -8,7 +8,7 @@
  * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
-*/
+ */
 
 namespace App\PaymentDrivers\Stripe;
 
@@ -21,8 +21,8 @@ use App\Models\ClientGatewayToken;
 use App\Models\Country;
 use App\Models\Currency;
 use App\Models\GatewayType;
-use App\PaymentDrivers\StripePaymentDriver;
 use App\PaymentDrivers\Stripe\UpdatePaymentMethods;
+use App\PaymentDrivers\StripePaymentDriver;
 use App\Utils\Ninja;
 use App\Utils\Traits\GeneratesCounter;
 use App\Utils\Traits\MakesHash;
@@ -42,42 +42,38 @@ class ImportCustomers
     public function __construct(StripePaymentDriver $stripe)
     {
         $this->stripe = $stripe;
-
     }
 
     public function run()
     {
-
         $this->stripe->init();
 
         $this->update_payment_methods = new UpdatePaymentMethods($this->stripe);
 
-        if(Ninja::isHosted() && strlen($this->stripe->company_gateway->getConfigField('account_id')) < 1)
+        if (Ninja::isHosted() && strlen($this->stripe->company_gateway->getConfigField('account_id')) < 1) {
             throw new StripeConnectFailure('Stripe Connect has not been configured');
+        }
 
         $starting_after = null;
 
         do {
-        
             $customers = Customer::all(['limit' => 100, 'starting_after' => $starting_after], $this->stripe->stripe_connect_auth);
 
-            foreach($customers as $customer)
-            {
+            foreach ($customers as $customer) {
                 $this->addCustomer($customer);
-            }   
+            }
 
             $starting_after = end($customers->data)['id'];
-
-        } while($customers->has_more);
+        } while ($customers->has_more);
     }
 
     private function addCustomer(Customer $customer)
     {
+        $account = $this->stripe->company_gateway->company->account;
 
-    $account = $this->stripe->company_gateway->company->account;
-        
-    if(Ninja::isHosted() && !$account->isPaidHostedClient() && Client::where('company_id', $this->stripe->company_gateway->company_id)->count() > config('ninja.quotas.free.clients'))
-        return;
+        if (Ninja::isHosted() && ! $account->isPaidHostedClient() && Client::where('company_id', $this->stripe->company_gateway->company_id)->count() > config('ninja.quotas.free.clients')) {
+            return;
+        }
 
         $existing_customer_token = $this->stripe
                                   ->company_gateway
@@ -85,63 +81,55 @@ class ImportCustomers
                                   ->where('gateway_customer_reference', $customer->id)
                                   ->first();
 
-        if($existing_customer_token){
+        if ($existing_customer_token) {
             nlog("Skipping - Customer exists: {$customer->email} just updating payment methods");
             $this->update_payment_methods->updateMethods($customer, $existing_customer_token->client);
         }
 
-        if($customer->email && $this->stripe->company_gateway->company->client_contacts()->where('email', $customer->email)->exists()){
+        if ($customer->email && $this->stripe->company_gateway->company->client_contacts()->where('email', $customer->email)->exists()) {
             nlog("Customer exists: {$customer->email} just updating payment methods");
 
-            $this->stripe->company_gateway->company->client_contacts()->where('email', $customer->email)->each(function ($contact) use ($customer){
-
+            $this->stripe->company_gateway->company->client_contacts()->where('email', $customer->email)->each(function ($contact) use ($customer) {
                 $this->update_payment_methods->updateMethods($customer, $contact->client);
-                
             });
-            
+
             return;
         }
 
         $client = ClientFactory::create($this->stripe->company_gateway->company_id, $this->stripe->company_gateway->user_id);
 
-        if($customer->address)
-        {
+        if ($customer->address) {
             $client->address1 = $customer->address->line1 ? $customer->address->line1 : '';
             $client->address2 = $customer->address->line2 ? $customer->address->line2 : '';
             $client->city = $customer->address->city ? $customer->address->city : '';
             $client->state = $customer->address->state ? $customer->address->state : '';
-            $client->phone =  $customer->address->phone ? $customer->phone : '';
-
-            if($customer->address->country){
+            $client->phone = $customer->address->phone ? $customer->phone : '';
 
+            if ($customer->address->country) {
                 $country = Country::where('iso_3166_2', $customer->address->country)->first();
 
-                if($country)
+                if ($country) {
                     $client->country_id = $country->id;
-
+                }
             }
         }
 
-        if($customer->currency) {
-
+        if ($customer->currency) {
             $currency = Currency::where('code', $customer->currency)->first();
 
-            if($currency){
-
+            if ($currency) {
                 $settings = $client->settings;
-                $settings->currency_id = (string)$currency->id;
+                $settings->currency_id = (string) $currency->id;
                 $client->settings = $settings;
-
             }
-
         }
 
         $client->name = $customer->name ? $customer->name : $customer->email;
 
-        if (!isset($client->number) || empty($client->number)) {
+        if (! isset($client->number) || empty($client->number)) {
             $client->number = $this->getNextClientNumber($client);
         }
-        
+
         $client->save();
 
         $contact = ClientContactFactory::create($client->company_id, $client->user_id);
@@ -149,35 +137,32 @@ class ImportCustomers
         $contact->first_name = $client->name ?: '';
         $contact->phone = $client->phone ?: '';
         $contact->email = $customer->email ?: '';
-        $contact->save();            
+        $contact->save();
 
         $this->update_payment_methods->updateMethods($customer, $client);
     }
 
     public function importCustomer($customer_id)
     {
-
         $this->stripe->init();
 
         $this->update_payment_methods = new UpdatePaymentMethods($this->stripe);
 
-        if(strlen($this->stripe->company_gateway->getConfigField('account_id')) < 1)
-                throw new StripeConnectFailure('Stripe Connect has not been configured');
+        if (strlen($this->stripe->company_gateway->getConfigField('account_id')) < 1) {
+            throw new StripeConnectFailure('Stripe Connect has not been configured');
+        }
 
         $customer = Customer::retrieve($customer_id, $this->stripe->stripe_connect_auth);
 
-        if(!$customer)
+        if (! $customer) {
             return;
-
-        foreach($this->stripe->company_gateway->company->clients as $client)
-        {
-            if($client->present()->email() == $customer->email) {
-
-                $this->update_payment_methods->updateMethods($customer, $client);
-    
-            }
         }
 
+        foreach ($this->stripe->company_gateway->company->clients as $client) {
+            if ($client->present()->email() == $customer->email) {
+                $this->update_payment_methods->updateMethods($customer, $client);
+            }
+        }
     }
 
     public function match()
@@ -186,35 +171,28 @@ class ImportCustomers
 
         $this->update_payment_methods = new UpdatePaymentMethods($this->stripe);
 
-        if(strlen($this->stripe->company_gateway->getConfigField('account_id')) < 1)
-                throw new StripeConnectFailure('Stripe Connect has not been configured');
-
-        foreach($this->stripe->company_gateway->company->clients as $client)
-        {
-
-            $searchResults = \Stripe\Customer::all([
-                        "email" => $client->present()->email(),
-                        "limit" => 2,
-                        "starting_after" => null
-            ],$this->stripe->stripe_connect_auth);
-
-            // nlog(count($searchResults));
-          
-            if(count($searchResults) == 1)
-            {
-
-            $cgt = ClientGatewayToken::where('gateway_customer_reference', $searchResults->data[0]->id)->where('company_id', $this->stripe->company_gateway->company->id)->exists();
-
-                if(!$cgt)
-                {
-                    nlog("customer ".$searchResults->data[0]->id. " does not exist.");
-
-                    $this->update_payment_methods->updateMethods($searchResults->data[0], $client);
-
-                }
-            }
-          
+        if (strlen($this->stripe->company_gateway->getConfigField('account_id')) < 1) {
+            throw new StripeConnectFailure('Stripe Connect has not been configured');
         }
 
+        foreach ($this->stripe->company_gateway->company->clients as $client) {
+            $searchResults = \Stripe\Customer::all([
+                'email' => $client->present()->email(),
+                'limit' => 2,
+                'starting_after' => null,
+            ], $this->stripe->stripe_connect_auth);
+
+            // nlog(count($searchResults));
+
+            if (count($searchResults) == 1) {
+                $cgt = ClientGatewayToken::where('gateway_customer_reference', $searchResults->data[0]->id)->where('company_id', $this->stripe->company_gateway->company->id)->exists();
+
+                if (! $cgt) {
+                    nlog('customer '.$searchResults->data[0]->id.' does not exist.');
+
+                    $this->update_payment_methods->updateMethods($searchResults->data[0], $client);
+                }
+            }
+        }
     }
 }
diff --git a/app/PaymentDrivers/Stripe/Jobs/PaymentIntentFailureWebhook.php b/app/PaymentDrivers/Stripe/Jobs/PaymentIntentFailureWebhook.php
index dd2cd68c125f..ad332daeabdd 100644
--- a/app/PaymentDrivers/Stripe/Jobs/PaymentIntentFailureWebhook.php
+++ b/app/PaymentDrivers/Stripe/Jobs/PaymentIntentFailureWebhook.php
@@ -54,75 +54,57 @@ class PaymentIntentFailureWebhook implements ShouldQueue
 
     public function handle()
     {
-
         MultiDB::findAndSetDbByCompanyKey($this->company_key);
 
         $company = Company::where('company_key', $this->company_key)->first();
 
-            foreach ($this->stripe_request as $transaction) {
-
-                if(array_key_exists('payment_intent', $transaction))
-                {
-
-                    $payment = Payment::query()
+        foreach ($this->stripe_request as $transaction) {
+            if (array_key_exists('payment_intent', $transaction)) {
+                $payment = Payment::query()
                         ->where('company_id', $company->id)
                         ->where(function ($query) use ($transaction) {
                             $query->where('transaction_reference', $transaction['payment_intent'])
                                   ->orWhere('transaction_reference', $transaction['id']);
-                                })
+                        })
                         ->first();
-
-                }
-                else
-                {
-
-                     $payment = Payment::query()
+            } else {
+                $payment = Payment::query()
                         ->where('company_id', $company->id)
                         ->where('transaction_reference', $transaction['id'])
                         ->first();
+            }
 
+            if ($payment) {
+                $client = $payment->client;
+
+                if ($payment->status_id == Payment::STATUS_PENDING) {
+                    $payment->service()->deletePayment();
                 }
 
-                if ($payment) {
+                $payment->status_id = Payment::STATUS_FAILED;
+                $payment->save();
 
-                    $client = $payment->client;
+                $payment_hash = PaymentHash::where('payment_id', $payment->id)->first();
 
-                    if($payment->status_id == Payment::STATUS_PENDING)
-                        $payment->service()->deletePayment();
-        
-                    $payment->status_id = Payment::STATUS_FAILED;
-                    $payment->save();
+                if ($payment_hash) {
+                    $error = ctrans('texts.client_payment_failure_body', [
+                        'invoice' => implode(',', $payment->invoices->pluck('number')->toArray()),
+                        'amount' => array_sum(array_column($payment_hash->invoices(), 'amount')) + $payment_hash->fee_total, ]);
+                } else {
+                    $error = 'Payment for '.$payment->client->present()->name()." for {$payment->amount} failed";
+                }
 
-                    $payment_hash = PaymentHash::where('payment_id', $payment->id)->first();
+                if (array_key_exists('failure_message', $transaction)) {
+                    $error .= "\n\n".$transaction['failure_message'];
+                }
 
-                    if($payment_hash)
-                    {
-
-                        $error = ctrans('texts.client_payment_failure_body', [
-                            'invoice' => implode(",", $payment->invoices->pluck('number')->toArray()), 
-                            'amount' => array_sum(array_column($payment_hash->invoices(), 'amount')) + $payment_hash->fee_total]);
-
-                    }
-                    else
-                        $error = "Payment for " . $payment->client->present()->name(). " for {$payment->amount} failed";
-
-                    if(array_key_exists('failure_message', $transaction)){
-                        
-                        $error .= "\n\n" .$transaction['failure_message'];
-                    }
-
-                    PaymentFailedMailer::dispatch(
+                PaymentFailedMailer::dispatch(
                         $payment_hash,
                         $client->company,
                         $client,
                         $error
                     );
-
-
-                }
-
             }
-
+        }
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/PaymentDrivers/Stripe/Jobs/StripeWebhook.php b/app/PaymentDrivers/Stripe/Jobs/StripeWebhook.php
index f97088950570..bd7acab7a276 100644
--- a/app/PaymentDrivers/Stripe/Jobs/StripeWebhook.php
+++ b/app/PaymentDrivers/Stripe/Jobs/StripeWebhook.php
@@ -33,7 +33,7 @@ class StripeWebhook implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, Utilities;
 
-    public $tries = 1; 
+    public $tries = 1;
 
     public $deleteWhenMissingModels = true;
 
@@ -48,7 +48,7 @@ class StripeWebhook implements ShouldQueue
         'charge.succeeded',
         'charge.failed',
         'payment_intent.succeeded',
-        'payment_intent.payment_failed'
+        'payment_intent.payment_failed',
     ];
 
     public function __construct(string $company_key, int $company_gateway_id)
@@ -59,7 +59,6 @@ class StripeWebhook implements ShouldQueue
 
     public function handle()
     {
-
         MultiDB::findAndSetDbByCompanyKey($this->company_key);
 
         $company = Company::where('company_key', $this->company_key)->first();
@@ -72,30 +71,20 @@ class StripeWebhook implements ShouldQueue
 
         $webhook_url = $company_gateway->webhookUrl();
 
-        foreach($endpoints['data'] as $endpoint)
-        {
-
-            if($endpoint->url === $webhook_url)
-            {
-
+        foreach ($endpoints['data'] as $endpoint) {
+            if ($endpoint->url === $webhook_url) {
                 \Stripe\WebhookEndpoint::update($endpoint->id, ['enabled_events' => $this->events], $stripe->stripe_connect_auth);
 
                 $this->url_found = true;
-                
             }
-
         }
 
         /* Add new webhook */
-        if(!$this->url_found)
-        {
-
+        if (! $this->url_found) {
             \Stripe\WebhookEndpoint::create([
                 'url' => $webhook_url,
                 'enabled_events' => $this->events,
             ], $stripe->stripe_connect_auth);
-
         }
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/PaymentDrivers/Stripe/Jobs/UpdateCustomer.php b/app/PaymentDrivers/Stripe/Jobs/UpdateCustomer.php
new file mode 100644
index 000000000000..a9aadefde559
--- /dev/null
+++ b/app/PaymentDrivers/Stripe/Jobs/UpdateCustomer.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\PaymentDrivers\Stripe\Jobs;
+
+use App\Jobs\Mail\PaymentFailedMailer;
+use App\Jobs\Util\SystemLogger;
+use App\Libraries\MultiDB;
+use App\Models\Client;
+use App\Models\Company;
+use App\Models\CompanyGateway;
+use App\Models\GatewayType;
+use App\Models\Invoice;
+use App\Models\Payment;
+use App\Models\PaymentHash;
+use App\Models\PaymentType;
+use App\Models\SystemLog;
+use App\PaymentDrivers\Stripe\Utilities;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class UpdateCustomer implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, Utilities;
+
+    public $tries = 1;
+
+    public $deleteWhenMissingModels = true;
+
+    public int $company_gateway_id;
+
+    public string $company_key;
+
+    private int $client_id;
+
+    public function __construct(string $company_key, int $company_gateway_id, int $client_id)
+    {
+        $this->company_key = $company_key;
+        $this->company_gateway_id = $company_gateway_id;
+        $this->client_id = $client_id;
+    }
+
+    public function handle()
+    {
+
+        MultiDB::findAndSetDbByCompanyKey($this->company_key);
+
+        $company = Company::where('company_key', $this->company_key)->first();
+
+        if($company->id !== config('ninja.ninja_default_company_id'))
+            return;
+
+        $company_gateway = CompanyGateway::find($this->company_gateway_id);
+        $client = Client::withTrashed()->find($this->client_id);
+
+        $stripe = $company_gateway->driver($client)->init();
+
+        $customer = $stripe->findOrCreateCustomer();
+        //Else create a new record
+        $data['name'] = $client->present()->name();
+        $data['phone'] = substr($client->present()->phone(), 0, 20);
+
+        $data['address']['line1'] = $client->address1;
+        $data['address']['line2'] = $client->address2;
+        $data['address']['city'] = $client->city;
+        $data['address']['postal_code'] = $client->postal_code;
+        $data['address']['state'] = $client->state;
+        $data['address']['country'] = $client->country ? $client->country->iso_3166_2 : '';
+
+        $data['shipping']['name'] = $client->present()->name();
+        $data['shipping']['address']['line1'] = $client->shipping_address1;
+        $data['shipping']['address']['line2'] = $client->shipping_address2;
+        $data['shipping']['address']['city'] = $client->shipping_city;
+        $data['shipping']['address']['postal_code'] = $client->shipping_postal_code;
+        $data['shipping']['address']['state'] = $client->shipping_state;
+        $data['shipping']['address']['country'] = $client->shipping_country ? $client->shipping_country->iso_3166_2 : '';
+
+        \Stripe\Customer::update($customer->id, $data, $stripe->stripe_connect_auth);
+
+    }
+}
diff --git a/app/PaymentDrivers/Stripe/PRZELEWY24.php b/app/PaymentDrivers/Stripe/PRZELEWY24.php
index 871a1697c924..71264afc58b9 100644
--- a/app/PaymentDrivers/Stripe/PRZELEWY24.php
+++ b/app/PaymentDrivers/Stripe/PRZELEWY24.php
@@ -51,7 +51,7 @@ class PRZELEWY24
             'currency' => 'eur',
             'payment_method_types' => ['p24'],
             'customer' => $this->stripe->findOrCreateCustomer(),
-            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
+            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices').': '.collect($data['invoices'])->pluck('invoice_number')),
             'metadata' => [
                 'payment_hash' => $this->stripe->payment_hash->hash,
                 'gateway_type_id' => GatewayType::PRZELEWY24,
@@ -97,7 +97,7 @@ class PRZELEWY24
         if (Payment::where('transaction_reference', $payment_intent)->exists()) {
             return redirect()->route('client.payments.index');
         }
-        
+
         $data = [
             'payment_method' => $payment_intent,
             'payment_type' => PaymentType::PRZELEWY24,
diff --git a/app/PaymentDrivers/Stripe/SEPA.php b/app/PaymentDrivers/Stripe/SEPA.php
index 77d869494215..0672a2f775f6 100644
--- a/app/PaymentDrivers/Stripe/SEPA.php
+++ b/app/PaymentDrivers/Stripe/SEPA.php
@@ -39,7 +39,7 @@ class SEPA
         $data['client'] = $this->stripe->client;
         $data['country'] = $this->stripe->client->country->iso_3166_2;
         $data['currency'] = $this->stripe->client->currency();
-        
+
         return render('gateways.stripe.sepa.authorize', $data);
     }
 
@@ -59,7 +59,7 @@ class SEPA
             'payment_method_types' => ['sepa_debit'],
             'setup_future_usage' => 'off_session',
             'customer' => $this->stripe->findOrCreateCustomer(),
-            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
+            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices').': '.collect($data['invoices'])->pluck('invoice_number')),
             'metadata' => [
                 'payment_hash' => $this->stripe->payment_hash->hash,
                 'gateway_type_id' => GatewayType::SEPA,
@@ -141,7 +141,6 @@ class SEPA
         throw new PaymentFailed('Failed to process the payment.', 500);
     }
 
-
     private function storePaymentMethod($intent)
     {
         try {
diff --git a/app/PaymentDrivers/Stripe/SOFORT.php b/app/PaymentDrivers/Stripe/SOFORT.php
index aed9f5a91e94..54ed593dcdd4 100644
--- a/app/PaymentDrivers/Stripe/SOFORT.php
+++ b/app/PaymentDrivers/Stripe/SOFORT.php
@@ -38,7 +38,7 @@ class SOFORT
     public function paymentView(array $data)
     {
         $this->stripe->init();
-        
+
         $data['gateway'] = $this->stripe;
         $data['return_url'] = $this->buildReturnUrl();
         $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
@@ -51,7 +51,7 @@ class SOFORT
             'currency' => 'eur',
             'payment_method_types' => ['sofort'],
             'customer' => $this->stripe->findOrCreateCustomer(),
-            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
+            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices').': '.collect($data['invoices'])->pluck('invoice_number')),
             'metadata' => [
                 'payment_hash' => $this->stripe->payment_hash->hash,
                 'gateway_type_id' => GatewayType::SOFORT,
@@ -120,7 +120,7 @@ class SOFORT
     {
         $server_response = $this->stripe->payment_hash->data;
 
-        $this->stripe->sendFailureMail("There was an undefined error processing this payment.");
+        $this->stripe->sendFailureMail('There was an undefined error processing this payment.');
 
         $message = [
             'server_response' => $server_response,
diff --git a/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php b/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php
index 47787755882b..b56173334704 100644
--- a/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php
+++ b/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php
@@ -35,90 +35,82 @@ class UpdatePaymentMethods
 
     public function updateMethods(Customer $customer, Client $client)
     {
-                $this->stripe->client = $client;
+        $this->stripe->client = $client;
 
-                $card_methods = PaymentMethod::all([
-                    'customer' => $customer->id,
-                    'type' => 'card',
-                    ],
+        $card_methods = PaymentMethod::all([
+            'customer' => $customer->id,
+            'type' => 'card',
+        ],
                      $this->stripe->stripe_connect_auth);
 
-                foreach($card_methods as $method) 
-                {
-                    $this->addOrUpdateCard($method, $customer->id, $client,GatewayType::CREDIT_CARD);
-                }
+        foreach ($card_methods as $method) {
+            $this->addOrUpdateCard($method, $customer->id, $client, GatewayType::CREDIT_CARD);
+        }
 
-                $alipay_methods = PaymentMethod::all([
-                    'customer' => $customer->id,
-                    'type' => 'alipay',
-                    ],
+        $alipay_methods = PaymentMethod::all([
+            'customer' => $customer->id,
+            'type' => 'alipay',
+        ],
                      $this->stripe->stripe_connect_auth);
 
-                foreach($alipay_methods as $method) 
-                {
-                    $this->addOrUpdateCard($method, $customer->id, $client,GatewayType::ALIPAY);
-                }
+        foreach ($alipay_methods as $method) {
+            $this->addOrUpdateCard($method, $customer->id, $client, GatewayType::ALIPAY);
+        }
 
-                $sofort_methods = PaymentMethod::all([
-                    'customer' => $customer->id,
-                    'type' => 'sofort',
-                    ],
+        $sofort_methods = PaymentMethod::all([
+            'customer' => $customer->id,
+            'type' => 'sofort',
+        ],
                      $this->stripe->stripe_connect_auth);
 
-                foreach($sofort_methods as $method) 
-                {
-                    $this->addOrUpdateCard($method, $customer->id, $client, GatewayType::SOFORT);
-                }
+        foreach ($sofort_methods as $method) {
+            $this->addOrUpdateCard($method, $customer->id, $client, GatewayType::SOFORT);
+        }
 
-                $this->importBankAccounts($customer, $client);
+        $this->importBankAccounts($customer, $client);
     }
 
     private function importBankAccounts($customer, $client)
     {
-
         $sources = $customer->sources;
 
-            foreach($sources->data as $method)
-            {
-            
-                $token_exists = ClientGatewayToken::where([
-                    'gateway_customer_reference' => $customer->id,
-                    'token' => $method->id,
-                    'client_id' => $client->id,
-                    'company_id' => $client->company_id,
-                ])->exists();
-
-                /* Already exists return */
-                if($token_exists)
-                    continue;
-
-                $payment_meta = new \stdClass;
-                $payment_meta->brand = (string) \sprintf('%s (%s)', $method->bank_name, ctrans('texts.ach'));
-                $payment_meta->last4 = (string) $method->last4;
-                $payment_meta->type = GatewayType::BANK_TRANSFER;
-                $payment_meta->state = $method->status;
-
-                $data = [
-                    'payment_meta' => $payment_meta,
-                    'token' => $method->id,
-                    'payment_method_id' => GatewayType::BANK_TRANSFER,
-                ];
-
-                $additional_data = ['gateway_customer_reference' => $customer->id];
-
-                if($customer->default_source === $method->id)
-                    $additional_data = ['gateway_customer_reference' => $customer->id, 'is_default' => 1];
-
-                $this->stripe->storeGatewayToken($data, $additional_data);
+        foreach ($sources->data as $method) {
+            $token_exists = ClientGatewayToken::where([
+                'gateway_customer_reference' => $customer->id,
+                'token' => $method->id,
+                'client_id' => $client->id,
+                'company_id' => $client->company_id,
+            ])->exists();
 
+            /* Already exists return */
+            if ($token_exists) {
+                continue;
             }
 
+            $payment_meta = new \stdClass;
+            $payment_meta->brand = (string) \sprintf('%s (%s)', $method->bank_name, ctrans('texts.ach'));
+            $payment_meta->last4 = (string) $method->last4;
+            $payment_meta->type = GatewayType::BANK_TRANSFER;
+            $payment_meta->state = $method->status;
 
+            $data = [
+                'payment_meta' => $payment_meta,
+                'token' => $method->id,
+                'payment_method_id' => GatewayType::BANK_TRANSFER,
+            ];
+
+            $additional_data = ['gateway_customer_reference' => $customer->id];
+
+            if ($customer->default_source === $method->id) {
+                $additional_data = ['gateway_customer_reference' => $customer->id, 'is_default' => 1];
+            }
+
+            $this->stripe->storeGatewayToken($data, $additional_data);
+        }
     }
 
     private function addOrUpdateCard(PaymentMethod $method, $customer_reference, Client $client, $type_id)
     {
-        
         $token_exists = ClientGatewayToken::where([
             'gateway_customer_reference' => $customer_reference,
             'token' => $method->id,
@@ -127,12 +119,14 @@ class UpdatePaymentMethods
         ])->exists();
 
         /* Already exists return */
-        if($token_exists)
+        if ($token_exists) {
             return;
+        }
 
         /* Ignore Expired cards */
-        if($method->card->exp_year <= date('Y') && $method->card->exp_month < date('m'))
+        if ($method->card->exp_year <= date('Y') && $method->card->exp_month < date('m')) {
             return;
+        }
 
         $cgt = ClientGatewayTokenFactory::create($client->company_id);
         $cgt->client_id = $client->id;
@@ -142,12 +136,10 @@ class UpdatePaymentMethods
         $cgt->gateway_type_id = $type_id;
         $cgt->meta = $this->buildPaymentMethodMeta($method, $type_id);
         $cgt->save();
-
     }
 
     private function buildPaymentMethodMeta(PaymentMethod $method, $type_id)
     {
-
         switch ($type_id) {
             case GatewayType::CREDIT_CARD:
 
@@ -157,17 +149,17 @@ class UpdatePaymentMethods
                 $payment_meta->brand = (string) $method->card->brand;
                 $payment_meta->last4 = (string) $method->card->last4;
                 $payment_meta->type = GatewayType::CREDIT_CARD;
+
                 return $payment_meta;
 
                 break;
-            
+
             case GatewayType::ALIPAY:
             case GatewayType::SOFORT:
 
                 return new \stdClass;
 
             default:
-                
 
                 break;
         }
diff --git a/app/PaymentDrivers/Stripe/Utilities.php b/app/PaymentDrivers/Stripe/Utilities.php
index fa4b19a765e2..79d8e5274942 100644
--- a/app/PaymentDrivers/Stripe/Utilities.php
+++ b/app/PaymentDrivers/Stripe/Utilities.php
@@ -17,21 +17,19 @@ trait Utilities
     /*Helpers for currency conversions, NOTE* for some currencies we need to change behaviour */
     public function convertFromStripeAmount($amount, $precision, $currency)
     {
-
-       if(in_array($currency->code, ["BIF","CLP","DJF","GNF","JPY","KMF","KRW","MGA","PYG","RWF","UGX","VND","VUV","XAF","XOF","XPF"]))
+        if (in_array($currency->code, ['BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'UGX', 'VND', 'VUV', 'XAF', 'XOF', 'XPF'])) {
             return $amount;
+        }
 
         return $amount / pow(10, $precision);
-
     }
 
     public function convertToStripeAmount($amount, $precision, $currency)
     {
+        if (in_array($currency->code, ['BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'UGX', 'VND', 'VUV', 'XAF', 'XOF', 'XPF'])) {
+            return $amount;
+        }
 
-       if(in_array($currency->code, ["BIF","CLP","DJF","GNF","JPY","KMF","KRW","MGA","PYG","RWF","UGX","VND","VUV","XAF","XOF","XPF"]))
-            return $amount; 
-
-        return round(($amount * pow(10, $precision)),0);
-
+        return round(($amount * pow(10, $precision)), 0);
     }
 }
diff --git a/app/PaymentDrivers/Stripe/iDeal.php b/app/PaymentDrivers/Stripe/iDeal.php
index eecd2ce60aac..3abed0380f42 100644
--- a/app/PaymentDrivers/Stripe/iDeal.php
+++ b/app/PaymentDrivers/Stripe/iDeal.php
@@ -38,7 +38,7 @@ class iDeal
     public function paymentView(array $data)
     {
         $this->stripe->init();
-        
+
         $data['gateway'] = $this->stripe;
         $data['return_url'] = $this->buildReturnUrl();
         $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
@@ -51,7 +51,7 @@ class iDeal
             'currency' => 'eur',
             'payment_method_types' => ['ideal'],
             'customer' => $this->stripe->findOrCreateCustomer(),
-            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
+            'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices').': '.collect($data['invoices'])->pluck('invoice_number')),
             'metadata' => [
                 'payment_hash' => $this->stripe->payment_hash->hash,
                 'gateway_type_id' => GatewayType::IDEAL,
@@ -97,7 +97,7 @@ class iDeal
         if (Payment::where('transaction_reference', $payment_intent)->exists()) {
             return redirect()->route('client.payments.index');
         }
-        
+
         $data = [
             'payment_method' => $payment_intent,
             'payment_type' => PaymentType::IDEAL,
diff --git a/app/PaymentDrivers/StripeConnectPaymentDriver.php b/app/PaymentDrivers/StripeConnectPaymentDriver.php
index 3a60f3204a58..f83cde579f0d 100644
--- a/app/PaymentDrivers/StripeConnectPaymentDriver.php
+++ b/app/PaymentDrivers/StripeConnectPaymentDriver.php
@@ -27,8 +27,8 @@ use App\PaymentDrivers\Stripe\ACH;
 use App\PaymentDrivers\Stripe\Alipay;
 use App\PaymentDrivers\Stripe\Charge;
 use App\PaymentDrivers\Stripe\CreditCard;
-use App\PaymentDrivers\Stripe\SOFORT;
 use App\PaymentDrivers\Stripe\SEPA;
+use App\PaymentDrivers\Stripe\SOFORT;
 use App\PaymentDrivers\Stripe\Utilities;
 use App\Utils\Traits\MakesHash;
 use Exception;
@@ -43,13 +43,10 @@ use Stripe\StripeClient;
 
 class StripeConnectPaymentDriver extends StripePaymentDriver
 {
-
     public function __construct(CompanyGateway $company_gateway, Client $client = null, $invitation = false)
     {
-
         parent::__construct($company_gateway, $client, $invitation);
 
         $this->stripe_connect = true;
     }
-
 }
diff --git a/app/PaymentDrivers/StripePaymentDriver.php b/app/PaymentDrivers/StripePaymentDriver.php
index ddcc5e274eb3..4c3303f98bce 100644
--- a/app/PaymentDrivers/StripePaymentDriver.php
+++ b/app/PaymentDrivers/StripePaymentDriver.php
@@ -28,8 +28,8 @@ use App\PaymentDrivers\Stripe\ACH;
 use App\PaymentDrivers\Stripe\ACSS;
 use App\PaymentDrivers\Stripe\Alipay;
 use App\PaymentDrivers\Stripe\ApplePay;
-use App\PaymentDrivers\Stripe\BECS;
 use App\PaymentDrivers\Stripe\Bancontact;
+use App\PaymentDrivers\Stripe\BECS;
 use App\PaymentDrivers\Stripe\BrowserPay;
 use App\PaymentDrivers\Stripe\Charge;
 use App\PaymentDrivers\Stripe\Connect\Verify;
@@ -37,6 +37,7 @@ use App\PaymentDrivers\Stripe\CreditCard;
 use App\PaymentDrivers\Stripe\EPS;
 use App\PaymentDrivers\Stripe\FPX;
 use App\PaymentDrivers\Stripe\GIROPAY;
+use App\PaymentDrivers\Stripe\iDeal;
 use App\PaymentDrivers\Stripe\ImportCustomers;
 use App\PaymentDrivers\Stripe\Jobs\PaymentIntentFailureWebhook;
 use App\PaymentDrivers\Stripe\Jobs\PaymentIntentWebhook;
@@ -45,7 +46,6 @@ use App\PaymentDrivers\Stripe\SEPA;
 use App\PaymentDrivers\Stripe\SOFORT;
 use App\PaymentDrivers\Stripe\UpdatePaymentMethods;
 use App\PaymentDrivers\Stripe\Utilities;
-use App\PaymentDrivers\Stripe\iDeal;
 use App\Utils\Traits\MakesHash;
 use Exception;
 use Google\Service\ServiceConsumerManagement\CustomError;
@@ -107,23 +107,20 @@ class StripePaymentDriver extends BaseDriver
      */
     public function init()
     {
-        if($this->stripe_connect)
-        {
+        if ($this->stripe_connect) {
             Stripe::setApiKey(config('ninja.ninja_stripe_key'));
 
-            if(strlen($this->company_gateway->getConfigField('account_id')) > 1)
-                $this->stripe_connect_auth = ["stripe_account" => $this->company_gateway->getConfigField('account_id')];
-            else
+            if (strlen($this->company_gateway->getConfigField('account_id')) > 1) {
+                $this->stripe_connect_auth = ['stripe_account' => $this->company_gateway->getConfigField('account_id')];
+            } else {
                 throw new StripeConnectFailure('Stripe Connect has not been configured');
-        }
-        else
-        {
+            }
+        } else {
             $this->stripe = new StripeClient(
                 $this->company_gateway->getConfigField('apiKey')
             );
 
             Stripe::setApiKey($this->company_gateway->getConfigField('apiKey'));
-
         }
 
         return $this;
@@ -171,21 +168,21 @@ class StripePaymentDriver extends BaseDriver
             && $this->client->currency()
             && ($this->client->currency()->code == 'EUR')
             && isset($this->client->country)
-            && in_array($this->client->country->iso_3166_3, ['AUT', 'BEL', 'CHE', 'CYP', 'CZE', 'BGR', 'DNK', 'DEU', 'ESP', 'FIN', 'FRA', 'HUN', 'IRL', 'ITA', 'LVA', 'LUX', 'LTA', 'MLT', 'NLD', 'NOR', 'POL', 'ROU', 'SVK', 'SVN', 'SWE', 'GBR', 'EST', 'GRC', 'PRT' ])) { // TODO: More has to be added https://stripe.com/docs/payments/sepa-debit
+            && in_array($this->client->country->iso_3166_3, ['AUT', 'BEL', 'CHE', 'CYP', 'CZE', 'BGR', 'DNK', 'DEU', 'ESP', 'FIN', 'FRA', 'HUN', 'IRL', 'ITA', 'LVA', 'LUX', 'LTA', 'MLT', 'NLD', 'NOR', 'POL', 'ROU', 'SVK', 'SVN', 'SWE', 'GBR', 'EST', 'GRC', 'PRT'])) { // TODO: More has to be added https://stripe.com/docs/payments/sepa-debit
             $types[] = GatewayType::SEPA;
         }
 
         if ($this->client
             && isset($this->client->country)
-            && in_array($this->client->country->iso_3166_3, ['POL'])){
+            && in_array($this->client->country->iso_3166_3, ['POL'])) {
             $types[] = GatewayType::PRZELEWY24;
         }
 
-        if($this->client
+        if ($this->client
             && $this->client->currency()
             && ($this->client->currency()->code == 'EUR')
             && isset($this->client->country)
-            && in_array($this->client->country->iso_3166_3, ["DEU"])){
+            && in_array($this->client->country->iso_3166_3, ['DEU'])) {
             $types[] = GatewayType::GIROPAY;
         }
 
@@ -193,43 +190,49 @@ class StripePaymentDriver extends BaseDriver
             && $this->client->currency()
             && ($this->client->currency()->code == 'EUR')
             && isset($this->client->country)
-            && in_array($this->client->country->iso_3166_3, ["NLD"]))
+            && in_array($this->client->country->iso_3166_3, ['NLD'])) {
             $types[] = GatewayType::IDEAL;
+        }
 
         if ($this->client
             && $this->client->currency()
             && ($this->client->currency()->code == 'EUR')
             && isset($this->client->country)
-            && in_array($this->client->country->iso_3166_3, ["AUT"]))
+            && in_array($this->client->country->iso_3166_3, ['AUT'])) {
             $types[] = GatewayType::EPS;
+        }
 
         if ($this->client
             && $this->client->currency()
             && ($this->client->currency()->code == 'MYR')
             && isset($this->client->country)
-            && in_array($this->client->country->iso_3166_3, ["MYS"]))
+            && in_array($this->client->country->iso_3166_3, ['MYS'])) {
             $types[] = GatewayType::FPX;
+        }
 
         if ($this->client
             && $this->client->currency()
             && ($this->client->currency()->code == 'EUR')
             && isset($this->client->country)
-            && in_array($this->client->country->iso_3166_3, ["BEL"]))
+            && in_array($this->client->country->iso_3166_3, ['BEL'])) {
             $types[] = GatewayType::BANCONTACT;
+        }
 
         if ($this->client
             && $this->client->currency()
             && ($this->client->currency()->code == 'AUD')
             && isset($this->client->country)
-            && in_array($this->client->country->iso_3166_3, ['AUS']))
+            && in_array($this->client->country->iso_3166_3, ['AUS'])) {
             $types[] = GatewayType::BECS;
+        }
 
         if ($this->client
             && $this->client->currency()
             && in_array($this->client->currency()->code, ['CAD', 'USD'])
             && isset($this->client->country)
-            && in_array($this->client->country->iso_3166_3, ["CAN", "USA"]))
+            && in_array($this->client->country->iso_3166_3, ['CAN', 'USA'])) {
             $types[] = GatewayType::ACSS;
+        }
 
         if (
             $this->client
@@ -314,7 +317,7 @@ class StripePaymentDriver extends BaseDriver
             $fields[] = ['name' => 'client_country_id', 'label' => ctrans('texts.country'), 'type' => 'text', 'validation' => 'required'];
         }
 
-        if($this->company_gateway->require_postal_code) {
+        if ($this->company_gateway->require_postal_code) {
             $fields[] = ['name' => 'client_postal_code', 'label' => ctrans('texts.postal_code'), 'type' => 'text', 'validation' => 'required'];
         }
 
@@ -327,7 +330,6 @@ class StripePaymentDriver extends BaseDriver
             $fields[] = ['name' => 'client_shipping_country_id', 'label' => ctrans('texts.shipping_country'), 'type' => 'text', 'validation' => 'required'];
         }
 
-
         return $fields;
     }
 
@@ -411,12 +413,13 @@ class StripePaymentDriver extends BaseDriver
         return $this->company_gateway->getPublishableKey();
     }
 
-    public function getCustomer($customer_id) :?Customer 
+    public function getCustomer($customer_id) :?Customer
     {
         $customer = Customer::retrieve($customer_id, $this->stripe_connect_auth);
 
-        if($customer)
+        if ($customer) {
             return $customer;
+        }
 
         return false;
     }
@@ -440,30 +443,29 @@ class StripePaymentDriver extends BaseDriver
 
         //Search by customer reference
         if ($client_gateway_token && $client_gateway_token->gateway_customer_reference) {
-
             $customer = Customer::retrieve($client_gateway_token->gateway_customer_reference, $this->stripe_connect_auth);
 
-            if($customer)
+            if ($customer) {
                 return $customer;
-
+            }
         }
 
         //Search by email
         $searchResults = \Stripe\Customer::all([
-                    "email" => $this->client->present()->email(),
-                    "limit" => 2,
-                    "starting_after" => null
-        ],$this->stripe_connect_auth);
+            'email' => $this->client->present()->email(),
+            'limit' => 2,
+            'starting_after' => null,
+        ], $this->stripe_connect_auth);
 
-        if(count($searchResults) == 1){
+        if (count($searchResults) == 1) {
             $customer = $searchResults->data[0];
-           // $this->updateStripeCustomer($customer);
-            return $customer; 
+            // $this->updateStripeCustomer($customer);
+            return $customer;
         }
 
         //Else create a new record
         $data['name'] = $this->client->present()->name();
-        $data['phone'] = substr($this->client->present()->phone(), 0 , 20);
+        $data['phone'] = substr($this->client->present()->phone(), 0, 20);
 
         if (filter_var($this->client->present()->email(), FILTER_VALIDATE_EMAIL)) {
             $data['email'] = $this->client->present()->email();
@@ -474,11 +476,11 @@ class StripePaymentDriver extends BaseDriver
         $data['address']['city'] = $this->client->city;
         $data['address']['postal_code'] = $this->client->postal_code;
         $data['address']['state'] = $this->client->state;
-        $data['address']['country'] = $this->client->country ? $this->client->country->iso_3166_2 : "";
+        $data['address']['country'] = $this->client->country ? $this->client->country->iso_3166_2 : '';
 
         $customer = Customer::create($data, $this->stripe_connect_auth);
 
-        if (!$customer) {
+        if (! $customer) {
             throw new Exception('Unable to create gateway customer');
         }
 
@@ -489,7 +491,7 @@ class StripePaymentDriver extends BaseDriver
     {
         //Else create a new record
         $data['name'] = $this->client->present()->name();
-        $data['phone'] = substr($this->client->present()->phone(), 0 , 20);
+        $data['phone'] = substr($this->client->present()->phone(), 0, 20);
 
         if (filter_var($this->client->present()->email(), FILTER_VALIDATE_EMAIL)) {
             $data['email'] = $this->client->present()->email();
@@ -500,15 +502,13 @@ class StripePaymentDriver extends BaseDriver
         $data['address']['city'] = $this->client->city;
         $data['address']['postal_code'] = $this->client->postal_code;
         $data['address']['state'] = $this->client->state;
-        $data['address']['country'] = $this->client->country ? $this->client->country->iso_3166_2 : "";
+        $data['address']['country'] = $this->client->country ? $this->client->country->iso_3166_2 : '';
 
-        try{
+        try {
             \Stripe\Customer::update($customer->id, $data, $this->stripe_connect_auth);
+        } catch (Exception $e) {
+            nlog('unable to update clients in Stripe');
         }
-        catch(Exception $e){
-            nlog("unable to update clients in Stripe");
-        }
-
     }
 
     public function refund(Payment $payment, $amount, $return_client_response = false)
@@ -521,14 +521,13 @@ class StripePaymentDriver extends BaseDriver
         $response = null;
 
         try {
-            
             $response = \Stripe\Refund::create([
                 'charge' => $payment->transaction_reference,
-                'amount' => $this->convertToStripeAmount($amount, $this->client->currency()->precision, $this->client->currency())
+                'amount' => $this->convertToStripeAmount($amount, $this->client->currency()->precision, $this->client->currency()),
             ], $meta);
 
             if ($response->status == $response::STATUS_SUCCEEDED) {
-                SystemLogger::dispatch(['server_response' => $response, 'data' => request()->all(),], SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_SUCCESS, SystemLog::TYPE_STRIPE, $this->client, $this->client->company);
+                SystemLogger::dispatch(['server_response' => $response, 'data' => request()->all()], SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_SUCCESS, SystemLog::TYPE_STRIPE, $this->client, $this->client->company);
 
                 return [
                     'transaction_reference' => $response->charge,
@@ -539,7 +538,7 @@ class StripePaymentDriver extends BaseDriver
                 ];
             }
 
-            SystemLogger::dispatch(['server_response' => $response, 'data' => request()->all(),], SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_STRIPE, $this->client, $this->client->company);
+            SystemLogger::dispatch(['server_response' => $response, 'data' => request()->all()], SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_STRIPE, $this->client, $this->client->company);
 
             return [
                 'transaction_reference' => null,
@@ -549,7 +548,7 @@ class StripePaymentDriver extends BaseDriver
                 'code' => 422,
             ];
         } catch (Exception $e) {
-            SystemLogger::dispatch(['server_response' => $response, 'data' => request()->all(),], SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_STRIPE, $this->client, $this->client->company);
+            SystemLogger::dispatch(['server_response' => $response, 'data' => request()->all()], SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_STRIPE, $this->client, $this->client->company);
 
             nlog($e->getMessage());
 
@@ -579,34 +578,30 @@ class StripePaymentDriver extends BaseDriver
         sleep(2);
 
         //payment_intent.succeeded - this will confirm or cancel the payment
-        if($request->type === 'payment_intent.succeeded'){
-            PaymentIntentWebhook::dispatch($request->data, $request->company_key, $this->company_gateway->id)->delay(now()->addSeconds(rand(2,10)));
+        if ($request->type === 'payment_intent.succeeded') {
+            PaymentIntentWebhook::dispatch($request->data, $request->company_key, $this->company_gateway->id)->delay(now()->addSeconds(rand(2, 10)));
+
             return response()->json([], 200);
         }
 
-        if(in_array($request->type, ['payment_intent.payment_failed','charge.failed'])){
-            PaymentIntentFailureWebhook::dispatch($request->data, $request->company_key, $this->company_gateway->id)->delay(now()->addSeconds(rand(2,10)));
+        if (in_array($request->type, ['payment_intent.payment_failed', 'charge.failed'])) {
+            PaymentIntentFailureWebhook::dispatch($request->data, $request->company_key, $this->company_gateway->id)->delay(now()->addSeconds(rand(2, 10)));
+
             return response()->json([], 200);
         }
 
-
         if ($request->type === 'charge.succeeded') {
-
             foreach ($request->data as $transaction) {
-
-                if(array_key_exists('payment_intent', $transaction) && $transaction['payment_intent'])
-                {
+                if (array_key_exists('payment_intent', $transaction) && $transaction['payment_intent']) {
                     $payment = Payment::query()
                         // ->where('company_id', $request->getCompany()->id)
                         ->where(function ($query) use ($transaction) {
                             $query->where('transaction_reference', $transaction['payment_intent'])
                                   ->orWhere('transaction_reference', $transaction['id']);
-                                })
+                        })
                         ->first();
-                }
-                else
-                {
-                     $payment = Payment::query()
+                } else {
+                    $payment = Payment::query()
                         // ->where('company_id', $request->getCompany()->id)
                         ->where('transaction_reference', $transaction['id'])
                         ->first();
@@ -617,15 +612,13 @@ class StripePaymentDriver extends BaseDriver
                     $payment->save();
                 }
             }
-
         } elseif ($request->type === 'source.chargeable') {
-            
             $this->init();
 
             foreach ($request->data as $transaction) {
-
-                if(!$request->data['object']['amount'] || empty($request->data['object']['amount']))
+                if (! $request->data['object']['amount'] || empty($request->data['object']['amount'])) {
                     continue;
+                }
 
                 $charge = \Stripe\Charge::create([
                     'amount' => $request->data['object']['amount'],
@@ -640,7 +633,7 @@ class StripePaymentDriver extends BaseDriver
                         ->where(function ($query) use ($transaction) {
                             $query->where('transaction_reference', $transaction['payment_intent'])
                                   ->orWhere('transaction_reference', $transaction['id']);
-                                })
+                        })
                         ->first();
 
                     if ($payment) {
@@ -672,12 +665,9 @@ class StripePaymentDriver extends BaseDriver
         $this->init();
 
         try {
-
             $stripe_payment_method = $this->getStripePaymentMethod($payment_method);
             $stripe_payment_method->attach(['customer' => $customer->id], $this->stripe_connect_auth);
-
         } catch (ApiErrorException | Exception $e) {
-
             nlog($e->getMessage());
 
             SystemLogger::dispatch([
@@ -688,7 +678,6 @@ class StripePaymentDriver extends BaseDriver
             SystemLog::EVENT_GATEWAY_FAILURE,
             SystemLog::TYPE_STRIPE,
             $this->client, $this->client->company);
-
         }
     }
 
@@ -701,16 +690,12 @@ class StripePaymentDriver extends BaseDriver
      */
     public function detach(ClientGatewayToken $token)
     {
-
         $this->init();
 
-        try{
-
+        try {
             $pm = $this->getStripePaymentMethod($token->token);
             $pm->detach([], $this->stripe_connect_auth);
-
         } catch (ApiErrorException | Exception $e) {
-
             nlog($e->getMessage());
 
             SystemLogger::dispatch([
@@ -721,7 +706,6 @@ class StripePaymentDriver extends BaseDriver
             SystemLog::EVENT_GATEWAY_FAILURE,
             SystemLog::TYPE_STRIPE,
             $this->client, $this->client->company);
-
         }
     }
 
@@ -740,9 +724,7 @@ class StripePaymentDriver extends BaseDriver
     public function getStripePaymentMethod(string $source)
     {
         try {
-
             return PaymentMethod::retrieve($source, $this->stripe_connect_auth);
-
         } catch (ApiErrorException | Exception $e) {
             throw new PaymentFailed($e->getMessage(), $e->getCode());
         }
@@ -763,7 +745,6 @@ class StripePaymentDriver extends BaseDriver
     /**
      * Pull all client payment methods and update
      * the respective tokens in the system.
-     *
      */
     public function updateAllPaymentMethods()
     {
@@ -780,10 +761,8 @@ class StripePaymentDriver extends BaseDriver
      */
     public function importCustomers()
     {
-
         return (new ImportCustomers($this))->run();
         //match clients based on the gateway_customer_reference column
-
     }
 
     public function importMatchedClients()
@@ -803,39 +782,36 @@ class StripePaymentDriver extends BaseDriver
 
     public function setApplePayDomain($domain)
     {
-
         $this->init();
 
         \Stripe\ApplePayDomain::create([
-          'domain_name' => $domain,
-        ],$this->stripe_connect_auth);
-
+            'domain_name' => $domain,
+        ], $this->stripe_connect_auth);
     }
 
     public function disconnect()
     {
-        if(!$this->stripe_connect)
+        if (! $this->stripe_connect) {
             return true;
+        }
 
-        if(!strlen($this->company_gateway->getConfigField('account_id')) > 1 )
+        if (! strlen($this->company_gateway->getConfigField('account_id')) > 1) {
             throw new StripeConnectFailure('Stripe Connect has not been configured');
+        }
 
         Stripe::setApiKey(config('ninja.ninja_stripe_key'));
 
         try {
-
             \Stripe\OAuth::deauthorize([
-              'client_id' => config('ninja.ninja_stripe_client_id'),
-              'stripe_user_id' => $this->company_gateway->getConfigField('account_id'),
+                'client_id' => config('ninja.ninja_stripe_client_id'),
+                'stripe_user_id' => $this->company_gateway->getConfigField('account_id'),
             ]);
 
             $config = $this->company_gateway->getConfig();
-            $config->account_id = "";
+            $config->account_id = '';
             $this->company_gateway->setConfig($config);
             $this->company_gateway->save();
-
-        }
-        catch(\Exception $e){
+        } catch (\Exception $e) {
             throw new StripeConnectFailure('Unable to disconnect Stripe Connect');
         }
 
@@ -848,7 +824,10 @@ class StripePaymentDriver extends BaseDriver
         // return iconv("UTF-8", "ISO-8859-1//TRANSLIT", $this->decode_encoded_utf8($string));
     }
 
-    public function decode_encoded_utf8($string){
-        return preg_replace_callback('#\\\\u([0-9a-f]{4})#ism', function($matches) { return mb_convert_encoding(pack("H*", $matches[1]), "UTF-8", "UCS-2BE"); }, $string);
+    public function decode_encoded_utf8($string)
+    {
+        return preg_replace_callback('#\\\\u([0-9a-f]{4})#ism', function ($matches) {
+            return mb_convert_encoding(pack('H*', $matches[1]), 'UTF-8', 'UCS-2BE');
+        }, $string);
     }
 }
diff --git a/app/PaymentDrivers/WePay/ACH.php b/app/PaymentDrivers/WePay/ACH.php
index 9dfe578fb25c..5773978b1864 100644
--- a/app/PaymentDrivers/WePay/ACH.php
+++ b/app/PaymentDrivers/WePay/ACH.php
@@ -19,8 +19,8 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\SystemLog;
 use App\Notifications\Ninja\WePayFailureNotification;
-use App\PaymentDrivers\WePayPaymentDriver;
 use App\PaymentDrivers\WePay\WePayCommon;
+use App\PaymentDrivers\WePayPaymentDriver;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Http\Request;
 use Illuminate\Notifications\Messages\SlackMessage;
@@ -45,13 +45,12 @@ class ACH
         return render('gateways.wepay.authorize.bank_transfer', $data);
     }
 
-
     public function authorizeResponse($request)
     {
         //https://developer.wepay.com/api/api-calls/credit_card#authorize
         $data = $request->all();
         // authorize the credit card
-        
+
         //nlog($data);
         /*
           '_token' => '1Fk5CRj34up5ntKPvrFyMIAJhDdUNF3boqT3iIN3',
@@ -64,15 +63,13 @@ class ACH
           'method' => '1',
          */
 
-        try{
+        try {
             $response = $this->wepay_payment_driver->wepay->request('payment_bank/persist', [
                 'client_id'          => config('ninja.wepay.client_id'),
                 'client_secret'      => config('ninja.wepay.client_secret'),
-                'payment_bank_id'     => (int)$data['bank_account_id'],
+                'payment_bank_id'     => (int) $data['bank_account_id'],
             ]);
-        }
-        catch(\Exception $e){
-
+        } catch (\Exception $e) {
             $this->wepay_payment_driver->sendFailureMail($e->getMessage());
 
             $message = [
@@ -88,24 +85,22 @@ class ACH
                 $this->wepay_payment_driver->client->company,
             );
 
-        if(config('ninja.notification.slack'))
-            $this->wepay_payment_driver->company_gateway->company->notification(new WePayFailureNotification($this->wepay_payment_driver->company_gateway->company))->ninja();
+            if (config('ninja.notification.slack')) {
+                $this->wepay_payment_driver->company_gateway->company->notification(new WePayFailureNotification($this->wepay_payment_driver->company_gateway->company))->ninja();
+            }
 
             throw new PaymentFailed($e->getMessage(), 400);
         }
         // display the response
         // nlog($response);
-        
-        if(in_array($response->state, ['new', 'pending', 'authorized'])){
 
+        if (in_array($response->state, ['new', 'pending', 'authorized'])) {
             $this->storePaymentMethod($response, GatewayType::BANK_TRANSFER);
 
             return redirect()->route('client.payment_methods.index');
-
         }
-    
-        throw new PaymentFailed("There was a problem adding this payment method.", 400);
-        
+
+        throw new PaymentFailed('There was a problem adding this payment method.', 400);
         /*
             {
                 "payment_bank_id": 12345,
@@ -115,12 +110,10 @@ class ACH
             }
 
             state options: new, pending, authorized, disabled.
-        */    
-    
-    }  
+        */
+    }
 
-
-/* If the bank transfer token is PENDING - we need to verify!! */
+    /* If the bank transfer token is PENDING - we need to verify!! */
 //
 
     public function verificationView(ClientGatewayToken $token)
@@ -153,11 +146,11 @@ class ACH
 
         $transformed_transactions = [];
 
-        foreach($transactions as $transaction)
-            $transformed_transactions[] = (int)$transaction;
+        foreach ($transactions as $transaction) {
+            $transformed_transactions[] = (int) $transaction;
+        }
 
         try {
-        
             $response = $this->wepay_payment_driver->wepay->request('payment_bank/verify', [
                 'client_id'          => config('ninja.wepay.client_id'),
                 'client_secret'      => config('ninja.wepay.client_secret'),
@@ -165,16 +158,12 @@ class ACH
                 'type'               => 'microdeposits',
                 'microdeposits'      => $transformed_transactions,
             ]);
-        
-        }
-        catch(\Exception $e){
-
-            nlog("we pay exception");
+        } catch (\Exception $e) {
+            nlog('we pay exception');
             nlog($e->getMessage());
-            
+
             return redirect()->route('client.payment_methods.verification', ['payment_method' => $token->hashed_id, 'method' => GatewayType::BANK_TRANSFER])
                       ->with('error', $e->getMessage());
-        
         }
         /*
         {
@@ -184,30 +173,25 @@ class ACH
             "state": "authorized"
         }
         */
-       nlog($response);
+        nlog($response);
 
-       //$meta = $token->meta;
-        if($response->state == "authorized")
-        {
+        //$meta = $token->meta;
+        if ($response->state == 'authorized') {
             $meta = $token->meta;
             $meta->state = $response->state;
             $token->meta = $meta;
             $token->save();
 
             return redirect()->route('client.payment_methods.index');
-
-        }
-        else{
-         
-          return redirect()->route('client.payment_methods.verification', ['payment_method' => $token->hashed_id, 'method' => GatewayType::BANK_TRANSFER])
-                      ->with('error', ctrans('texts.verification_failed'));   
+        } else {
+            return redirect()->route('client.payment_methods.verification', ['payment_method' => $token->hashed_id, 'method' => GatewayType::BANK_TRANSFER])
+                      ->with('error', ctrans('texts.verification_failed'));
         }
     }
 
-///////////////////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////////////////////////
     public function paymentView(array $data)
     {
-
         $data['gateway'] = $this->wepay_payment_driver;
         $data['currency'] = $this->wepay_payment_driver->client->getCurrencyCode();
         $data['payment_method_id'] = GatewayType::BANK_TRANSFER;
@@ -216,37 +200,32 @@ class ACH
         return render('gateways.wepay.bank_transfer', $data);
     }
 
-
     public function paymentResponse($request)
     {
-        
         $token = ClientGatewayToken::find($this->decodePrimaryKey($request->input('source')));
         $token_meta = $token->meta;
 
-        if(!property_exists($token_meta, 'state') || $token_meta->state != "authorized"){
-
-                $response = $this->wepay_payment_driver->wepay->request('/payment_bank', [
-                                'client_id'          => config('ninja.wepay.client_id'),
-                                'client_secret'      => config('ninja.wepay.client_secret'),
-                                'payment_bank_id'    => $token->token,
-                            ]);
-                
-                if($response->state == 'authorized')
-                {     
-                    $meta = $token->meta;
-                    $meta->state = $response->state;
-                    $token->meta = $meta;
-                    $token->save();
-                }
-                else
-                    return redirect()->route('client.payment_methods.verification', ['payment_method' => $token->hashed_id, 'method' => GatewayType::BANK_TRANSFER]);
+        if (! property_exists($token_meta, 'state') || $token_meta->state != 'authorized') {
+            $response = $this->wepay_payment_driver->wepay->request('/payment_bank', [
+                'client_id'          => config('ninja.wepay.client_id'),
+                'client_secret'      => config('ninja.wepay.client_secret'),
+                'payment_bank_id'    => $token->token,
+            ]);
 
+            if ($response->state == 'authorized') {
+                $meta = $token->meta;
+                $meta->state = $response->state;
+                $token->meta = $meta;
+                $token->save();
+            } else {
+                return redirect()->route('client.payment_methods.verification', ['payment_method' => $token->hashed_id, 'method' => GatewayType::BANK_TRANSFER]);
+            }
         }
 
         $app_fee = (config('ninja.wepay.fee_ach_multiplier') * $this->wepay_payment_driver->payment_hash->data->amount_with_fee) + config('ninja.wepay.fee_fixed');
 
-        try{
-            $response = $this->wepay_payment_driver->wepay->request('checkout/create', array(
+        try {
+            $response = $this->wepay_payment_driver->wepay->request('checkout/create', [
                 // 'callback_uri'        => route('payment_webhook', ['company_key' => $this->wepay_payment_driver->company_gateway->company->company_key, 'company_gateway_id' => $this->wepay_payment_driver->company_gateway->hashed_id]),
                 'unique_id'           => Str::random(40),
                 'account_id'          => $this->wepay_payment_driver->company_gateway->getConfigField('accountId'),
@@ -258,50 +237,47 @@ class ACH
                     'fee_payer' => config('ninja.wepay.fee_payer'),
                     'app_fee' => $app_fee,
                 ],
-                'payment_method'      => array(
+                'payment_method'      => [
                     'type'            => 'payment_bank',
-                    'payment_bank'     => array(
-                        'id'          => $token->token
-                    )
-                )
-            ));
-        }
-        catch(\Exception $e){
+                    'payment_bank'     => [
+                        'id'          => $token->token,
+                    ],
+                ],
+            ]);
+        } catch (\Exception $e) {
             throw new PaymentFailed($e->getMessage(), 500);
         }
-        
-                /* Merge all data and store in the payment hash*/
+
+        /* Merge all data and store in the payment hash*/
         $state = [
             'server_response' => $response,
             'payment_hash' => $request->payment_hash,
         ];
 
         $state = array_merge($state, $request->all());
-        $this->wepay_payment_driver->payment_hash->data = array_merge((array) $this->wepay_payment_driver->payment_hash->data, $state); 
+        $this->wepay_payment_driver->payment_hash->data = array_merge((array) $this->wepay_payment_driver->payment_hash->data, $state);
         $this->wepay_payment_driver->payment_hash->save();
 
-        if(in_array($response->state, ['authorized', 'captured'])){
+        if (in_array($response->state, ['authorized', 'captured'])) {
             //success
-            nlog("success");
+            nlog('success');
             $payment_status = $response->state == 'authorized' ? Payment::STATUS_COMPLETED : Payment::STATUS_PENDING;
 
             return $this->processSuccessfulPayment($response, $payment_status, GatewayType::BANK_TRANSFER);
         }
 
-        if(in_array($response->state, ['released', 'cancelled', 'failed', 'expired'])){
+        if (in_array($response->state, ['released', 'cancelled', 'failed', 'expired'])) {
             //some type of failure
-            nlog("failure");
+            nlog('failure');
 
             $payment_status = $response->state == 'cancelled' ? Payment::STATUS_CANCELLED : Payment::STATUS_FAILED;
 
             $this->processUnSuccessfulPayment($response, $payment_status);
         }
-
     }
 
     private function storePaymentMethod($response, $payment_method_id)
     {
-
         $payment_meta = new \stdClass;
         $payment_meta->exp_month = (string) '';
         $payment_meta->exp_year = (string) '';
@@ -317,23 +293,21 @@ class ACH
         ];
 
         $this->wepay_payment_driver->storeGatewayToken($data);
-
-    }     
-
+    }
 
     public function tokenBilling($token, $payment_hash)
     {
-        
         $token_meta = $token->meta;
 
-        if(!property_exists($token_meta, 'state') || $token_meta->state != "authorized")
+        if (! property_exists($token_meta, 'state') || $token_meta->state != 'authorized') {
             return redirect()->route('client.payment_methods.verification', ['payment_method' => $token->hashed_id, 'method' => GatewayType::BANK_TRANSFER]);
+        }
 
         $amount = array_sum(array_column($this->wepay_payment_driver->payment_hash->invoices(), 'amount')) + $this->wepay_payment_driver->payment_hash->fee_total;
 
         $app_fee = (config('ninja.wepay.fee_cc_multiplier') * $amount) + config('ninja.wepay.fee_fixed');
 
-        $response = $this->wepay_payment_driver->wepay->request('checkout/create', array(
+        $response = $this->wepay_payment_driver->wepay->request('checkout/create', [
             'unique_id'           => Str::random(40),
             'account_id'          => $this->wepay_payment_driver->company_gateway->getConfigField('accountId'),
             'amount'              => $amount,
@@ -344,43 +318,38 @@ class ACH
                 'fee_payer' => config('ninja.wepay.fee_payer'),
                 'app_fee' => $app_fee,
             ],
-            'payment_method'      => array(
+            'payment_method'      => [
                 'type'            => 'payment_bank',
-                'payment_bank'     => array(
-                    'id'          => $token->token
-                )
-            )
-        ));
+                'payment_bank'     => [
+                    'id'          => $token->token,
+                ],
+            ],
+        ]);
 
-                /* Merge all data and store in the payment hash*/
+        /* Merge all data and store in the payment hash*/
         $state = [
             'server_response' => $response,
             'payment_hash' => $this->wepay_payment_driver->payment_hash,
         ];
 
-        $this->wepay_payment_driver->payment_hash->data = array_merge((array) $this->wepay_payment_driver->payment_hash->data, $state); 
+        $this->wepay_payment_driver->payment_hash->data = array_merge((array) $this->wepay_payment_driver->payment_hash->data, $state);
         $this->wepay_payment_driver->payment_hash->save();
 
-        if(in_array($response->state, ['authorized', 'captured'])){
+        if (in_array($response->state, ['authorized', 'captured'])) {
             //success
-            nlog("success");
+            nlog('success');
             $payment_status = $response->state == 'authorized' ? Payment::STATUS_COMPLETED : Payment::STATUS_PENDING;
 
             return $this->processSuccessfulPayment($response, $payment_status, GatewayType::BANK_TRANSFER, true);
         }
 
-        if(in_array($response->state, ['released', 'cancelled', 'failed', 'expired'])){
+        if (in_array($response->state, ['released', 'cancelled', 'failed', 'expired'])) {
             //some type of failure
-            nlog("failure");
+            nlog('failure');
 
             $payment_status = $response->state == 'cancelled' ? Payment::STATUS_CANCELLED : Payment::STATUS_FAILED;
 
             $this->processUnSuccessfulPayment($response, $payment_status);
         }
-
     }
-
-
-
-
 }
diff --git a/app/PaymentDrivers/WePay/CreditCard.php b/app/PaymentDrivers/WePay/CreditCard.php
index 2d939e3486d0..18f3632bb26d 100644
--- a/app/PaymentDrivers/WePay/CreditCard.php
+++ b/app/PaymentDrivers/WePay/CreditCard.php
@@ -19,13 +19,13 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\WePayPaymentDriver;
 use App\PaymentDrivers\WePay\WePayCommon;
+use App\PaymentDrivers\WePayPaymentDriver;
 use Illuminate\Support\Str;
 
 class CreditCard
 {
-use WePayCommon;
+    use WePayCommon;
 
     public $wepay_payment_driver;
 
@@ -37,16 +37,16 @@ use WePayCommon;
     public function authorizeView($data)
     {
         $data['gateway'] = $this->wepay_payment_driver;
-        
+
         return render('gateways.wepay.authorize.authorize', $data);
     }
 
- 	public function authorizeResponse($request)
- 	{
- 		//https://developer.wepay.com/api/api-calls/credit_card#authorize
+    public function authorizeResponse($request)
+    {
+        //https://developer.wepay.com/api/api-calls/credit_card#authorize
         $data = $request->all();
-		// authorize the credit card
-        
+        // authorize the credit card
+
         // nlog($data);
         /*
           '_token' => '1Fk5CRj34up5ntKPvrFyMIAJhDdUNF3boqT3iIN3',
@@ -60,29 +60,24 @@ use WePayCommon;
          */
 
         try {
-            
-    		$response = $this->wepay_payment_driver->wepay->request('credit_card/authorize', array(
-    		    'client_id'          => config('ninja.wepay.client_id'),
-    		    'client_secret'      => config('ninja.wepay.client_secret'),
-    		    'credit_card_id'     => (int)$data['credit_card_id'],
-    		));
-
-        }
-        catch(\Exception $e){
+            $response = $this->wepay_payment_driver->wepay->request('credit_card/authorize', [
+                'client_id'          => config('ninja.wepay.client_id'),
+                'client_secret'      => config('ninja.wepay.client_secret'),
+                'credit_card_id'     => (int) $data['credit_card_id'],
+            ]);
+        } catch (\Exception $e) {
             return $this->wepay_payment_driver->processInternallyFailedPayment($this->wepay_payment_driver, $e);
         }
-		// display the response
+        // display the response
         // nlog($response);
-        
-        if(in_array($response->state, ['new', 'authorized'])){
 
+        if (in_array($response->state, ['new', 'authorized'])) {
             $this->storePaymentMethod($response, GatewayType::CREDIT_CARD);
 
             return redirect()->route('client.payment_methods.index');
         }
-    
-        throw new PaymentFailed("There was a problem adding this payment method.", 400);
-        
+
+        throw new PaymentFailed('There was a problem adding this payment method.', 400);
         /*
             [credit_card_id] => 348084962473
             [credit_card_name] => Visa xxxxxx4018
@@ -95,56 +90,46 @@ use WePayCommon;
             [last_four] => 4018
             [input_source] => card_keyed
             [virtual_terminal_mode] => none
-            [card_on_file] => 
-            [recurring] => 
+            [card_on_file] =>
+            [recurring] =>
             [cvv_provided] => 1
-            [auto_update] => 
-        */    
-    
- 	}  
-
+            [auto_update] =>
+        */
+    }
 
     public function paymentView(array $data)
     {
         $data['gateway'] = $this->wepay_payment_driver;
-        $data['description'] = ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number');
+        $data['description'] = ctrans('texts.invoices').': '.collect($data['invoices'])->pluck('invoice_number');
 
         return render('gateways.wepay.credit_card.pay', $data);
     }
 
     public function paymentResponse(PaymentResponseRequest $request)
     {
-        nlog("payment response");
+        nlog('payment response');
 
         //it could be an existing token or a new credit_card_id that needs to be converted into a wepay token
-        if($request->has('credit_card_id') && $request->input('credit_card_id'))
-        {
-            nlog("authorize the card first!");
+        if ($request->has('credit_card_id') && $request->input('credit_card_id')) {
+            nlog('authorize the card first!');
 
             try {
-                $response = $this->wepay_payment_driver->wepay->request('credit_card/authorize', array(
+                $response = $this->wepay_payment_driver->wepay->request('credit_card/authorize', [
                     'client_id'          => config('ninja.wepay.client_id'),
                     'client_secret'      => config('ninja.wepay.client_secret'),
-                    'credit_card_id'     => (int)$request->input('credit_card_id'),
-                ));
-            }
-            catch(\Exception $e){
+                    'credit_card_id'     => (int) $request->input('credit_card_id'),
+                ]);
+            } catch (\Exception $e) {
                 return $this->wepay_payment_driver->processInternallyFailedPayment($this->wepay_payment_driver, $e);
             }
 
-            $credit_card_id = (int)$response->credit_card_id;
-
-            if(in_array($response->state, ['new', 'authorized']) && boolval($request->input('store_card'))){
+            $credit_card_id = (int) $response->credit_card_id;
 
+            if (in_array($response->state, ['new', 'authorized']) && boolval($request->input('store_card'))) {
                 $this->storePaymentMethod($response, GatewayType::CREDIT_CARD);
-
             }
-
-        }
-        else {
-
-            $credit_card_id = (int)$request->input('token');
-
+        } else {
+            $credit_card_id = (int) $request->input('token');
         }
 
         // USD, CAD, and GBP.
@@ -154,7 +139,7 @@ use WePayCommon;
         // charge the credit card
 
         try {
-            $response = $this->wepay_payment_driver->wepay->request('checkout/create', array(
+            $response = $this->wepay_payment_driver->wepay->request('checkout/create', [
                 'unique_id'           => Str::random(40),
                 'account_id'          => $this->wepay_payment_driver->company_gateway->getConfigField('accountId'),
                 'amount'              => $this->wepay_payment_driver->payment_hash->data->amount_with_fee,
@@ -165,16 +150,14 @@ use WePayCommon;
                     'fee_payer' => config('ninja.wepay.fee_payer'),
                     'app_fee' => $app_fee,
                 ],
-                'payment_method'      => array(
+                'payment_method'      => [
                     'type'            => 'credit_card',
-                    'credit_card'     => array(
-                        'id'          => $credit_card_id
-                    )
-                )
-            ));
-        }
-        catch(\Exception $e){
-
+                    'credit_card'     => [
+                        'id'          => $credit_card_id,
+                    ],
+                ],
+            ]);
+        } catch (\Exception $e) {
             $this->wepay_payment_driver->sendFailureMail($e->getMessage());
 
             $message = [
@@ -192,7 +175,6 @@ use WePayCommon;
             );
 
             throw new PaymentFailed($e->getMessage(), 500);
-
         }
 
         /* Merge all data and store in the payment hash*/
@@ -202,100 +184,97 @@ use WePayCommon;
         ];
 
         $state = array_merge($state, $request->all());
-        $this->wepay_payment_driver->payment_hash->data = array_merge((array) $this->wepay_payment_driver->payment_hash->data, $state); 
+        $this->wepay_payment_driver->payment_hash->data = array_merge((array) $this->wepay_payment_driver->payment_hash->data, $state);
         $this->wepay_payment_driver->payment_hash->save();
 
-
-        if(in_array($response->state, ['authorized', 'captured'])){
+        if (in_array($response->state, ['authorized', 'captured'])) {
             //success
-            nlog("success");
+            nlog('success');
             $payment_status = $response->state == 'authorized' ? Payment::STATUS_COMPLETED : Payment::STATUS_PENDING;
 
             return $this->processSuccessfulPayment($response, $payment_status, GatewayType::CREDIT_CARD);
         }
 
-        if(in_array($response->state, ['released', 'cancelled', 'failed', 'expired'])){
+        if (in_array($response->state, ['released', 'cancelled', 'failed', 'expired'])) {
             //some type of failure
-            nlog("failure");
+            nlog('failure');
 
             $payment_status = $response->state == 'cancelled' ? Payment::STATUS_CANCELLED : Payment::STATUS_FAILED;
 
             $this->processUnSuccessfulPayment($response, $payment_status);
         }
-
     }
 
-/*
-new The checkout was created by the application. This state typically indicates that checkouts created in WePay's hosted checkout flow are waiting for the payer to submit their information. 
-authorized  The payer entered their payment info and confirmed the payment on WePay. WePay has successfully charged the card.
-captured    The payment has been reserved from the payer.
-released    The payment has been credited to the payee account. Note that the released state may be active although there are active partial refunds or partial chargebacks.
-cancelled   The payment has been cancelled by the payer, payee, or application.
-refunded    The payment was captured and then refunded by the payer, payee, or application. The payment has been debited from the payee account.
-charged back    The payment has been charged back by the payer and the payment has been debited from the payee account.
-failed  The payment has failed.
-expired Checkouts expire if they remain in the new state for more than 30 minutes (e.g., they have been abandoned).
- */
-
-/*
-https://developer.wepay.com/api/api-calls/checkout
-{
-    "checkout_id": 649945633,
-    "account_id": 1548718026,
-    "type": "donation",
-    "short_description": "test checkout",
-    "currency": "USD",
-    "amount": 20,
-    "state": "authorized",
-    "soft_descriptor": "WPY*Wolverine",
-    "auto_release": true,
-    "create_time": 1463589958,
-    "gross": 20.88,
-    "reference_id": null,
-    "callback_uri": null,
-    "long_description": null,
-    "delivery_type": null,
-    "initiated_by": "merchant",
-    "in_review": false,
-    "fee": {
-        "app_fee": 0,
-        "processing_fee": 0.88,
-        "fee_payer": "payer"
-    },
-    "chargeback": {
-        "amount_charged_back": 0,
-        "dispute_uri": null
-    },
-    "refund": {
-        "amount_refunded": 0,
-        "refund_reason": null
-    },
-    "payment_method": {
-        "type": "credit_card",
-        "credit_card": {
-            "id": 1684847614,
-            "data": {
-                "emv_receipt": null,
-                "signature_url": null
-            },
-            "auto_release": false
-        }
-    },
-    "hosted_checkout": null,
-    "payer": {
-        "email": "test@example.com",
-        "name": "Mr Smith",
-        "home_address": null
-    },
-    "npo_information": null,
-    "payment_error": null
-}
- */
+    /*
+    new The checkout was created by the application. This state typically indicates that checkouts created in WePay's hosted checkout flow are waiting for the payer to submit their information.
+    authorized  The payer entered their payment info and confirmed the payment on WePay. WePay has successfully charged the card.
+    captured    The payment has been reserved from the payer.
+    released    The payment has been credited to the payee account. Note that the released state may be active although there are active partial refunds or partial chargebacks.
+    cancelled   The payment has been cancelled by the payer, payee, or application.
+    refunded    The payment was captured and then refunded by the payer, payee, or application. The payment has been debited from the payee account.
+    charged back    The payment has been charged back by the payer and the payment has been debited from the payee account.
+    failed  The payment has failed.
+    expired Checkouts expire if they remain in the new state for more than 30 minutes (e.g., they have been abandoned).
+     */
 
+    /*
+    https://developer.wepay.com/api/api-calls/checkout
+    {
+        "checkout_id": 649945633,
+        "account_id": 1548718026,
+        "type": "donation",
+        "short_description": "test checkout",
+        "currency": "USD",
+        "amount": 20,
+        "state": "authorized",
+        "soft_descriptor": "WPY*Wolverine",
+        "auto_release": true,
+        "create_time": 1463589958,
+        "gross": 20.88,
+        "reference_id": null,
+        "callback_uri": null,
+        "long_description": null,
+        "delivery_type": null,
+        "initiated_by": "merchant",
+        "in_review": false,
+        "fee": {
+            "app_fee": 0,
+            "processing_fee": 0.88,
+            "fee_payer": "payer"
+        },
+        "chargeback": {
+            "amount_charged_back": 0,
+            "dispute_uri": null
+        },
+        "refund": {
+            "amount_refunded": 0,
+            "refund_reason": null
+        },
+        "payment_method": {
+            "type": "credit_card",
+            "credit_card": {
+                "id": 1684847614,
+                "data": {
+                    "emv_receipt": null,
+                    "signature_url": null
+                },
+                "auto_release": false
+            }
+        },
+        "hosted_checkout": null,
+        "payer": {
+            "email": "test@example.com",
+            "name": "Mr Smith",
+            "home_address": null
+        },
+        "npo_information": null,
+        "payment_error": null
+    }
+     */
 
     private function storePaymentMethod($response, $payment_method_id)
     {
-        nlog("storing card");
+        nlog('storing card');
 
         $payment_meta = new \stdClass;
         $payment_meta->exp_month = (string) $response->expiration_month;
@@ -311,19 +290,15 @@ https://developer.wepay.com/api/api-calls/checkout
         ];
 
         $this->wepay_payment_driver->storeGatewayToken($data);
-
-    } 
-
-
+    }
 
     public function tokenBilling($cgt, $payment_hash)
     {
-
         $amount = array_sum(array_column($this->wepay_payment_driver->payment_hash->invoices(), 'amount')) + $this->wepay_payment_driver->payment_hash->fee_total;
 
         $app_fee = (config('ninja.wepay.fee_cc_multiplier') * $amount) + config('ninja.wepay.fee_fixed');
         // charge the credit card
-        $response = $this->wepay_payment_driver->wepay->request('checkout/create', array(
+        $response = $this->wepay_payment_driver->wepay->request('checkout/create', [
             'unique_id'           => Str::random(40),
             'account_id'          => $this->wepay_payment_driver->company_gateway->getConfigField('accountId'),
             'amount'              => $amount,
@@ -334,13 +309,13 @@ https://developer.wepay.com/api/api-calls/checkout
                 'fee_payer' => config('ninja.wepay.fee_payer'),
                 'app_fee' => $app_fee,
             ],
-            'payment_method'      => array(
+            'payment_method'      => [
                 'type'            => 'credit_card',
-                'credit_card'     => array(
-                    'id'          => $cgt->token
-                )
-            )
-        ));
+                'credit_card'     => [
+                    'id'          => $cgt->token,
+                ],
+            ],
+        ]);
 
         /* Merge all data and store in the payment hash*/
         $state = [
@@ -348,27 +323,24 @@ https://developer.wepay.com/api/api-calls/checkout
             'payment_hash' => $payment_hash,
         ];
 
-        $this->wepay_payment_driver->payment_hash->data = array_merge((array) $this->wepay_payment_driver->payment_hash->data, $state); 
+        $this->wepay_payment_driver->payment_hash->data = array_merge((array) $this->wepay_payment_driver->payment_hash->data, $state);
         $this->wepay_payment_driver->payment_hash->save();
 
-
-        if(in_array($response->state, ['authorized', 'captured'])){
+        if (in_array($response->state, ['authorized', 'captured'])) {
             //success
-            nlog("success");
+            nlog('success');
             $payment_status = $response->state == 'authorized' ? Payment::STATUS_COMPLETED : Payment::STATUS_PENDING;
 
             return $this->processSuccessfulPayment($response, $payment_status, GatewayType::CREDIT_CARD, true);
         }
 
-        if(in_array($response->state, ['released', 'cancelled', 'failed', 'expired'])){
+        if (in_array($response->state, ['released', 'cancelled', 'failed', 'expired'])) {
             //some type of failure
-            nlog("failure");
+            nlog('failure');
 
             $payment_status = $response->state == 'cancelled' ? Payment::STATUS_CANCELLED : Payment::STATUS_FAILED;
 
             $this->processUnSuccessfulPayment($response, $payment_status);
         }
     }
-
 }
-
diff --git a/app/PaymentDrivers/WePay/Setup.php b/app/PaymentDrivers/WePay/Setup.php
index b9b8e51e92a9..ade6c25676f5 100644
--- a/app/PaymentDrivers/WePay/Setup.php
+++ b/app/PaymentDrivers/WePay/Setup.php
@@ -29,8 +29,7 @@ class Setup
         'user_id',
         'company',
          */
-        
+
         return render('gateways.wepay.signup.index', $data);
     }
- 
-}
\ No newline at end of file
+}
diff --git a/app/PaymentDrivers/WePay/WePayCommon.php b/app/PaymentDrivers/WePay/WePayCommon.php
index 39ff6362744a..3ad848dc48f8 100644
--- a/app/PaymentDrivers/WePay/WePayCommon.php
+++ b/app/PaymentDrivers/WePay/WePayCommon.php
@@ -19,14 +19,13 @@ use App\Models\SystemLog;
 
 trait WePayCommon
 {
-
     private function processSuccessfulPayment($response, $payment_status, $gateway_type, $return_payment = false)
     {
-
-        if($gateway_type == GatewayType::BANK_TRANSFER)
+        if ($gateway_type == GatewayType::BANK_TRANSFER) {
             $payment_type = PaymentType::ACH;
-        else
+        } else {
             $payment_type = PaymentType::CREDIT_CARD_OTHER;
+        }
 
         $data = [
             'payment_type' => $payment_type,
@@ -37,7 +36,7 @@ trait WePayCommon
 
         $payment = $this->wepay_payment_driver->createPayment($data, $payment_status);
 
-         SystemLogger::dispatch(
+        SystemLogger::dispatch(
             ['response' => $this->wepay_payment_driver->payment_hash->data->server_response, 'data' => $data],
             SystemLog::CATEGORY_GATEWAY_RESPONSE,
             SystemLog::EVENT_GATEWAY_SUCCESS,
@@ -46,8 +45,9 @@ trait WePayCommon
             $this->wepay_payment_driver->client->company,
         );
 
-         if($return_payment)
+        if ($return_payment) {
             return $payment;
+        }
 
         return redirect()->route('client.payments.show', ['payment' => $this->wepay_payment_driver->encodePrimaryKey($payment->id)]);
     }
@@ -72,5 +72,4 @@ trait WePayCommon
 
         throw new PaymentFailed('Failed to process the payment.', 500);
     }
-
 }
diff --git a/app/PaymentDrivers/WePayPaymentDriver.php b/app/PaymentDrivers/WePayPaymentDriver.php
index 1405cd284df9..a50779022e1a 100644
--- a/app/PaymentDrivers/WePayPaymentDriver.php
+++ b/app/PaymentDrivers/WePayPaymentDriver.php
@@ -29,19 +29,19 @@ class WePayPaymentDriver extends BaseDriver
     use MakesHash;
 
     /* Does this gateway support refunds? */
-    public $refundable = true; 
+    public $refundable = true;
 
     /* Does this gateway support token billing? */
-    public $token_billing = true; 
+    public $token_billing = true;
 
     /* Does this gateway support authorizations? */
-    public $can_authorise_credit_card = true; 
+    public $can_authorise_credit_card = true;
 
     /* Initialized gateway */
-    public $wepay; 
+    public $wepay;
 
     /* Initialized payment method */
-    public $payment_method; 
+    public $payment_method;
 
     /* Maps the Payment Gateway Type - to its implementation */
     public static $methods = [
@@ -49,32 +49,30 @@ class WePayPaymentDriver extends BaseDriver
         GatewayType::BANK_TRANSFER => ACH::class,
     ];
 
-    const SYSTEM_LOG_TYPE = SystemLog::TYPE_WEPAY; 
+    const SYSTEM_LOG_TYPE = SystemLog::TYPE_WEPAY;
 
     public function init()
     {
-        
         if (WePay::getEnvironment() == 'none') {
-            
-            if(config('ninja.wepay.environment') == 'staging')
+            if (config('ninja.wepay.environment') == 'staging') {
                 WePay::useStaging(config('ninja.wepay.client_id'), config('ninja.wepay.client_secret'));
-            else
+            } else {
                 WePay::useProduction(config('ninja.wepay.client_id'), config('ninja.wepay.client_secret'));
-
+            }
         }
 
-        if ($this->company_gateway) 
+        if ($this->company_gateway) {
             $this->wepay = new WePay($this->company_gateway->getConfigField('accessToken'));
-        else
+        } else {
             $this->wepay = new WePay(null);
-        
+        }
+
         return $this;
-        
     }
 
     /**
      * Return the gateway types that have been enabled
-     * 
+     *
      * @return array
      */
     public function gatewayTypes(): array
@@ -89,7 +87,7 @@ class WePayPaymentDriver extends BaseDriver
 
     /**
      * Setup the gateway
-     * 
+     *
      * @param  array $data user_id + company
      * @return view
      */
@@ -100,13 +98,14 @@ class WePayPaymentDriver extends BaseDriver
 
     /**
      * Set the payment method
-     * 
+     *
      * @param int $payment_method_id Alias of GatewayType
      */
     public function setPaymentMethod($payment_method_id)
     {
         $class = self::$methods[$payment_method_id];
         $this->payment_method = new $class($this);
+
         return $this;
     }
 
@@ -125,8 +124,8 @@ class WePayPaymentDriver extends BaseDriver
     public function authorizeResponse($request)
     {
         $this->init();
-        
-        return $this->payment_method->authorizeResponse($request);  
+
+        return $this->payment_method->authorizeResponse($request);
     }
 
     public function verificationView(ClientGatewayToken $cgt)
@@ -147,14 +146,14 @@ class WePayPaymentDriver extends BaseDriver
     {
         $this->init();
 
-        return $this->payment_method->paymentView($data);  
+        return $this->payment_method->paymentView($data);
     }
 
     public function processPaymentResponse($request)
     {
         $this->init();
 
-        return $this->payment_method->paymentResponse($request); 
+        return $this->payment_method->paymentResponse($request);
     }
 
     public function tokenBilling(ClientGatewayToken $cgt, PaymentHash $payment_hash)
@@ -163,7 +162,7 @@ class WePayPaymentDriver extends BaseDriver
         $this->setPaymentMethod($cgt->gateway_type_id);
         $this->setPaymentHash($payment_hash);
 
-        return $this->payment_method->tokenBilling($cgt, $payment_hash); 
+        return $this->payment_method->tokenBilling($cgt, $payment_hash);
     }
 
     public function processWebhookRequest(PaymentWebhookRequest $request, Payment $payment = null)
@@ -191,14 +190,15 @@ class WePayPaymentDriver extends BaseDriver
         if ($objectType == 'credit_card') {
             $payment_method = ClientGatewayToken::where('token', $objectId)->first();
 
-            if (! $payment_method) 
+            if (! $payment_method) {
                 throw new \Exception('Unknown payment method');
+            }
 
-            $source = $this->wepay->request('credit_card', array(
+            $source = $this->wepay->request('credit_card', [
                 'client_id'          => config('ninja.wepay.client_id'),
                 'client_secret'      => config('ninja.wepay.client_secret'),
-                'credit_card_id'     => (int)$objectId,
-            ));
+                'credit_card_id'     => (int) $objectId,
+            ]);
 
             if ($source->state == 'deleted') {
                 $payment_method->delete();
@@ -209,12 +209,12 @@ class WePayPaymentDriver extends BaseDriver
             return 'Processed successfully';
         } elseif ($objectType == 'account') {
             if ($accountId != $objectId) {
-                throw new \Exception('Unknown account ' . $accountId . ' does not equal '.$objectId);
+                throw new \Exception('Unknown account '.$accountId.' does not equal '.$objectId);
             }
 
-            $wepayAccount = $this->wepay->request('account', array(
-                'account_id'     => (int)$objectId,
-            ));
+            $wepayAccount = $this->wepay->request('account', [
+                'account_id'     => (int) $objectId,
+            ]);
 
             if ($wepayAccount->state == 'deleted') {
                 $this->company_gateway->delete();
@@ -238,16 +238,16 @@ class WePayPaymentDriver extends BaseDriver
                 throw new \Exception('Payment is deleted');
             }
 
-            $checkout = $this->wepay->request('checkout', array(
+            $checkout = $this->wepay->request('checkout', [
                 'checkout_id' => intval($objectId),
-            ));
+            ]);
 
             if ($checkout->state == 'captured') {
                 $payment->status_id = Payment::STATUS_COMPLETED;
                 $payment->save();
             } elseif ($checkout->state == 'cancelled') {
                 $payment->service()->deletePayment()->save();
-            } elseif ($checkout->state == 'failed') {                
+            } elseif ($checkout->state == 'failed') {
                 $payment->status_id = Payment::STATUS_FAILED;
                 $payment->save();
             }
@@ -257,21 +257,18 @@ class WePayPaymentDriver extends BaseDriver
             return 'Ignoring event';
         }
 
-
-
         return true;
     }
 
     public function refund(Payment $payment, $amount, $return_client_response = false)
     {
-        
         $this->init();
 
-        $response = $this->wepay->request('checkout/refund', array(
+        $response = $this->wepay->request('checkout/refund', [
             'checkout_id'   => $payment->transaction_reference,
             'refund_reason' => 'Refund by merchant',
-            'amount'        => $amount
-        ));
+            'amount'        => $amount,
+        ]);
 
         return [
             'transaction_reference' => $response->checkout_id,
@@ -280,14 +277,14 @@ class WePayPaymentDriver extends BaseDriver
             'description' => 'refund',
             'code' => 0,
         ];
-        
     }
 
     public function detach(ClientGatewayToken $token)
     {
         /*Bank accounts cannot be deleted - only CC*/
-        if($token->gateway_type_id == 2)
+        if ($token->gateway_type_id == 2) {
             return true;
+        }
 
         $this->init();
 
@@ -304,7 +301,6 @@ class WePayPaymentDriver extends BaseDriver
         }
     }
 
-
     public function getClientRequiredFields(): array
     {
         $fields = [
@@ -348,12 +344,4 @@ class WePayPaymentDriver extends BaseDriver
 
         return $fields;
     }
-
-
-
-
-
-
-
-
 }
diff --git a/app/Policies/PurchaseOrderPolicy.php b/app/Policies/PurchaseOrderPolicy.php
index 39cb49327eb0..58d4b9f8d823 100644
--- a/app/Policies/PurchaseOrderPolicy.php
+++ b/app/Policies/PurchaseOrderPolicy.php
@@ -11,7 +11,6 @@
 
 namespace App\Policies;
 
-
 use App\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
@@ -23,5 +22,4 @@ class PurchaseOrderPolicy extends EntityPolicy
     {
         return $user->isAdmin() || $user->hasPermission('create_purchase_order') || $user->hasPermission('create_all');
     }
-
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index bb9d76a7d0f8..d2ebc9544796 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -11,21 +11,24 @@
 
 namespace App\Providers;
 
+use App\Helpers\Mail\GmailTransport;
+use App\Helpers\Mail\Office365MailTransport;
 use App\Http\Middleware\SetDomainNameDb;
 use App\Models\Invoice;
 use App\Models\Proposal;
 use App\Utils\Ninja;
 use App\Utils\TruthSource;
 use Illuminate\Cache\RateLimiting\Limit;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Queue\Events\JobProcessing;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Database\Eloquent\Model;
 use Livewire\Livewire;
 
 class AppServiceProvider extends ServiceProvider
@@ -45,7 +48,7 @@ class AppServiceProvider extends ServiceProvider
 
         Relation::morphMap([
             'invoices'  => Invoice::class,
-          //  'credits'   => \App\Models\Credit::class,
+            //  'credits'   => \App\Models\Credit::class,
             'proposals' => Proposal::class,
         ]);
 
@@ -56,8 +59,7 @@ class AppServiceProvider extends ServiceProvider
         Schema::defaultStringLength(191);
 
         /* Handles setting the correct database with livewire classes */
-        if(Ninja::isHosted())
-        {
+        if (Ninja::isHosted()) {
             Livewire::addPersistentMiddleware([
                 SetDomainNameDb::class,
             ]);
@@ -67,13 +69,21 @@ class AppServiceProvider extends ServiceProvider
         Queue::before(function (JobProcessing $event) {
             App::forgetInstance('truthsource');
         });
- 
+
         app()->instance(TruthSource::class, new TruthSource());
 
         // Model::preventLazyLoading(
         //     !$this->app->isProduction()
         // );
 
+        Mail::extend('gmail', function () {
+            return new GmailTransport();
+        });
+
+        Mail::extend('office365', function () {
+            return new Office365MailTransport();
+        });
+        
     }
 
     /**
@@ -83,13 +93,6 @@ class AppServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->loadHelpers();
     }
 
-    protected function loadHelpers()
-    {
-        foreach (glob(__DIR__.'/../Helpers/*.php') as $filename) {
-            require_once $filename;
-        }
-    }
 }
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index e84aa13d98fe..495ebf41aadd 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -164,8 +164,8 @@ use App\Listeners\Invoice\InvoiceCancelledActivity;
 use App\Listeners\Invoice\InvoiceCreatedNotification;
 use App\Listeners\Invoice\InvoiceDeletedActivity;
 use App\Listeners\Invoice\InvoiceEmailActivity;
-use App\Listeners\Invoice\InvoiceEmailFailedActivity;
 use App\Listeners\Invoice\InvoiceEmailedNotification;
+use App\Listeners\Invoice\InvoiceEmailFailedActivity;
 use App\Listeners\Invoice\InvoiceFailedEmailNotification;
 use App\Listeners\Invoice\InvoicePaidActivity;
 use App\Listeners\Invoice\InvoiceReminderEmailActivity;
@@ -175,8 +175,8 @@ use App\Listeners\Invoice\InvoiceViewedActivity;
 use App\Listeners\Invoice\UpdateInvoiceActivity;
 use App\Listeners\Mail\MailSentListener;
 use App\Listeners\Misc\InvitationViewedListener;
-use App\Listeners\Payment\PaymentEmailFailureActivity;
 use App\Listeners\Payment\PaymentEmailedActivity;
+use App\Listeners\Payment\PaymentEmailFailureActivity;
 use App\Listeners\Payment\PaymentNotification;
 use App\Listeners\Payment\PaymentRestoredActivity;
 use App\Listeners\PurchaseOrder\CreatePurchaseOrderActivity;
@@ -219,8 +219,8 @@ use App\Listeners\User\ArchivedUserActivity;
 use App\Listeners\User\CreatedUserActivity;
 use App\Listeners\User\DeletedUserActivity;
 use App\Listeners\User\RestoredUserActivity;
-use App\Listeners\User\UpdateUserLastLogin;
 use App\Listeners\User\UpdatedUserActivity;
+use App\Listeners\User\UpdateUserLastLogin;
 use App\Models\Account;
 use App\Models\Client;
 use App\Models\Company;
@@ -271,9 +271,9 @@ class EventServiceProvider extends ServiceProvider
         ],
         MessageSending::class => [
         ],
-        MessageSent::class => [
-            MailSentListener::class,
-        ],
+        // MessageSent::class => [
+        //     MailSentListener::class,
+        // ],
         UserWasCreated::class => [
             CreatedUserActivity::class,
             SendVerificationNotification::class,
@@ -394,7 +394,7 @@ class EventServiceProvider extends ServiceProvider
             ExpenseDeletedActivity::class,
         ],
         ExpenseWasRestored::class => [
-            ExpenseRestoredActivity::class
+            ExpenseRestoredActivity::class,
         ],
         //Invoices
         InvoiceWasMarkedSent::class => [
@@ -476,7 +476,7 @@ class EventServiceProvider extends ServiceProvider
         ],
         PurchaseOrderWasAccepted::class => [
             PurchaseOrderAcceptedActivity::class,
-            PurchaseOrderAcceptedNotification::class
+            PurchaseOrderAcceptedNotification::class,
         ],
         CompanyDocumentsDeleted::class => [
             DeleteCompanyDocuments::class,
@@ -524,7 +524,7 @@ class EventServiceProvider extends ServiceProvider
             RecurringExpenseDeletedActivity::class,
         ],
         RecurringExpenseWasRestored::class => [
-            RecurringExpenseRestoredActivity::class
+            RecurringExpenseRestoredActivity::class,
         ],
         RecurringQuoteWasUpdated::class => [
             UpdateRecurringQuoteActivity::class,
@@ -603,8 +603,8 @@ class EventServiceProvider extends ServiceProvider
         ],
         \SocialiteProviders\Manager\SocialiteWasCalled::class => [
             // ... Manager won't register drivers that are not added to this listener.
-            \SocialiteProviders\Apple\AppleExtendSocialite::class . '@handle',
-            \SocialiteProviders\Microsoft\MicrosoftExtendSocialite::class . '@handle',
+            \SocialiteProviders\Apple\AppleExtendSocialite::class.'@handle',
+            \SocialiteProviders\Microsoft\MicrosoftExtendSocialite::class.'@handle',
         ],
 
     ];
@@ -645,4 +645,14 @@ class EventServiceProvider extends ServiceProvider
         User::observe(UserObserver::class);
         PurchaseOrder::observe(PurchaseOrderObserver::class);
     }
+
+    /**
+     * Determine if events and listeners should be automatically discovered.
+     *
+     * @return bool
+     */
+    public function shouldDiscoverEvents()
+    {
+        return false;
+    }
 }
diff --git a/app/Providers/MailCssInlinerServiceProvider.php b/app/Providers/MailCssInlinerServiceProvider.php
index 92dc39480673..36c0fc49d3db 100644
--- a/app/Providers/MailCssInlinerServiceProvider.php
+++ b/app/Providers/MailCssInlinerServiceProvider.php
@@ -28,7 +28,7 @@ class MailCssInlinerServiceProvider extends ServiceProvider
     public function boot()
     {
         $this->publishes([
-            __DIR__ . '/../config/css-inliner.php' => base_path('config/css-inliner.php'),
+            __DIR__.'/../config/css-inliner.php' => base_path('config/css-inliner.php'),
         ], 'config');
     }
 
@@ -47,10 +47,8 @@ class MailCssInlinerServiceProvider extends ServiceProvider
         //     return new CssInlinerPlugin([]);
         // });
 
-        $this->app->bind(CssInlinerPlugin::class, function($app) {
+        $this->app->bind(CssInlinerPlugin::class, function ($app) {
             return new CssInlinerPlugin([]);
         });
     }
 }
-
-
diff --git a/app/Providers/MailServiceProvider.php b/app/Providers/MailServiceProvider.php
deleted file mode 100644
index b9489888d62b..000000000000
--- a/app/Providers/MailServiceProvider.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Invoice Ninja (https://invoiceninja.com).
- *
- * @link https://github.com/invoiceninja/invoiceninja source repository
- *
- * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
- *
- * @license https://www.elastic.co/licensing/elastic-license
- */
-
-namespace App\Providers;
-
-use App\Helpers\Mail\GmailTransportManager;
-use App\Utils\CssInlinerPlugin;
-use Coconuts\Mail\PostmarkTransport;
-use GuzzleHttp\Client as HttpClient;
-use Illuminate\Mail\MailServiceProvider as MailProvider;
-use Illuminate\Mail\TransportManager;
-use Illuminate\Container\Container;
-
-class MailServiceProvider extends MailProvider
-{
-
-    public function register()
-    {
-        $this->registerIlluminateMailer();
-    }
-
-    public function boot()
-    {
-        app('mail.manager')->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
-    }
-
-    protected function registerIlluminateMailer()
-    {
-        // //this is not octane safe
-        $this->app->singleton('mail.manager', function($app) {
-            return new GmailTransportManager($app);
-        });
-
-        //this is octane ready - but is untested
-        // $this->app->bind('mail.manager', function ($app){
-        //     return new GmailTransportManager($app);
-        // });
-
-        $this->app->bind('mailer', function ($app) {
-            return $app->make('mail.manager')->mailer();
-        });
-
-        $this->app['mail.manager']->extend('cocopostmark', function () {
-
-            return new PostmarkTransport(
-                $this->guzzle(config('postmark.guzzle', [])),
-                config('postmark.secret')
-            );
-
-        });
-
-    }
-    
-    protected function guzzle(array $config): HttpClient
-    {
-        return new HttpClient(array_merge($config, [
-                'base_uri' => empty($config['base_uri'])
-                    ? 'https://api.postmarkapp.com'
-                    : $config['base_uri']
-            ]));
-    }
-
-    public function provides()
-    {
-        return [
-            'mail.manager',
-            'mailer'        
-        ];
-    }
-}
diff --git a/app/Providers/NinjaTranslationServiceProvider.php b/app/Providers/NinjaTranslationServiceProvider.php
index 010c0ede1b47..8fe7faaad8b4 100644
--- a/app/Providers/NinjaTranslationServiceProvider.php
+++ b/app/Providers/NinjaTranslationServiceProvider.php
@@ -35,7 +35,6 @@ class NinjaTranslationServiceProvider extends TranslationServiceProvider
 
         //this is not octane safe
         $this->app->singleton('translator', function ($app) {
-
             $loader = $app['translation.loader'];
             $locale = $app['config']['app.locale'];
 
@@ -44,8 +43,6 @@ class NinjaTranslationServiceProvider extends TranslationServiceProvider
             $trans->setFallback($app['config']['app.fallback_locale']);
 
             return $trans;
-
         });
     }
-
 }
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index b832d953aa78..2684f395df89 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -18,14 +18,6 @@ use Illuminate\Support\Facades\Route;
 class RouteServiceProvider extends ServiceProvider
 {
     use MakesHash;
-    /**
-     * This namespace is applied to your controller routes.
-     *
-     * In addition, it is set as the URL generator's root namespace.
-     *
-     * @var string
-     */
-    protected $namespace = 'App\Http\Controllers';
 
     /**
      * Define your route model bindings, pattern filters, etc.
@@ -67,7 +59,6 @@ class RouteServiceProvider extends ServiceProvider
     protected function mapWebRoutes()
     {
         Route::middleware('web')
-             ->namespace($this->namespace)
              ->group(base_path('routes/web.php'));
     }
 
@@ -82,7 +73,6 @@ class RouteServiceProvider extends ServiceProvider
     {
         Route::prefix('')
              ->middleware('api')
-             ->namespace($this->namespace)
              ->group(base_path('routes/api.php'));
     }
 
@@ -97,7 +87,6 @@ class RouteServiceProvider extends ServiceProvider
     {
         Route::prefix('')
              ->middleware('contact')
-             ->namespace($this->namespace)
              ->group(base_path('routes/contact.php'));
     }
 
@@ -112,7 +101,6 @@ class RouteServiceProvider extends ServiceProvider
     {
         Route::prefix('')
              ->middleware('client')
-             ->namespace($this->namespace)
              ->group(base_path('routes/client.php'));
     }
 
@@ -120,7 +108,6 @@ class RouteServiceProvider extends ServiceProvider
     {
         Route::prefix('')
              ->middleware('shop')
-             ->namespace($this->namespace)
              ->group(base_path('routes/shop.php'));
     }
 
@@ -128,7 +115,6 @@ class RouteServiceProvider extends ServiceProvider
     {
         Route::prefix('')
             ->middleware('client')
-            ->namespace($this->namespace)
             ->group(base_path('routes/vendor.php'));
     }
 }
diff --git a/app/Repositories/ActivityRepository.php b/app/Repositories/ActivityRepository.php
index 4c690d977769..f636d21413fa 100644
--- a/app/Repositories/ActivityRepository.php
+++ b/app/Repositories/ActivityRepository.php
@@ -70,15 +70,15 @@ class ActivityRepository extends BaseRepository
      */
     public function createBackup($entity, $activity)
     {
-        if ($entity instanceof User || $entity->company->is_disabled)
+        if ($entity instanceof User || $entity->company->is_disabled) {
             return;
+        }
 
-        if (get_class($entity) == Invoice::class 
-            || get_class($entity) == Quote::class 
-            || get_class($entity) == Credit::class 
+        if (get_class($entity) == Invoice::class
+            || get_class($entity) == Quote::class
+            || get_class($entity) == Credit::class
             || get_class($entity) == RecurringInvoice::class
         ) {
-
             $backup = new Backup();
             $entity->load('client');
             $contact = $entity->client->primary_contact()->first();
@@ -90,8 +90,6 @@ class ActivityRepository extends BaseRepository
 
             $backup->storeRemotely($this->generateHtml($entity), $entity->client);
         }
-
-
     }
 
     public function getTokenId(array $event_vars)
@@ -112,14 +110,13 @@ class ActivityRepository extends BaseRepository
         $entity_design_id = '';
         $entity_type = '';
 
-        if ($entity instanceof Invoice ) {
+        if ($entity instanceof Invoice) {
             $entity_type = 'invoice';
             $entity_design_id = 'invoice_design_id';
-        } elseif ($entity instanceof RecurringInvoice){
+        } elseif ($entity instanceof RecurringInvoice) {
             $entity_type = 'recurring_invoice';
             $entity_design_id = 'invoice_design_id';
-        } 
-        elseif ($entity instanceof Quote) {
+        } elseif ($entity instanceof Quote) {
             $entity_type = 'quote';
             $entity_design_id = 'quote_design_id';
         } elseif ($entity instanceof Credit) {
@@ -133,19 +130,20 @@ class ActivityRepository extends BaseRepository
 
         $design = Design::find($entity_design_id);
 
-        if(!$entity->invitations()->exists() || !$design){
+        if (! $entity->invitations()->exists() || ! $design) {
             nlog("No invitations for entity {$entity->id} - {$entity->number}");
+
             return '';
         }
 
         $entity->load('client.company', 'invitations');
 
-        $html = new HtmlEngine($entity->invitations->first()->load($entity_type, "contact"));
+        $html = new HtmlEngine($entity->invitations->first()->load($entity_type, 'contact'));
 
         if ($design->is_custom) {
             $options = [
-            'custom_partials' => json_decode(json_encode($design->design), true)
-          ];
+                'custom_partials' => json_decode(json_encode($design->design), true),
+            ];
             $template = new PdfMakerDesign(PdfDesignModel::CUSTOM, $options);
         } else {
             $template = new PdfMakerDesign(strtolower($design->name));
diff --git a/app/Repositories/ClientContactRepository.php b/app/Repositories/ClientContactRepository.php
index be07ba77b3ff..e82b9efd07d5 100644
--- a/app/Repositories/ClientContactRepository.php
+++ b/app/Repositories/ClientContactRepository.php
@@ -39,15 +39,16 @@ class ClientContactRepository extends BaseRepository
         });
 
         /* Ensure send_email always exists in at least one contact */
-        if(!$contacts->contains('send_email', true))
+        if (! $contacts->contains('send_email', true)) {
             $this->set_send_email_on_contact = true;
+        }
 
         /* Set first record to primary - always */
         $contacts = $contacts->sortByDesc('is_primary')->map(function ($contact) {
             $contact['is_primary'] = $this->is_primary;
             $this->is_primary = false;
 
-            if($this->set_send_email_on_contact){
+            if ($this->set_send_email_on_contact) {
                 $contact['send_email'] = true;
                 $this->set_send_email_on_contact = false;
             }
@@ -66,13 +67,14 @@ class ClientContactRepository extends BaseRepository
             if (! $update_contact) {
                 $update_contact = ClientContactFactory::create($client->company_id, $client->user_id);
             }
-            
+
             //10-09-2021 - enforce the client->id and remove client_id from fillables
             $update_contact->client_id = $client->id;
 
             /* We need to set NULL email addresses to blank strings to pass authentication*/
-            if(array_key_exists('email', $contact) && is_null($contact['email']))
+            if (array_key_exists('email', $contact) && is_null($contact['email'])) {
                 $contact['email'] = '';
+            }
 
             $update_contact->fill($contact);
 
@@ -82,8 +84,9 @@ class ClientContactRepository extends BaseRepository
                 $client->company->client_contacts()->where('email', $update_contact->email)->update(['password' => $update_contact->password]);
             }
 
-            if(array_key_exists('email', $contact))
+            if (array_key_exists('email', $contact)) {
                 $update_contact->email = trim($contact['email']);
+            }
 
             $update_contact->save();
         });
diff --git a/app/Repositories/ClientGatewayTokenRepository.php b/app/Repositories/ClientGatewayTokenRepository.php
index 0820358352ac..7635513b9296 100644
--- a/app/Repositories/ClientGatewayTokenRepository.php
+++ b/app/Repositories/ClientGatewayTokenRepository.php
@@ -18,14 +18,11 @@ use App\Models\ClientGatewayToken;
  */
 class ClientGatewayTokenRepository extends BaseRepository
 {
+    public function save(array $data, ClientGatewayToken $client_gateway_token) :ClientGatewayToken
+    {
+        $client_gateway_token->fill($data);
+        $client_gateway_token->save();
 
-	public function save(array $data, ClientGatewayToken $client_gateway_token) :ClientGatewayToken
-	{
-
-		$client_gateway_token->fill($data);
-		$client_gateway_token->save();
-
-		return $client_gateway_token->fresh();		
-	}
-
+        return $client_gateway_token->fresh();
+    }
 }
diff --git a/app/Repositories/ClientRepository.php b/app/Repositories/ClientRepository.php
index 8f63d3f2fedc..af2cf8107e27 100644
--- a/app/Repositories/ClientRepository.php
+++ b/app/Repositories/ClientRepository.php
@@ -42,7 +42,7 @@ class ClientRepository extends BaseRepository
     {
         $this->contact_repo = $contact_repo;
     }
-    
+
     /**
      * Saves the client and its contacts.
      *
@@ -58,55 +58,45 @@ class ClientRepository extends BaseRepository
     {
 
         /* When uploading documents, only the document array is sent, so we must return early*/
-        if (array_key_exists('documents', $data) && count($data['documents']) >=1) {
+        if (array_key_exists('documents', $data) && count($data['documents']) >= 1) {
             $this->saveDocuments($data['documents'], $client);
+
             return $client;
         }
 
         $client->fill($data);
 
-
         if (array_key_exists('settings', $data)) {
             $client->saveSettings($data['settings'], $client);
         }
 
-        if(!$client->country_id){
+        if (! $client->country_id) {
             $company = Company::find($client->company_id);
             $client->country_id = $company->settings->country_id;
         }
 
         $client->save();
 
-        
-        if (!isset($client->number) || empty($client->number) || strlen($client->number) == 0) {
+        if (! isset($client->number) || empty($client->number) || strlen($client->number) == 0) {
             // $client->number = $this->getNextClientNumber($client);
             // $client->save();
 
-            $x=1;
-
-            do{
-
-                try{
+            $x = 1;
 
+            do {
+                try {
                     $client->number = $this->getNextClientNumber($client);
                     $client->saveQuietly();
 
                     $this->completed = false;
-                    
-
-                }
-                catch(QueryException $e){
-
+                } catch (QueryException $e) {
                     $x++;
 
-                    if($x>10)
+                    if ($x > 10) {
                         $this->completed = false;
-                    
+                    }
                 }
-            
-            }
-            while($this->completed);    
-
+            } while ($this->completed);
         }
 
         if (empty($data['name'])) {
@@ -134,7 +124,6 @@ class ClientRepository extends BaseRepository
 
     public function purge($client)
     {
-
         $client->contacts()->forceDelete();
         $client->tasks()->forceDelete();
         $client->invoices()->forceDelete();
@@ -151,6 +140,5 @@ class ClientRepository extends BaseRepository
         $client->documents()->forceDelete();
         $client->payments()->forceDelete();
         $client->forceDelete();
-
     }
 }
diff --git a/app/Repositories/CompanyRepository.php b/app/Repositories/CompanyRepository.php
index d6823e7ab70d..e73723167ddf 100644
--- a/app/Repositories/CompanyRepository.php
+++ b/app/Repositories/CompanyRepository.php
@@ -48,12 +48,10 @@ class CompanyRepository extends BaseRepository
 
     private function parseCustomFields($fields) :array
     {
-        
         foreach ($fields as &$value) {
             $value = (string) $value;
         }
 
         return $fields;
     }
-
 }
diff --git a/app/Repositories/CreditRepository.php b/app/Repositories/CreditRepository.php
index 60d44cfe9965..d9876e4ba28d 100644
--- a/app/Repositories/CreditRepository.php
+++ b/app/Repositories/CreditRepository.php
@@ -26,7 +26,6 @@ class CreditRepository extends BaseRepository
     {
     }
 
-
     /**
      * Saves the client and its contacts.
      *
diff --git a/app/Repositories/DesignRepository.php b/app/Repositories/DesignRepository.php
index cb469fbcb4ed..eb64db0ec456 100644
--- a/app/Repositories/DesignRepository.php
+++ b/app/Repositories/DesignRepository.php
@@ -19,11 +19,9 @@ use Illuminate\Support\Str;
  */
 class DesignRepository extends BaseRepository
 {
-
     public function delete($design) :Design
     {
-
-        $design->name = $design->name . "_deleted_" . Str::random(5);
+        $design->name = $design->name.'_deleted_'.Str::random(5);
 
         parent::delete($design);
 
diff --git a/app/Repositories/DocumentRepository.php b/app/Repositories/DocumentRepository.php
index 642e5d0423d2..ea1115fbe5a4 100644
--- a/app/Repositories/DocumentRepository.php
+++ b/app/Repositories/DocumentRepository.php
@@ -19,7 +19,6 @@ use App\Utils\Ninja;
  */
 class DocumentRepository extends BaseRepository
 {
-
     public function delete($document)
     {
         $document->deleteFile();
@@ -28,18 +27,15 @@ class DocumentRepository extends BaseRepository
 
     public function restore($document)
     {
-        return;
+
         // if (! $document->trashed()) {
         //     return;
         // }
 
         // $document->restore();
-
     }
 
     public function archive($document)
     {
-        return;
     }
-
 }
diff --git a/app/Repositories/ExpenseRepository.php b/app/Repositories/ExpenseRepository.php
index 4cba59bab284..2b9e17c5bc35 100644
--- a/app/Repositories/ExpenseRepository.php
+++ b/app/Repositories/ExpenseRepository.php
@@ -24,21 +24,21 @@ class ExpenseRepository extends BaseRepository
 {
     use GeneratesCounter;
 
-
     /**
      * Saves the expense and its contacts.
      *
      * @param      array  $data    The data
      * @param      \App\Models\Expense              $expense  The expense
      *
-     * @return     \App\Models\Expense|Null  expense Object
+     * @return     \App\Models\Expense|null  expense Object
      */
     public function save(array $data, Expense $expense) : ?Expense
     {
         $expense->fill($data);
 
-        if(!$expense->id)
+        if (! $expense->id) {
             $expense = $this->processExchangeRates($data, $expense);
+        }
 
         $expense->number = empty($expense->number) ? $this->getNextExpenseNumber($expense) : $expense->number;
         $expense->save();
@@ -66,8 +66,7 @@ class ExpenseRepository extends BaseRepository
 
     public function processExchangeRates($data, $expense)
     {
-
-        if(array_key_exists('exchange_rate', $data) && isset($data['exchange_rate']) && $data['exchange_rate'] != 1){
+        if (array_key_exists('exchange_rate', $data) && isset($data['exchange_rate']) && $data['exchange_rate'] != 1) {
             return $expense;
         }
 
@@ -75,15 +74,13 @@ class ExpenseRepository extends BaseRepository
         $company_currency = $expense->company->settings->currency_id;
 
         if ($company_currency != $expense_currency) {
-
             $exchange_rate = new CurrencyApi();
 
             $expense->exchange_rate = $exchange_rate->exchangeRate($expense_currency, $company_currency, Carbon::parse($expense->date));
 
             return $expense;
         }
-        
+
         return $expense;
     }
-
 }
diff --git a/app/Repositories/GroupSettingRepository.php b/app/Repositories/GroupSettingRepository.php
index 598fb741a3f1..af03d78f8284 100644
--- a/app/Repositories/GroupSettingRepository.php
+++ b/app/Repositories/GroupSettingRepository.php
@@ -18,7 +18,6 @@ class GroupSettingRepository extends BaseRepository
 {
     public function save($data, GroupSetting $group_setting) :?GroupSetting
     {
-
         $group_setting->fill($data);
         $group_setting->save();
 
@@ -29,7 +28,7 @@ class GroupSettingRepository extends BaseRepository
             $group_setting->save();
         }
 
-        if(!array_key_exists('settings', $data) || count((array)$data['settings']) == 0){
+        if (! array_key_exists('settings', $data) || count((array) $data['settings']) == 0) {
             $settings = new \stdClass;
             $settings->entity = Client::class;
             $group_setting->settings = $settings;
diff --git a/app/Repositories/InvoiceRepository.php b/app/Repositories/InvoiceRepository.php
index d91f374fd062..3c60618501b1 100644
--- a/app/Repositories/InvoiceRepository.php
+++ b/app/Repositories/InvoiceRepository.php
@@ -22,7 +22,6 @@ class InvoiceRepository extends BaseRepository
 {
     use MakesHash;
 
-
     /**
      * Saves the invoices.
      *
@@ -86,7 +85,7 @@ class InvoiceRepository extends BaseRepository
     public function restore($invoice) :Invoice
     {
         //if we have just archived, only perform a soft restore
-        if (!$invoice->is_deleted) {
+        if (! $invoice->is_deleted) {
             parent::restore($invoice);
 
             return $invoice;
diff --git a/app/Repositories/Migration/InvoiceMigrationRepository.php b/app/Repositories/Migration/InvoiceMigrationRepository.php
index d167e4291cb8..51817b875a98 100644
--- a/app/Repositories/Migration/InvoiceMigrationRepository.php
+++ b/app/Repositories/Migration/InvoiceMigrationRepository.php
@@ -60,11 +60,13 @@ class InvoiceMigrationRepository extends BaseRepository
 
         $tmp_data = $data;
 
-        if(array_key_exists('tax_rate1', $tmp_data) && is_null($tmp_data['tax_rate1']))
+        if (array_key_exists('tax_rate1', $tmp_data) && is_null($tmp_data['tax_rate1'])) {
             $tmp_data['tax_rate1'] = 0;
+        }
 
-        if(array_key_exists('tax_rate2', $tmp_data) && is_null($tmp_data['tax_rate2']))
+        if (array_key_exists('tax_rate2', $tmp_data) && is_null($tmp_data['tax_rate2'])) {
             $tmp_data['tax_rate2'] = 0;
+        }
 
         /* We need to unset some variable as we sometimes unguard the model */
 
@@ -79,15 +81,16 @@ class InvoiceMigrationRepository extends BaseRepository
         $model->fill($tmp_data);
         $model->status_id = $tmp_data['status_id'];
 
-        if($tmp_data['created_at'])
+        if ($tmp_data['created_at']) {
             $model->created_at = Carbon::parse($tmp_data['created_at']);
+        }
 
-        if($tmp_data['updated_at'])
+        if ($tmp_data['updated_at']) {
             $model->updated_at = Carbon::parse($tmp_data['updated_at']);
+        }
 
         $model->save(['timestamps' => false]);
 
-
         if (array_key_exists('documents', $data)) {
             $this->saveDocuments($data['documents'], $model);
         }
@@ -106,14 +109,14 @@ class InvoiceMigrationRepository extends BaseRepository
 
         InvoiceInvitation::unguard();
         RecurringInvoiceInvitation::unguard();
-        
+
         if ($model instanceof RecurringInvoice) {
             $lcfirst_resource_id = 'recurring_invoice_id';
         }
-        
+
         foreach ($data['invitations'] as $invitation) {
             // nlog($invitation);
-            
+
             $new_invitation = $invitation_factory_class::create($model->company_id, $model->user_id);
             $new_invitation->{$lcfirst_resource_id} = $model->id;
             $new_invitation->fill($invitation);
@@ -138,13 +141,11 @@ class InvoiceMigrationRepository extends BaseRepository
 
         if ($class->name == Invoice::class || $class->name == RecurringInvoice::class) {
             if (($state['finished_amount'] != $state['starting_amount']) && ($model->status_id != Invoice::STATUS_DRAFT)) {
-
             }
 
             if (! $model->design_id) {
                 $model->design_id = $this->decodePrimaryKey($client->getSetting('invoice_design_id'));
             }
-
         }
 
         if ($class->name == Credit::class) {
@@ -163,15 +164,16 @@ class InvoiceMigrationRepository extends BaseRepository
             }
         }
 
-        if($data['is_deleted']){
+        if ($data['is_deleted']) {
             $model->is_deleted = true;
             $model->save();
         }
 
-        if($data['deleted_at'] == '0000-00-00 00:00:00.000000')
+        if ($data['deleted_at'] == '0000-00-00 00:00:00.000000') {
             $model->deleted_at = null;
-        else if($data['deleted_at'])
+        } elseif ($data['deleted_at']) {
             $model->delete();
+        }
 
         $model->save();
 
diff --git a/app/Repositories/Migration/PaymentMigrationRepository.php b/app/Repositories/Migration/PaymentMigrationRepository.php
index 153dc5380cdc..b61877257aa3 100644
--- a/app/Repositories/Migration/PaymentMigrationRepository.php
+++ b/app/Repositories/Migration/PaymentMigrationRepository.php
@@ -85,22 +85,23 @@ class PaymentMigrationRepository extends BaseRepository
         /*Fill the payment*/
         $payment->fill($data);
         //$payment->status_id = Payment::STATUS_COMPLETED;
-        
-        if (!array_key_exists('status_id', $data)) {
-            info("payment with no status id?");
+
+        if (! array_key_exists('status_id', $data)) {
+            info('payment with no status id?');
             info(print_r($data, 1));
         }
 
         $payment->status_id = $data['status_id'];
         $payment->refunded = $data['refunded'];
 
-        if($payment->status_id == Payment::STATUS_CANCELLED)
+        if ($payment->status_id == Payment::STATUS_CANCELLED) {
             $payment->is_deleted = true;
+        }
 
         $payment->deleted_at = $data['deleted_at'] ?: null;
         $payment->save();
 
-        if(array_key_exists('currency_id', $data) && $data['currency_id'] == 0){
+        if (array_key_exists('currency_id', $data) && $data['currency_id'] == 0) {
             $payment->currency_id = $payment->company->settings->currency_id;
             $payment->save();
         }
@@ -124,10 +125,7 @@ class PaymentMigrationRepository extends BaseRepository
             $payment->invoices()->saveMany($invoices);
 
             $payment->invoices->each(function ($inv) use ($invoice_totals, $refund_totals, $payment) {
-
-
-                if($payment->status_id != Payment::STATUS_CANCELLED || !$payment->is_deleted)
-                {
+                if ($payment->status_id != Payment::STATUS_CANCELLED || ! $payment->is_deleted) {
                     $inv->pivot->amount = $invoice_totals;
                     $inv->pivot->refunded = $refund_totals;
                     $inv->pivot->save();
@@ -135,15 +133,15 @@ class PaymentMigrationRepository extends BaseRepository
                     $inv->paid_to_date += $invoice_totals;
                     $inv->balance -= $invoice_totals;
 
-                    if($inv->status_id == Invoice::STATUS_PAID)
+                    if ($inv->status_id == Invoice::STATUS_PAID) {
                         $inv->balance = 0;
+                    }
 
                     // if($inv->balance > 0)
                     // $inv->balance = max(0, $inv->balance);
 
                     $inv->save();
                 }
-
             });
         }
 
@@ -164,7 +162,6 @@ class PaymentMigrationRepository extends BaseRepository
             });
         }
 
-
         $fields = new stdClass;
 
         $fields->payment_id = $payment->id;
@@ -202,9 +199,10 @@ class PaymentMigrationRepository extends BaseRepository
      */
     private function processExchangeRates($data, $payment)
     {
-        if($payment->exchange_rate != 1)
+        if ($payment->exchange_rate != 1) {
             return $payment;
-        
+        }
+
         $client = Client::where('id', $data['client_id'])->withTrashed()->first();
 
         $client_currency = $client->getSetting('currency_id');
@@ -218,7 +216,6 @@ class PaymentMigrationRepository extends BaseRepository
             $payment->exchange_rate = $exchange_rate->exchangeRate($client_currency, $company_currency, Carbon::parse($payment->date));
             // $payment->exchange_currency_id = $client_currency;
             $payment->exchange_currency_id = $company_currency;
-
         }
 
         return $payment;
diff --git a/app/Repositories/PurchaseOrderRepository.php b/app/Repositories/PurchaseOrderRepository.php
index 2ffdc0e93576..ea27deb3b0f8 100644
--- a/app/Repositories/PurchaseOrderRepository.php
+++ b/app/Repositories/PurchaseOrderRepository.php
@@ -36,54 +36,49 @@ class PurchaseOrderRepository extends BaseRepository
 
             /* Get array of Keys which have been removed from the invitations array and soft delete each invitation */
             $purchase_order->invitations->pluck('key')->diff($invitations->pluck('key'))->each(function ($invitation) {
-
                 $invitation = PurchaseOrderInvitation::where('key', $invitation)->first();
 
-                if ($invitation) 
+                if ($invitation) {
                     $invitation->delete();
-                
+                }
             });
-        
+
             foreach ($data['invitations'] as $invitation) {
 
                 //if no invitations are present - create one.
                 if (! $this->getInvitation($invitation)) {
-
-                    if (isset($invitation['id'])) 
+                    if (isset($invitation['id'])) {
                         unset($invitation['id']);
+                    }
 
                     //make sure we are creating an invite for a contact who belongs to the client only!
                     $contact = VendorContact::find($invitation['vendor_contact_id']);
 
                     if ($contact && $purchase_order->vendor_id == $contact->vendor_id) {
-
                         $new_invitation = PurchaseOrderInvitation::withTrashed()
                                             ->where('vendor_contact_id', $contact->id)
                                             ->where('purchase_order_id', $purchase_order->id)
                                             ->first();
 
                         if ($new_invitation && $new_invitation->trashed()) {
-
                             $new_invitation->restore();
-
                         } else {
-
                             $new_invitation = PurchaseOrderInvitationFactory::create($purchase_order->company_id, $purchase_order->user_id);
                             $new_invitation->purchase_order_id = $purchase_order->id;
                             $new_invitation->vendor_contact_id = $contact->id;
                             $new_invitation->key = $this->createDbHash($purchase_order->company->db);
                             $new_invitation->save();
-
                         }
                     }
                 }
             }
         }
-        
+
         /* If no invitations have been created, this is our fail safe to maintain state*/
-        if ($purchase_order->invitations()->count() == 0) 
+        if ($purchase_order->invitations()->count() == 0) {
             $purchase_order->service()->createInvitations();
-        
+        }
+
         /* Recalculate invoice amounts */
         $purchase_order = $purchase_order->calc()->getPurchaseOrder();
 
@@ -95,14 +90,14 @@ class PurchaseOrderRepository extends BaseRepository
         return PurchaseOrderInvitation::where('key', $key)->first();
     }
 
-    public function getInvitation($invitation, $resource=null)
+    public function getInvitation($invitation, $resource = null)
     {
-        if (is_array($invitation) && ! array_key_exists('key', $invitation))
+        if (is_array($invitation) && ! array_key_exists('key', $invitation)) {
             return false;
-        
+        }
+
         $invitation = PurchaseOrderInvitation::where('key', $invitation['key'])->first();
 
         return $invitation;
     }
-
 }
diff --git a/app/Repositories/RecurringExpenseRepository.php b/app/Repositories/RecurringExpenseRepository.php
index 5abd48fd3729..8b849db86679 100644
--- a/app/Repositories/RecurringExpenseRepository.php
+++ b/app/Repositories/RecurringExpenseRepository.php
@@ -22,14 +22,13 @@ class RecurringExpenseRepository extends BaseRepository
 {
     use GeneratesCounter;
 
-
     /**
      * Saves the recurring_expense and its contacts.
      *
      * @param      array  $data    The data
      * @param      \App\Models\RecurringExpense              $recurring_expense  The recurring_expense
      *
-     * @return     \App\Models\RecurringExpense|Null  recurring_expense Object
+     * @return     \App\Models\RecurringExpense|null  recurring_expense Object
      */
     public function save(array $data, RecurringExpense $recurring_expense) : ?RecurringExpense
     {
diff --git a/app/Repositories/RecurringInvoiceRepository.php b/app/Repositories/RecurringInvoiceRepository.php
index 9f4dadb057c0..ebb3a0d423d2 100644
--- a/app/Repositories/RecurringInvoiceRepository.php
+++ b/app/Repositories/RecurringInvoiceRepository.php
@@ -22,7 +22,6 @@ class RecurringInvoiceRepository extends BaseRepository
 {
     public function save($data, RecurringInvoice $invoice) : ?RecurringInvoice
     {
-
         $invoice = $this->alternativeSave($data, $invoice);
 
         return $invoice;
diff --git a/app/Repositories/SubscriptionRepository.php b/app/Repositories/SubscriptionRepository.php
index cbd3a481a7ed..ed0a9d113809 100644
--- a/app/Repositories/SubscriptionRepository.php
+++ b/app/Repositories/SubscriptionRepository.php
@@ -12,7 +12,6 @@
 
 namespace App\Repositories;
 
-
 use App\DataMapper\ClientSettings;
 use App\DataMapper\InvoiceItem;
 use App\Factory\InvoiceFactory;
@@ -33,7 +32,7 @@ class SubscriptionRepository extends BaseRepository
     public function save($data, Subscription $subscription): ?Subscription
     {
         $subscription->fill($data);
-        
+
         $calculated_prices = $this->calculatePrice($subscription);
 
         $subscription->price = $calculated_prices['price'];
@@ -47,25 +46,25 @@ class SubscriptionRepository extends BaseRepository
     private function calculatePrice($subscription) :array
     {
 
-		// DB::beginTransaction();
+        // DB::beginTransaction();
         DB::connection(config('database.default'))->beginTransaction();
-		$data = [];
+        $data = [];
 
         $client = Client::factory()->create([
-                'user_id' => $subscription->user_id,
-                'company_id' => $subscription->company_id,
-                'group_settings_id' => $subscription->group_id,
-                'country_id' => $subscription->company->settings->country_id,
-                'settings' => ClientSettings::defaults(),
-            ]);
+            'user_id' => $subscription->user_id,
+            'company_id' => $subscription->company_id,
+            'group_settings_id' => $subscription->group_id,
+            'country_id' => $subscription->company->settings->country_id,
+            'settings' => ClientSettings::defaults(),
+        ]);
 
         $contact = ClientContact::factory()->create([
-                'user_id' => $subscription->user_id,
-                'company_id' => $subscription->company_id,
-                'client_id' => $client->id,
-                'is_primary' => 1,
-                'send_email' => true,
-            ]);
+            'user_id' => $subscription->user_id,
+            'company_id' => $subscription->company_id,
+            'client_id' => $client->id,
+            'is_primary' => 1,
+            'send_email' => true,
+        ]);
 
         $invoice = InvoiceFactory::create($subscription->company_id, $subscription->user_id);
         $invoice->client_id = $client->id;
@@ -73,10 +72,10 @@ class SubscriptionRepository extends BaseRepository
         $invoice->save();
 
         $invitation = InvoiceInvitation::factory()->create([
-                    'user_id' => $subscription->user_id,
-                    'company_id' => $subscription->company_id,
-                    'invoice_id' => $invoice->id,
-                    'client_contact_id' => $contact->id,
+            'user_id' => $subscription->user_id,
+            'company_id' => $subscription->company_id,
+            'invoice_id' => $invoice->id,
+            'client_contact_id' => $contact->id,
         ]);
 
         $invoice->setRelation('invitations', $invitation);
@@ -86,7 +85,7 @@ class SubscriptionRepository extends BaseRepository
         $invoice->line_items = $this->generateLineItems($subscription);
 
         $data['price'] = $invoice->calc()->getTotal();
-        
+
         $invoice->discount = $subscription->promo_discount;
         $invoice->is_amount_discount = $subscription->is_amount_discount;
 
@@ -94,7 +93,7 @@ class SubscriptionRepository extends BaseRepository
 
         // DB::rollBack();
         DB::connection(config('database.default'))->rollBack();
-        
+
         return $data;
     }
 
@@ -102,25 +101,21 @@ class SubscriptionRepository extends BaseRepository
     {
         $multiplier = $is_credit ? -1 : 1;
 
-    	$line_items = [];
+        $line_items = [];
 
-        if(!$is_recurring)
-        {
-            foreach($subscription->service()->products() as $product)
-            {
-                $line_items[] = (array)$this->makeLineItem($product, $multiplier);
+        if (! $is_recurring) {
+            foreach ($subscription->service()->products() as $product) {
+                $line_items[] = (array) $this->makeLineItem($product, $multiplier);
             }
         }
-        
-        foreach($subscription->service()->recurring_products() as $product)
-        {
-            $line_items[] = (array)$this->makeLineItem($product, $multiplier);
+
+        foreach ($subscription->service()->recurring_products() as $product) {
+            $line_items[] = (array) $this->makeLineItem($product, $multiplier);
         }
 
-    	$line_items = $this->cleanItems($line_items);
+        $line_items = $this->cleanItems($line_items);
 
         return $line_items;
-
     }
 
     private function makeLineItem($product, $multiplier)
@@ -129,7 +124,7 @@ class SubscriptionRepository extends BaseRepository
         $item->quantity = $this->quantity;
         $item->product_key = $product->product_key;
         $item->notes = $product->notes;
-        $item->cost = $product->price*$multiplier;
+        $item->cost = $product->price * $multiplier;
         $item->tax_rate1 = $product->tax_rate1 ?: 0;
         $item->tax_name1 = $product->tax_name1 ?: '';
         $item->tax_rate2 = $product->tax_rate2 ?: 0;
@@ -143,4 +138,4 @@ class SubscriptionRepository extends BaseRepository
 
         return $item;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Repositories/TaskRepository.php b/app/Repositories/TaskRepository.php
index 5202289d9dea..386a9fd2c8c2 100644
--- a/app/Repositories/TaskRepository.php
+++ b/app/Repositories/TaskRepository.php
@@ -34,16 +34,18 @@ class TaskRepository extends BaseRepository
      */
     public function save(array $data, Task $task) : ?Task
     {
-        if($task->id)
+        if ($task->id) {
             $this->new_task = false;
+        }
 
         $task->fill($data);
         $task->save();
 
-        if($this->new_task && !$task->status_id)
+        if ($this->new_task && ! $task->status_id) {
             $this->setDefaultStatus($task);
+        }
 
-        $task->number = empty($task->number) || !array_key_exists('number', $data) ? $this->getNextTaskNumber($task) : $data['number'];
+        $task->number = empty($task->number) || ! array_key_exists('number', $data) ? $this->getNextTaskNumber($task) : $data['number'];
 
         if (isset($data['description'])) {
             $task->description = trim($data['description']);
@@ -137,79 +139,75 @@ class TaskRepository extends BaseRepository
             $task,
             TaskFactory::create(auth()->user()->company()->id, auth()->user()->id)
         );
-
     }
 
     private function setDefaultStatus(Task $task)
     {
         $first_status = $task->company->task_statuses()
                               ->whereNull('deleted_at')
-                              ->orderBy('id','asc')
+                              ->orderBy('id', 'asc')
                               ->first();
 
-        if($first_status)
+        if ($first_status) {
             return $first_status->id;
+        }
 
         return null;
     }
 
     /**
      * Sorts the task status order IF the old status has changed between requests
-     *     
+     *
      * @param  stdCLass $old_task The old task object
      * @param  Task     $new_task The new Task model
      * @return void
      */
     public function sortStatuses($old_task, $new_task)
     {
-
-        if(!$new_task->project()->exists())
+        if (! $new_task->project()->exists()) {
             return;
+        }
 
         $index = $new_task->status_order;
 
-        $tasks = $new_task->project->tasks->reject(function ($task)use($new_task){
+        $tasks = $new_task->project->tasks->reject(function ($task) use ($new_task) {
             return $task->id == $new_task->id;
         });
 
-        $sorted_tasks = $tasks->filter(function($task, $key)use($index){
+        $sorted_tasks = $tasks->filter(function ($task, $key) use ($index) {
             return $key < $index;
-        })->push($new_task)->merge($tasks->filter(function($task, $key)use($index){
+        })->push($new_task)->merge($tasks->filter(function ($task, $key) use ($index) {
             return $key >= $index;
-        }))->each(function ($item,$key){
+        }))->each(function ($item, $key) {
             $item->status_order = $key;
             $item->save();
         });
-
     }
 
     public function start(Task $task)
     {
         //do no allow an task to be restarted if it has been invoiced
-        if($task->invoice_id)
+        if ($task->invoice_id) {
             return;
-
-        if(strlen($task->time_log) < 5)
-        {   
-            $log = [];
-
-            $log = array_merge($log, [[time(),0]]);
-            $task->time_log = json_encode($log);
-            $task->save();
-
         }
 
-        $log = json_decode($task->time_log,true);;
+        if (strlen($task->time_log) < 5) {
+            $log = [];
+
+            $log = array_merge($log, [[time(), 0]]);
+            $task->time_log = json_encode($log);
+            $task->save();
+        }
+
+        $log = json_decode($task->time_log, true);
 
         $last = end($log);
-        
-        if(is_array($last) && $last[1] !== 0){
-            
+
+        if (is_array($last) && $last[1] !== 0) {
             $new = [time(), 0];
             $log = array_merge($log, [$new]);
             $task->time_log = json_encode($log);
             $task->save();
-
         }
 
         return $task;
@@ -217,12 +215,11 @@ class TaskRepository extends BaseRepository
 
     public function stop(Task $task)
     {
-        $log = json_decode($task->time_log,true);;
+        $log = json_decode($task->time_log, true);
 
         $last = end($log);
-        
-        if(is_array($last) && $last[1] === 0){
 
+        if (is_array($last) && $last[1] === 0) {
             $last[1] = time();
 
             array_pop($log);
@@ -233,12 +230,10 @@ class TaskRepository extends BaseRepository
         }
 
         return $task;
-
     }
 
     public function triggeredActions($request, $task)
     {
-
         if ($request->has('start') && $request->input('start') == 'true') {
             $task = $this->start($task);
         }
@@ -246,7 +241,7 @@ class TaskRepository extends BaseRepository
         if ($request->has('stop') && $request->input('stop') == 'true') {
             $task = $this->stop($task);
         }
-        
+
         return $task;
     }
 }
diff --git a/app/Repositories/TaskSchedulerRepository.php b/app/Repositories/TaskSchedulerRepository.php
index 5c5b3145f9cf..8eddc7637775 100644
--- a/app/Repositories/TaskSchedulerRepository.php
+++ b/app/Repositories/TaskSchedulerRepository.php
@@ -11,8 +11,6 @@
 
 namespace App\Repositories;
 
-
 class TaskSchedulerRepository extends BaseRepository
 {
-
 }
diff --git a/app/Repositories/TokenRepository.php b/app/Repositories/TokenRepository.php
index 2de4d3be3b1c..c75d4e54ceeb 100644
--- a/app/Repositories/TokenRepository.php
+++ b/app/Repositories/TokenRepository.php
@@ -15,8 +15,6 @@ use App\Models\CompanyToken;
 
 class TokenRepository extends BaseRepository
 {
-
-
     /**
      * Saves the companytoken.
      *
diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php
index 21ca0af80741..abc9da0957b3 100644
--- a/app/Repositories/UserRepository.php
+++ b/app/Repositories/UserRepository.php
@@ -15,6 +15,7 @@ use App\DataMapper\CompanySettings;
 use App\Events\User\UserWasArchived;
 use App\Events\User\UserWasDeleted;
 use App\Events\User\UserWasRestored;
+use App\Jobs\Company\CreateCompanyToken;
 use App\Models\CompanyUser;
 use App\Models\User;
 use App\Utils\Ninja;
@@ -29,7 +30,6 @@ class UserRepository extends BaseRepository
 {
     use MakesHash;
 
-
     /**
      * Saves the user and its contacts.
      *
@@ -57,10 +57,11 @@ class UserRepository extends BaseRepository
         $account = $company->account;
 
         /* If hosted and Enterprise we need to increment the num_users field on the accounts table*/
-        if (! $user->id && $account->isEnterpriseClient()) {
-            $account->num_users++;
-            $account->save();
-        }
+        // 05-08-2022 This is an error, the num_users should _never_ increment
+        // if (! $user->id && $account->isEnterpriseClient()) {
+        //     $account->num_users++;
+        //     $account->save();
+        // }
 
         $user->fill($details);
 
@@ -69,15 +70,16 @@ class UserRepository extends BaseRepository
             $user->password = Hash::make($data['password']);
         }
 
-        if (!$user->confirmation_code) {
+        if (! $user->confirmation_code) {
             $user->confirmation_code = $this->createDbHash($company->db);
         }
 
         $user->account_id = $account->id;
 
-        if(strlen($user->password) >=1)
+        if (strlen($user->password) >= 1) {
             $user->has_password = true;
-        
+        }
+
         $user->save();
 
         if (isset($data['company_user'])) {
@@ -89,22 +91,22 @@ class UserRepository extends BaseRepository
                 $data['company_user']['notifications'] = CompanySettings::notificationDefaults();
                 $user->companies()->attach($company->id, $data['company_user']);
             } else {
-
-                if(auth()->user()->isAdmin())
-                {
+                if (auth()->user()->isAdmin()) {
                     $cu->fill($data['company_user']);
                     $cu->restore();
                     $cu->tokens()->restore();
                     $cu->save();
-                }
-                else {
-                            
+
+                    //05-08-2022
+                    if($cu->tokens()->count() == 0){
+                        (new CreateCompanyToken($cu->company, $cu->user, 'restored_user'))->handle();
+                    }
+
+                } else {
                     $cu->notifications = $data['company_user']['notifications'];
                     $cu->settings = $data['company_user']['settings'];
                     $cu->save();
-
                 }
-                
             }
 
             $user->with(['company_users' => function ($query) use ($company, $user) {
@@ -119,8 +121,9 @@ class UserRepository extends BaseRepository
 
     public function destroy(array $data, User $user)
     {
-        if($user->isOwner())
+        if ($user->isOwner()) {
             return $user;
+        }
 
         if (array_key_exists('company_user', $data)) {
             $this->forced_includes = 'company_users';
@@ -160,10 +163,9 @@ class UserRepository extends BaseRepository
 
         event(new UserWasDeleted($user, auth()->user(), $company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
-         $user->is_deleted = true;
-         $user->save();
-         $user->delete();
-
+        $user->is_deleted = true;
+        $user->save();
+        $user->delete();
 
         return $user->fresh();
     }
@@ -177,10 +179,9 @@ class UserRepository extends BaseRepository
         $user->delete();
 
         event(new UserWasArchived($user, auth()->user(), auth()->user()->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
-
     }
 
-        /**
+    /**
      * @param $entity
      */
     public function restore($user)
@@ -190,11 +191,10 @@ class UserRepository extends BaseRepository
         }
 
         if (Ninja::isHosted()) {
-            
             $count = User::where('account_id', auth()->user()->account_id)->count();
-            if($count >= auth()->user()->account->num_users)
+            if ($count >= auth()->user()->account->num_users) {
                 return;
-
+            }
         }
 
         $user->is_deleted = false;
@@ -209,6 +209,5 @@ class UserRepository extends BaseRepository
         $cu->restore();
 
         event(new UserWasRestored($user, auth()->user(), auth()->user()->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
-
     }
 }
diff --git a/app/Services/Chart/ChartQueries.php b/app/Services/Chart/ChartQueries.php
index b05f3d3f1042..bcebdd4d48e9 100644
--- a/app/Services/Chart/ChartQueries.php
+++ b/app/Services/Chart/ChartQueries.php
@@ -21,14 +21,12 @@ use Illuminate\Support\Facades\DB;
  */
 trait ChartQueries
 {
-
     /**
      * Expenses
      */
     public function getExpenseQuery($start_date, $end_date)
     {
-
-        return DB::select( DB::raw("
+        return DB::select(DB::raw('
             SELECT sum(expenses.amount) as amount,
             IFNULL(expenses.currency_id, :company_currency) as currency_id
             FROM expenses
@@ -36,14 +34,12 @@ trait ChartQueries
             AND expenses.company_id = :company_id
             AND (expenses.date BETWEEN :start_date AND :end_date)
             GROUP BY currency_id
-        "), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]  );
-    
+        '), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]);
     }
 
     public function getExpenseChartQuery($start_date, $end_date, $currency_id)
     {
-
-         return DB::select( DB::raw("
+        return DB::select(DB::raw('
             SELECT
             sum(expenses.amount) as total,
             expenses.date,
@@ -54,14 +50,13 @@ trait ChartQueries
             AND expenses.is_deleted = 0
             GROUP BY expenses.date
             HAVING currency_id = :currency_id
-        "), [
+        '), [
             'company_currency' => $this->company->settings->currency_id,
             'currency_id' => $currency_id,
-            'company_id' => $this->company->id, 
-            'start_date' => $start_date, 
-            'end_date' => $end_date
+            'company_id' => $this->company->id,
+            'start_date' => $start_date,
+            'end_date' => $end_date,
         ]);
-
     }
 
     /**
@@ -69,8 +64,7 @@ trait ChartQueries
      */
     public function getPaymentQuery($start_date, $end_date)
     {
-
-        return DB::select( DB::raw("
+        return DB::select(DB::raw('
             SELECT sum(payments.amount) as amount,
             IFNULL(payments.currency_id, :company_currency) as currency_id
             FROM payments
@@ -78,19 +72,17 @@ trait ChartQueries
             AND payments.company_id = :company_id
             AND (payments.date BETWEEN :start_date AND :end_date)
             GROUP BY currency_id
-        "), [
-            'company_currency' => $this->company->settings->currency_id, 
-            'company_id' => $this->company->id, 
-            'start_date' => $start_date, 
-            'end_date' => $end_date
+        '), [
+            'company_currency' => $this->company->settings->currency_id,
+            'company_id' => $this->company->id,
+            'start_date' => $start_date,
+            'end_date' => $end_date,
         ]);
-
     }
 
     public function getPaymentChartQuery($start_date, $end_date, $currency_id)
     {
-
-         return DB::select( DB::raw("
+        return DB::select(DB::raw('
             SELECT
             sum(payments.amount - payments.refunded) as total,
             payments.date,
@@ -102,23 +94,21 @@ trait ChartQueries
             AND payments.is_deleted = 0
             GROUP BY payments.date
             HAVING currency_id = :currency_id
-        "), [
+        '), [
             'company_currency' => $this->company->settings->currency_id,
             'currency_id' => $currency_id,
-            'company_id' => $this->company->id, 
-            'start_date' => $start_date, 
-            'end_date' => $end_date
+            'company_id' => $this->company->id,
+            'start_date' => $start_date,
+            'end_date' => $end_date,
         ]);
+    }
 
-    }    
-
-    /** 
+    /**
      * Invoices
      */
     public function getOutstandingQuery($start_date, $end_date)
     {
-
-        return DB::select( DB::raw("
+        return DB::select(DB::raw("
             SELECT
             sum(invoices.balance) as amount,
             IFNULL(JSON_EXTRACT( settings, '$.currency_id' ), :company_currency) AS currency_id
@@ -132,14 +122,12 @@ trait ChartQueries
             AND invoices.is_deleted = 0
             AND (invoices.date BETWEEN :start_date AND :end_date)
             GROUP BY currency_id
-        "), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]  );
-    
+        "), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]);
     }
 
     public function getRevenueQuery($start_date, $end_date)
     {
-
-        return DB::select( DB::raw("
+        return DB::select(DB::raw("
             SELECT
             sum(invoices.paid_to_date) as paid_to_date,
             IFNULL(JSON_EXTRACT( settings, '$.currency_id' ), :company_currency) AS currency_id
@@ -153,14 +141,12 @@ trait ChartQueries
             AND invoices.is_deleted = 0
             AND (invoices.date BETWEEN :start_date AND :end_date)
             GROUP BY currency_id
-        "), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]  );
-
+        "), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]);
     }
 
     public function getInvoiceChartQuery($start_date, $end_date, $currency_id)
     {
-
-         return DB::select( DB::raw("
+        return DB::select(DB::raw("
             SELECT
             sum(invoices.amount) as total,
             invoices.date,
@@ -176,13 +162,11 @@ trait ChartQueries
             GROUP BY invoices.date
             HAVING currency_id = :currency_id
         "), [
-            'company_currency' => (int)$this->company->settings->currency_id,
+            'company_currency' => (int) $this->company->settings->currency_id,
             'currency_id' => $currency_id,
-            'company_id' => $this->company->id, 
-            'start_date' => $start_date, 
-            'end_date' => $end_date
+            'company_id' => $this->company->id,
+            'start_date' => $start_date,
+            'end_date' => $end_date,
         ]);
-
     }
-
 }
diff --git a/app/Services/Chart/ChartService.php b/app/Services/Chart/ChartService.php
index 7be810cd225b..4c54fe12f116 100644
--- a/app/Services/Chart/ChartService.php
+++ b/app/Services/Chart/ChartService.php
@@ -43,7 +43,7 @@ class ChartService
             ->pluck('settings->currency_id as id');
 
         /* Push the company currency on also */
-        $currencies->push((int)$this->company->settings->currency_id);
+        $currencies->push((int) $this->company->settings->currency_id);
 
         /* Add our expense currencies*/
         $expense_currencies = Expense::withTrashed()
@@ -61,24 +61,21 @@ class ChartService
 
         $final_currencies = [];
 
-        foreach($filtered_currencies as $c_currency)
-        {
+        foreach ($filtered_currencies as $c_currency) {
             $final_currencies[$c_currency['id']] = $c_currency['code'];
         }
 
         return $final_currencies;
-
     }
 
-/* Chart Data */
+    /* Chart Data */
     public function chart_summary($start_date, $end_date) :array
     {
         $currencies = $this->getCurrencyCodes();
 
         $data = [];
 
-        foreach($currencies as $key => $value)
-        {
+        foreach ($currencies as $key => $value) {
             $data[$key]['invoices'] = $this->getInvoiceChartQuery($start_date, $end_date, $key);
             $data[$key]['payments'] = $this->getPaymentChartQuery($start_date, $end_date, $key);
             $data[$key]['expenses'] = $this->getExpenseChartQuery($start_date, $end_date, $key);
@@ -87,9 +84,9 @@ class ChartService
         return $data;
     }
 
-/* Chart Data */
+    /* Chart Data */
 
-/* Totals */
+    /* Totals */
 
     public function totals($start_date, $end_date) :array
     {
@@ -97,20 +94,18 @@ class ChartService
 
         $data['currencies'] = $this->getCurrencyCodes();
 
-        foreach($data['currencies'] as $key => $value)
-        {
+        foreach ($data['currencies'] as $key => $value) {
             $revenue = $this->getRevenue($start_date, $end_date);
             $outstanding = $this->getOutstanding($start_date, $end_date);
             $expenses = $this->getExpenses($start_date, $end_date);
 
-            $data[$key]['revenue'] = count($revenue) > 0 ? $revenue[array_search($key,array_column($revenue,'currency_id'))] : new \stdClass;
-            $data[$key]['outstanding'] = count($outstanding) > 0 ? $outstanding[array_search($key,array_column($outstanding,'currency_id'))] : new \stdClass;
-            $data[$key]['expenses'] = count($expenses) > 0 ? $expenses[array_search($key,array_column($expenses,'currency_id'))] : new \stdClass;
-
+            $data[$key]['revenue'] = count($revenue) > 0 ? $revenue[array_search($key, array_column($revenue, 'currency_id'))] : new \stdClass;
+            $data[$key]['outstanding'] = count($outstanding) > 0 ? $outstanding[array_search($key, array_column($outstanding, 'currency_id'))] : new \stdClass;
+            $data[$key]['expenses'] = count($expenses) > 0 ? $expenses[array_search($key, array_column($expenses, 'currency_id'))] : new \stdClass;
         }
 
         return $data;
-    }    
+    }
 
     public function getRevenue($start_date, $end_date) :array
     {
@@ -122,9 +117,9 @@ class ChartService
 
     public function getOutstanding($start_date, $end_date) :array
     {
-        $outstanding = $this->getOutstandingQuery($start_date, $end_date);   
+        $outstanding = $this->getOutstandingQuery($start_date, $end_date);
         $outstanding = $this->addCurrencyCodes($outstanding);
-    
+
         return $outstanding;
     }
 
@@ -136,38 +131,34 @@ class ChartService
         return $expenses;
     }
 
-/* Totals */
+    /* Totals */
 
-/* Helpers */
+    /* Helpers */
 
     private function addCurrencyCodes($data_set) :array
     {
-
         $currencies = Cache::get('currencies');
 
-        foreach($data_set as $key => $value)
-        {
+        foreach ($data_set as $key => $value) {
             $data_set[$key]->currency_id = str_replace('"', '', $value->currency_id);
-            $data_set[$key]->code = $this->getCode($currencies, $data_set[$key]->currency_id); 
+            $data_set[$key]->code = $this->getCode($currencies, $data_set[$key]->currency_id);
         }
 
         return $data_set;
-
     }
 
     private function getCode($currencies, $currency_id) :string
     {
         $currency_id = str_replace('"', '', $currency_id);
 
-        $currency = $currencies->filter(function ($item) use($currency_id) {
+        $currency = $currencies->filter(function ($item) use ($currency_id) {
             return $item->id == $currency_id;
         })->first();
 
-        if($currency)
+        if ($currency) {
             return $currency->code;
+        }
 
         return '';
-
     }
-
 }
diff --git a/app/Services/Client/ClientService.php b/app/Services/Client/ClientService.php
index 763ef02848d7..a5dd781f7d51 100644
--- a/app/Services/Client/ClientService.php
+++ b/app/Services/Client/ClientService.php
@@ -52,25 +52,25 @@ class ClientService
         $credits = $this->client->credits()
                       ->where('is_deleted', false)
                       ->where('balance', '>', 0)
-                      ->where(function ($query){
-                            $query->whereDate('due_date', '<=', now()->format('Y-m-d'))
+                      ->where(function ($query) {
+                          $query->whereDate('due_date', '<=', now()->format('Y-m-d'))
                                   ->orWhereNull('due_date');
                       })
-                      ->orderBy('created_at','ASC');
+                      ->orderBy('created_at', 'ASC');
 
         return Number::roundValue($credits->sum('balance'), $this->client->currency()->precision);
     }
 
-    public function getCredits() 
+    public function getCredits()
     {
         return $this->client->credits()
                   ->where('is_deleted', false)
                   ->where('balance', '>', 0)
-                  ->where(function ($query){
-                        $query->whereDate('due_date', '<=', now()->format('Y-m-d'))
+                  ->where(function ($query) {
+                      $query->whereDate('due_date', '<=', now()->format('Y-m-d'))
                               ->orWhereNull('due_date');
                   })
-                  ->orderBy('created_at','ASC')->get();
+                  ->orderBy('created_at', 'ASC')->get();
     }
 
     public function getPaymentMethods(float $amount)
@@ -87,8 +87,8 @@ class ClientService
 
     /**
      * Generate the client statement.
-     * 
-     * @param array $options 
+     *
+     * @param array $options
      */
     public function statement(array $options = [])
     {
diff --git a/app/Services/Client/Merge.php b/app/Services/Client/Merge.php
index 1b524fdadca3..211c843e817d 100644
--- a/app/Services/Client/Merge.php
+++ b/app/Services/Client/Merge.php
@@ -37,7 +37,6 @@ class Merge extends AbstractService
 
     public function run()
     {
-        
         $this->client->balance += $this->mergable_client->balance;
         $this->client->paid_to_date += $this->mergable_client->paid_to_date;
         $this->client->save();
@@ -58,18 +57,15 @@ class Merge extends AbstractService
         $this->mergable_client->documents()->update(['documentable_id' => $this->client->id]);
 
         /* Loop through contacts an only merge distinct contacts by email */
-        $this->mergable_client->contacts->each(function ($contact){
-
-            $exist = $this->client->contacts->contains(function ($client_contact) use($contact){
+        $this->mergable_client->contacts->each(function ($contact) {
+            $exist = $this->client->contacts->contains(function ($client_contact) use ($contact) {
                 return $client_contact->email == $contact->email;
             });
 
-            if($exist)
-            {
+            if ($exist) {
                 $contact->delete();
                 $contact->save();
-            }    
-
+            }
         });
 
         $this->mergable_client->forceDelete();
@@ -84,7 +80,7 @@ class Merge extends AbstractService
         $company_ledger = CompanyLedger::whereClientId($this->client->id)
                                 ->orderBy('id', 'DESC')
                                 ->first();
-    
+
         if ($company_ledger) {
             $balance = $company_ledger->balance;
         }
@@ -92,11 +88,9 @@ class Merge extends AbstractService
         $company_ledger = CompanyLedgerFactory::create($this->client->company_id, $this->client->user_id);
         $company_ledger->client_id = $this->client->id;
         $company_ledger->adjustment = $adjustment;
-        $company_ledger->notes = "Balance update after merging " . $this->mergable_client->present()->name();
+        $company_ledger->notes = 'Balance update after merging '.$this->mergable_client->present()->name();
         $company_ledger->balance = $balance + $adjustment;
         $company_ledger->activity_id = Activity::UPDATE_CLIENT;
         $company_ledger->save();
-
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/Services/Client/PaymentMethod.php b/app/Services/Client/PaymentMethod.php
index 7af4d6155e28..eabac28f5de6 100644
--- a/app/Services/Client/PaymentMethod.php
+++ b/app/Services/Client/PaymentMethod.php
@@ -39,14 +39,12 @@ class PaymentMethod
         $this->amount = $amount;
     }
 
-    public function run() 
+    public function run()
     {
-
         $this->getGateways()
              ->getMethods()
              ->buildUrls();
 
-
         return $this->getPaymentUrls();
     }
 
@@ -62,12 +60,10 @@ class PaymentMethod
 
     private function getGateways()
     {
-    
         $company_gateways = $this->client->getSetting('company_gateway_ids');
 
         //we need to check for "0" here as we disable a payment gateway for a client with the number "0"
         if ($company_gateways || $company_gateways == '0') {
-
             $transformed_ids = $this->transformKeys(explode(',', $company_gateways));
 
             $this->gateways = $this->client
@@ -78,31 +74,25 @@ class PaymentMethod
                              ->whereNull('deleted_at')
                              ->where('gateway_key', '!=', '54faab2ab6e3223dbe848b1686490baa')
                              ->sortby(function ($model) use ($transformed_ids) { //company gateways are sorted in order of priority
-                                 return array_search($model->id, $transformed_ids);// this closure sorts for us
+                                 return array_search($model->id, $transformed_ids); // this closure sorts for us
                              });
-
         } else {
-
-             $this->gateways = CompanyGateway::with('gateway')
+            $this->gateways = CompanyGateway::with('gateway')
                              ->where('company_id', $this->client->company_id)
                              ->where('gateway_key', '!=', '54faab2ab6e3223dbe848b1686490baa')
                              ->whereNull('deleted_at')
                              ->where('is_deleted', false)->get();
-
         }
-        
+
         return $this;
     }
 
-
     private function getCustomGateways()
     {
-    
         $company_gateways = $this->client->getSetting('company_gateway_ids');
 
         //we need to check for "0" here as we disable a payment gateway for a client with the number "0"
         if ($company_gateways || $company_gateways == '0') {
-
             $transformed_ids = $this->transformKeys(explode(',', $company_gateways));
 
             $this->gateways = $this->client
@@ -113,50 +103,40 @@ class PaymentMethod
                              ->whereNull('deleted_at')
                              ->where('gateway_key', '54faab2ab6e3223dbe848b1686490baa')
                              ->sortby(function ($model) use ($transformed_ids) { //company gateways are sorted in order of priority
-                                 return array_search($model->id, $transformed_ids);// this closure sorts for us
+                                 return array_search($model->id, $transformed_ids); // this closure sorts for us
                              });
-
         } else {
-
-             $this->gateways = CompanyGateway::with('gateway')
+            $this->gateways = CompanyGateway::with('gateway')
                              ->where('company_id', $this->client->company_id)
                              ->where('gateway_key', '54faab2ab6e3223dbe848b1686490baa')
                              ->whereNull('deleted_at')
                              ->where('is_deleted', false)->get();
-
         }
-        
 
         return $this;
     }
 
     private function getMethods()
     {
-        
         $this->payment_methods = [];
 
         foreach ($this->gateways as $gateway) {
 
             //if gateway doesn't exist or is not implemented - continue here //todo
-            if(!$gateway->driver($this->client))
+            if (! $gateway->driver($this->client)) {
                 continue;
+            }
 
             foreach ($gateway->driver($this->client)->gatewayTypes() as $type) {
-
                 if (isset($gateway->fees_and_limits) && is_object($gateway->fees_and_limits) && property_exists($gateway->fees_and_limits, $type)) {
-
                     if ($this->validGatewayForAmount($gateway->fees_and_limits->{$type}, $this->amount) && $gateway->fees_and_limits->{$type}->is_enabled) {
-                    
                         $this->payment_methods[] = [$gateway->id => $type];
-        
                     }
-
                 } else {
-        
                 }
             }
         }
-        
+
         //transform from Array to Collection
         $payment_methods_collections = collect($this->payment_methods);
 
@@ -168,16 +148,13 @@ class PaymentMethod
 
         //note we have to use GatewayType::CREDIT_CARD as alias for CUSTOM
         foreach ($this->gateways as $gateway) {
-
             foreach ($gateway->driver($this->client)->gatewayTypes() as $type) {
-
                 if (isset($gateway->fees_and_limits) && is_object($gateway->fees_and_limits) && property_exists($gateway->fees_and_limits, GatewayType::CREDIT_CARD)) {
-
-                    if ($this->validGatewayForAmount($gateway->fees_and_limits->{GatewayType::CREDIT_CARD}, $this->amount)) 
+                    if ($this->validGatewayForAmount($gateway->fees_and_limits->{GatewayType::CREDIT_CARD}, $this->amount)) {
                         $this->payment_methods[] = [$gateway->id => $type];
-                    
+                    }
                 } else {
-                    $this->payment_methods[] = [$gateway->id => NULL];
+                    $this->payment_methods[] = [$gateway->id => null];
                 }
             }
         }
@@ -187,25 +164,21 @@ class PaymentMethod
 
     private function buildUrls()
     {
-
         foreach ($this->payment_methods as $key => $child_array) {
             foreach ($child_array as $gateway_id => $gateway_type_id) {
                 $gateway = CompanyGateway::find($gateway_id);
 
                 $fee_label = $gateway->calcGatewayFeeLabel($this->amount, $this->client, $gateway_type_id);
 
-                if(!$gateway_type_id || (GatewayType::CUSTOM == $gateway_type_id)){
-
+                if (! $gateway_type_id || (GatewayType::CUSTOM == $gateway_type_id)) {
                     $this->payment_urls[] = [
-                        'label' => $gateway->getConfigField('name') . $fee_label,
+                        'label' => $gateway->getConfigField('name').$fee_label,
                         'company_gateway_id'  => $gateway_id,
                         'gateway_type_id' => GatewayType::CREDIT_CARD,
                     ];
-                }
-                else
-                {
+                } else {
                     $this->payment_urls[] = [
-                        'label' => $gateway->getTypeAlias($gateway_type_id) . $fee_label,
+                        'label' => $gateway->getTypeAlias($gateway_type_id).$fee_label,
                         'company_gateway_id'  => $gateway_id,
                         'gateway_type_id' => $gateway_type_id,
                     ];
@@ -223,14 +196,13 @@ class PaymentMethod
             }
 
             $this->payment_urls[] = [
-                    'label' => ctrans('texts.apply_credit'),
-                    'company_gateway_id'  => CompanyGateway::GATEWAY_CREDIT,
-                    'gateway_type_id' => GatewayType::CREDIT,
-                ];
+                'label' => ctrans('texts.apply_credit'),
+                'company_gateway_id'  => CompanyGateway::GATEWAY_CREDIT,
+                'gateway_type_id' => GatewayType::CREDIT,
+            ];
         }
 
         return $this;
-        
     }
 
     private function validGatewayForAmount($fees_and_limits_for_payment_type, $amount) :bool
@@ -251,5 +223,4 @@ class PaymentMethod
 
         return true;
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/Services/Client/Statement.php b/app/Services/Client/Statement.php
index 93f9b783768a..0185167aa8cd 100644
--- a/app/Services/Client/Statement.php
+++ b/app/Services/Client/Statement.php
@@ -72,7 +72,7 @@ class Statement
             'template' => $template->elements([
                 'client' => $this->client,
                 'entity' => $this->entity,
-                'pdf_variables' => (array)$this->entity->company->settings->pdf_variables,
+                'pdf_variables' => (array) $this->entity->company->settings->pdf_variables,
                 '$product' => $this->getDesign()->design->product,
                 'variables' => $variables,
                 'invoices' => $this->getInvoices(),
@@ -108,7 +108,6 @@ class Statement
             \DB::connection(config('database.default'))->rollBack();
         }
 
-
         return $pdf;
     }
 
@@ -235,8 +234,9 @@ class Statement
     {
         $status = 'all';
 
-        if(array_key_exists('status', $this->options))
+        if (array_key_exists('status', $this->options)) {
             $status = $this->options['status'];
+        }
 
         switch ($status) {
             case 'all':
@@ -248,7 +248,7 @@ class Statement
             case 'unpaid':
                 return [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL];
                 break;
-            
+
             default:
                 return [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL, Invoice::STATUS_PAID];
                 break;
@@ -263,7 +263,7 @@ class Statement
     protected function getPayments(): \Illuminate\Support\LazyCollection
     {
         return Payment::withTrashed()
-            ->with('client.country','invoices')
+            ->with('client.country', 'invoices')
             ->where('is_deleted', false)
             ->where('company_id', $this->client->company_id)
             ->where('client_id', $this->client->id)
@@ -342,26 +342,32 @@ class Statement
             case '30':
                 $ranges[0] = now()->startOfDay();
                 $ranges[1] = now()->startOfDay()->subDays(30);
+
                 return $ranges;
             case '60':
                 $ranges[0] = now()->startOfDay()->subDays(30);
                 $ranges[1] = now()->startOfDay()->subDays(60);
+
                 return $ranges;
             case '90':
                 $ranges[0] = now()->startOfDay()->subDays(60);
                 $ranges[1] = now()->startOfDay()->subDays(90);
+
                 return $ranges;
             case '120':
                 $ranges[0] = now()->startOfDay()->subDays(90);
                 $ranges[1] = now()->startOfDay()->subDays(120);
+
                 return $ranges;
             case '120+':
                 $ranges[0] = now()->startOfDay()->subDays(120);
                 $ranges[1] = now()->startOfDay()->subYears(20);
+
                 return $ranges;
             default:
                 $ranges[0] = now()->startOfDay()->subDays(0);
                 $ranges[1] = now()->subDays(30);
+
                 return $ranges;
         }
     }
@@ -375,7 +381,7 @@ class Statement
     {
         $id = 1;
 
-        if (!empty($this->client->getSetting('entity_design_id'))) {
+        if (! empty($this->client->getSetting('entity_design_id'))) {
             $id = (int) $this->client->getSetting('entity_design_id');
         }
 
diff --git a/app/Services/ClientPortal/InstantPayment.php b/app/Services/ClientPortal/InstantPayment.php
index ca6184234fbc..9ab3dc581e1e 100644
--- a/app/Services/ClientPortal/InstantPayment.php
+++ b/app/Services/ClientPortal/InstantPayment.php
@@ -34,7 +34,6 @@ use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
 use Illuminate\View\View;
 
-
 class InstantPayment
 {
     use MakesHash;
@@ -49,7 +48,6 @@ class InstantPayment
 
     public function run()
     {
-
         $is_credit_payment = false;
 
         $tokens = [];
@@ -65,11 +63,10 @@ class InstantPayment
          *
          * ['invoice_id' => xxx, 'amount' => 22.00]
          */
-
         $payable_invoices = collect($this->request->payable_invoices);
         $invoices = Invoice::whereIn('id', $this->transformKeys($payable_invoices->pluck('invoice_id')->toArray()))->withTrashed()->get();
 
-        $invoices->each(function($invoice){
+        $invoices->each(function ($invoice) {
             $invoice->service()
                     ->markSent()
                     ->removeUnpaidGatewayFees();
@@ -116,7 +113,7 @@ class InstantPayment
                 $payable_invoice['amount'] = Number::roundValue(($invoice->partial > 0 ? $invoice->partial : $invoice->balance), $client->currency()->precision);
             }
 
-            if (!$settings->client_portal_allow_under_payment && $payable_amount < $invoice_balance) {
+            if (! $settings->client_portal_allow_under_payment && $payable_amount < $invoice_balance) {
                 return redirect()
                     ->route('client.invoices.index')
                     ->with('message', ctrans('texts.minimum_required_payment', ['amount' => $invoice_balance]));
@@ -142,12 +139,11 @@ class InstantPayment
 
             /* If we don't allow over payments and the amount exceeds the balance */
 
-            if (!$settings->client_portal_allow_over_payment && $payable_amount > $invoice_balance) {
+            if (! $settings->client_portal_allow_over_payment && $payable_amount > $invoice_balance) {
                 return redirect()
                     ->route('client.invoices.index')
                     ->with('message', ctrans('texts.over_payments_disabled'));
             }
-
         }
 
         /*Iterate through invoices and add gateway fees and other payment metadata*/
@@ -156,7 +152,6 @@ class InstantPayment
         $payable_invoice_collection = collect();
 
         foreach ($payable_invoices as $payable_invoice) {
-
             $payable_invoice['amount'] = Number::parseFloat($payable_invoice['amount']);
 
             $invoice = $invoices->first(function ($inv) use ($payable_invoice) {
@@ -182,9 +177,8 @@ class InstantPayment
             $payable_invoice_collection->push($payable_invoice);
         }
 
-
-        if ($this->request->has('signature') && !is_null($this->request->signature) && !empty($this->request->signature)) {
-            $invoices->each(function ($invoice){
+        if ($this->request->has('signature') && ! is_null($this->request->signature) && ! empty($this->request->signature)) {
+            $invoices->each(function ($invoice) {
                 InjectSignature::dispatch($invoice, $this->request->signature);
             });
         }
@@ -215,7 +209,7 @@ class InstantPayment
                 ->get();
         }
 
-        if(!$is_credit_payment){
+        if (! $is_credit_payment) {
             $credit_totals = 0;
         }
 
@@ -233,12 +227,11 @@ class InstantPayment
 
         $payment_hash->save();
 
-        if($is_credit_payment){
+        if ($is_credit_payment) {
             $amount_with_fee = max(0, (($invoice_totals + $fee_totals) - $credit_totals));
-        }
-        else{
+        } else {
             $credit_totals = 0;
-            $amount_with_fee = max(0, $invoice_totals + $fee_totals);    
+            $amount_with_fee = max(0, $invoice_totals + $fee_totals);
         }
 
         $totals = [
@@ -263,7 +256,6 @@ class InstantPayment
         }
 
         try {
-
             return $gateway
                 ->driver($client)
                 ->setPaymentMethod($payment_method_id)
@@ -282,12 +274,10 @@ class InstantPayment
 
             throw new PaymentFailed($e->getMessage());
         }
-
     }
 
     public function processCreditPayment(Request $request, array $data)
     {
         return render('gateways.credit.index', $data);
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/Services/Credit/ApplyNumber.php b/app/Services/Credit/ApplyNumber.php
index fd973c2479c8..00f5b7074422 100644
--- a/app/Services/Credit/ApplyNumber.php
+++ b/app/Services/Credit/ApplyNumber.php
@@ -46,34 +46,23 @@ class ApplyNumber extends AbstractService
         return $this->credit;
     }
 
-
     private function trySaving()
     {
+        $x = 1;
 
-        $x=1;
-
-        do{
-
-            try{
-
+        do {
+            try {
                 $this->credit->number = $this->getNextCreditNumber($this->client, $this->credit);
                 $this->credit->saveQuietly();
 
                 $this->completed = false;
-                
-
-            }
-            catch(QueryException $e){
-
+            } catch (QueryException $e) {
                 $x++;
 
-                if($x>10)
+                if ($x > 10) {
                     $this->completed = false;
+                }
             }
-        
-        }
-        while($this->completed);
-
+        } while ($this->completed);
     }
-
 }
diff --git a/app/Services/Credit/ApplyPayment.php b/app/Services/Credit/ApplyPayment.php
index 5fcf4d80509c..a80264c7ecb4 100644
--- a/app/Services/Credit/ApplyPayment.php
+++ b/app/Services/Credit/ApplyPayment.php
@@ -72,7 +72,7 @@ class ApplyPayment
         $this->credit->balance -= $this->amount_applied;
         $this->credit->paid_to_date += $this->amount_applied;
 
-        if ((int)$this->credit->balance == 0) {
+        if ((int) $this->credit->balance == 0) {
             $this->credit->status_id = Credit::STATUS_APPLIED;
         } else {
             $this->credit->status_id = Credit::STATUS_PARTIAL;
@@ -112,11 +112,11 @@ class ApplyPayment
         $this->payment->save();
 
         $this->payment->service()->applyNumber()->save();
-        
+
         $this->payment
              ->invoices()
              ->attach($this->invoice->id, ['amount' => $this->amount_applied]);
-        
+
         $this->payment
              ->credits()
              ->attach($this->credit->id, ['amount' => $this->amount_applied]);
@@ -146,7 +146,7 @@ class ApplyPayment
 
         event(new InvoiceWasUpdated($this->invoice, $this->invoice->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
-        if ((int)$this->invoice->balance == 0) {
+        if ((int) $this->invoice->balance == 0) {
             $this->invoice->service()->deletePdf();
             $this->invoice = $this->invoice->fresh();
             event(new InvoiceWasPaid($this->invoice, $this->payment, $this->payment->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
diff --git a/app/Services/Credit/CreateInvitations.php b/app/Services/Credit/CreateInvitations.php
index d0be3508b176..ccbf461a052c 100644
--- a/app/Services/Credit/CreateInvitations.php
+++ b/app/Services/Credit/CreateInvitations.php
@@ -34,7 +34,7 @@ class CreateInvitations extends AbstractService
     {
         $contacts = $this->credit->client->contacts;
 
-        if($contacts->count() == 0){
+        if ($contacts->count() == 0) {
             $this->createBlankContact();
 
             $this->credit->refresh();
@@ -59,34 +59,32 @@ class CreateInvitations extends AbstractService
             }
         });
 
-        if($this->credit->invitations()->count() == 0) {
-            
-            if($contacts->count() == 0){
+        if ($this->credit->invitations()->count() == 0) {
+            if ($contacts->count() == 0) {
                 $contact = $this->createBlankContact();
-            }
-            else{
+            } else {
                 $contact = $contacts->first();
 
-                    $invitation = CreditInvitation::where('company_id', $this->credit->company_id)
+                $invitation = CreditInvitation::where('company_id', $this->credit->company_id)
                                 ->where('client_contact_id', $contact->id)
                                 ->where('credit_id', $this->credit->id)
                                 ->withTrashed()
                                 ->first();
 
-                    if($invitation){
-                        $invitation->restore();
-                        return $this->credit;
-                    }
+                if ($invitation) {
+                    $invitation->restore();
+
+                    return $this->credit;
+                }
             }
 
-                $ii = CreditInvitationFactory::create($this->credit->company_id, $this->credit->user_id);
-                $ii->key = $this->createDbHash($this->credit->company->db);
-                $ii->credit_id = $this->credit->id;
-                $ii->client_contact_id = $contact->id;
-                $ii->save();
+            $ii = CreditInvitationFactory::create($this->credit->company_id, $this->credit->user_id);
+            $ii->key = $this->createDbHash($this->credit->company->db);
+            $ii->credit_id = $this->credit->id;
+            $ii->client_contact_id = $contact->id;
+            $ii->save();
         }
 
-
         return $this->credit;
     }
 
diff --git a/app/Services/Credit/CreditService.php b/app/Services/Credit/CreditService.php
index 950decd3fd39..eeac8f404766 100644
--- a/app/Services/Credit/CreditService.php
+++ b/app/Services/Credit/CreditService.php
@@ -71,12 +71,11 @@ class CreditService
         return $send_email->run();
     }
 
-
     public function setCalculatedStatus()
     {
-        if ((int)$this->credit->balance == 0) {
+        if ((int) $this->credit->balance == 0) {
             $this->credit->status_id = Credit::STATUS_APPLIED;
-        } elseif ((string)$this->credit->amount == (string)$this->credit->balance) {
+        } elseif ((string) $this->credit->amount == (string) $this->credit->balance) {
             $this->credit->status_id = Credit::STATUS_SENT;
         } elseif ($this->credit->balance > 0) {
             $this->credit->status_id = Credit::STATUS_PARTIAL;
@@ -85,7 +84,7 @@ class CreditService
         return $this;
     }
 
-    /* 
+    /*
         For euro users - we mark a credit as paid when
         we need to document a refund of sorts.
 
@@ -96,8 +95,9 @@ class CreditService
     */
     public function markPaid()
     {
-        if($this->credit->balance > 0)
+        if ($this->credit->balance > 0) {
             return $this;
+        }
 
         $this->markSent();
 
@@ -131,7 +131,7 @@ class CreditService
         $payment
              ->credits()
              ->attach($this->credit->id, ['amount' => $adjustment]);
-        
+
         //reduce client paid_to_date by $this->credit->balance amount
         // $this->credit
         //      ->client
@@ -139,8 +139,8 @@ class CreditService
         //      ->updatePaidToDate($adjustment)
         //      ->save();
 
-         $client = $this->credit->client->fresh();
-         $client->service()
+        $client = $this->credit->client->fresh();
+        $client->service()
                 ->updatePaidToDate($adjustment)
                 ->save();
 
@@ -161,28 +161,28 @@ class CreditService
         $this->credit = (new ApplyPayment($this->credit, $invoice, $amount, $payment))->run();
 
         $this->deletePdf();
-        
+
         return $this;
     }
 
     public function adjustBalance($adjustment)
     {
         $this->credit->balance += $adjustment;
-        
+
         return $this;
     }
 
     public function updatePaidToDate($adjustment)
     {
-         $this->credit->paid_to_date += $adjustment;
-        
+        $this->credit->paid_to_date += $adjustment;
+
         return $this;
     }
 
     public function updateBalance($adjustment)
     {
         $this->credit->balance -= $adjustment;
-        
+
         return $this;
     }
 
@@ -194,11 +194,9 @@ class CreditService
     public function touchPdf($force = false)
     {
         try {
-        
-            if($force){
-
+            if ($force) {
                 $this->credit->invitations->each(function ($invitation) {
-                    CreateEntityPdf::dispatchNow($invitation);
+                    (new CreateEntityPdf($invitation))->handle();
                 });
 
                 return $this;
@@ -207,12 +205,8 @@ class CreditService
             $this->credit->invitations->each(function ($invitation) {
                 CreateEntityPdf::dispatch($invitation);
             });
-        
-        }
-        catch(\Exception $e){
-
-            nlog("failed creating invoices in Touch PDF");
-        
+        } catch (\Exception $e) {
+            nlog('failed creating invoices in Touch PDF');
         }
 
         return $this;
@@ -222,32 +216,34 @@ class CreditService
     {
         $settings = $this->credit->client->getMergedSettings();
 
-        if (! $this->credit->design_id) 
+        if (! $this->credit->design_id) {
             $this->credit->design_id = $this->decodePrimaryKey($settings->credit_design_id);
-        
-        if (!isset($this->credit->footer)) 
-            $this->credit->footer = $settings->credit_footer;
+        }
 
-        if (!isset($this->credit->terms)) 
+        if (! isset($this->credit->footer)) {
+            $this->credit->footer = $settings->credit_footer;
+        }
+
+        if (! isset($this->credit->terms)) {
             $this->credit->terms = $settings->credit_terms;
+        }
 
         /* If client currency differs from the company default currency, then insert the client exchange rate on the model.*/
-        if(!isset($this->credit->exchange_rate) && $this->credit->client->currency()->id != (int) $this->credit->company->settings->currency_id)
+        if (! isset($this->credit->exchange_rate) && $this->credit->client->currency()->id != (int) $this->credit->company->settings->currency_id) {
             $this->credit->exchange_rate = $this->credit->client->currency()->exchange_rate;
+        }
 
-        if (!isset($this->credit->public_notes)) 
+        if (! isset($this->credit->public_notes)) {
             $this->credit->public_notes = $this->credit->client->public_notes;
+        }
 
-        
         return $this;
     }
 
     public function deletePdf()
     {
-        $this->credit->invitations->each(function ($invitation){
-
-        UnlinkFile::dispatchNow(config('filesystems.default'), $this->credit->client->credit_filepath($invitation) . $this->credit->numberFormatter().'.pdf');
-
+        $this->credit->invitations->each(function ($invitation) {
+            (new UnlinkFile(config('filesystems.default'), $this->credit->client->credit_filepath($invitation).$this->credit->numberFormatter().'.pdf'))->handle();
         });
 
         return $this;
@@ -259,7 +255,7 @@ class CreditService
 
         return $this;
     }
-    
+
     /**
      * Saves the credit.
      * @return Credit object
diff --git a/app/Services/Credit/GetCreditPdf.php b/app/Services/Credit/GetCreditPdf.php
index dbbc539812f5..1b6ce982ebd0 100644
--- a/app/Services/Credit/GetCreditPdf.php
+++ b/app/Services/Credit/GetCreditPdf.php
@@ -44,8 +44,7 @@ class GetCreditPdf extends AbstractService
         // $disk = 'public';
         $disk = config('filesystems.default');
 
-        $file_path = CreateEntityPdf::dispatchNow($this->invitation);
-
+        $file_path = (new CreateEntityPdf($this->invitation))->handle();
         return $file_path;
     }
 }
diff --git a/app/Services/Credit/SendEmail.php b/app/Services/Credit/SendEmail.php
index 6432aaed44f2..f7c2d5835745 100644
--- a/app/Services/Credit/SendEmail.php
+++ b/app/Services/Credit/SendEmail.php
@@ -44,11 +44,8 @@ class SendEmail
         }
 
         $this->credit->invitations->each(function ($invitation) {
-            if (!$invitation->contact->trashed() && $invitation->contact->email) {
-                
-                // $email_builder = (new CreditEmail())->build($invitation, $this->reminder_template);
-                // EmailCredit::dispatchNow($email_builder, $invitation, $invitation->company);
-                EmailEntity::dispatchNow($invitation, $invitation->company, $this->reminder_template);
+            if (! $invitation->contact->trashed() && $invitation->contact->email) {
+                EmailEntity::dispatch($invitation, $invitation->company, $this->reminder_template);
             }
         });
 
diff --git a/app/Services/Credit/TriggeredActions.php b/app/Services/Credit/TriggeredActions.php
index 7079b85421f5..dc4424be8d30 100644
--- a/app/Services/Credit/TriggeredActions.php
+++ b/app/Services/Credit/TriggeredActions.php
@@ -36,7 +36,6 @@ class TriggeredActions extends AbstractService
 
     public function run()
     {
-
         if ($this->request->has('send_email') && $this->request->input('send_email') == 'true') {
             $this->credit = $this->credit->service()->markSent()->save();
             $this->sendEmail();
@@ -46,13 +45,11 @@ class TriggeredActions extends AbstractService
             $this->credit = $this->credit->service()->markSent()->save();
         }
 
-        
         return $this->credit;
     }
 
     private function sendEmail()
     {
-
         $reminder_template = $this->credit->calculateTemplate('credit');
 
         $this->credit->invitations->load('contact.client.country', 'credit.client.country', 'credit.company')->each(function ($invitation) use ($reminder_template) {
diff --git a/app/Services/Invoice/AddGatewayFee.php b/app/Services/Invoice/AddGatewayFee.php
index b8baa72afd4b..997b89f7976d 100644
--- a/app/Services/Invoice/AddGatewayFee.php
+++ b/app/Services/Invoice/AddGatewayFee.php
@@ -45,23 +45,25 @@ class AddGatewayFee extends AbstractService
     {
         $gateway_fee = round($this->company_gateway->calcGatewayFee($this->amount, $this->gateway_type_id, $this->invoice->uses_inclusive_taxes), $this->invoice->client->currency()->precision);
 
-        if (!$gateway_fee) 
+        if (! $gateway_fee) {
             return $this->invoice;
+        }
 
         // Removes existing stale gateway fees
         $this->cleanPendingGatewayFees();
 
         // If a gateway fee is > 0 insert the line item
-        if ($gateway_fee > 0) 
+        if ($gateway_fee > 0) {
             return $this->processGatewayFee($gateway_fee);
-        
-        // If we have reached this far, then we are apply a gateway discount    
+        }
+
+        // If we have reached this far, then we are apply a gateway discount
         return $this->processGatewayDiscount($gateway_fee);
     }
 
     private function cleanPendingGatewayFees()
     {
-        $invoice_items = (array)$this->invoice->line_items;
+        $invoice_items = (array) $this->invoice->line_items;
 
         $invoice_items = collect($invoice_items)->filter(function ($item) {
             return $item->type_id != '3';
@@ -94,7 +96,7 @@ class AddGatewayFee extends AbstractService
             $invoice_item->tax_rate3 = $fees_and_limits->fee_tax_rate3;
         }
 
-        $invoice_items = (array)$this->invoice->line_items;
+        $invoice_items = (array) $this->invoice->line_items;
         $invoice_items[] = $invoice_item;
 
         $this->invoice->line_items = $invoice_items;
@@ -104,8 +106,7 @@ class AddGatewayFee extends AbstractService
 
         $new_balance = $this->invoice->balance;
 
-        if(floatval($new_balance) - floatval($balance) != 0)
-        {
+        if (floatval($new_balance) - floatval($balance) != 0) {
             $adjustment = $new_balance - $balance;
 
             $this->invoice
@@ -129,7 +130,7 @@ class AddGatewayFee extends AbstractService
         App::forgetInstance('translator');
         $t = app('translator');
         $t->replace(Ninja::transformTranslations($this->invoice->company->settings));
-        
+
         $invoice_item = new InvoiceItem;
         $invoice_item->type_id = '3';
         $invoice_item->product_key = ctrans('texts.discount');
@@ -143,7 +144,7 @@ class AddGatewayFee extends AbstractService
             $invoice_item->tax_rate3 = $fees_and_limits->fee_tax_rate3;
         }
 
-        $invoice_items = (array)$this->invoice->line_items;
+        $invoice_items = (array) $this->invoice->line_items;
         $invoice_items[] = $invoice_item;
 
         $this->invoice->line_items = $invoice_items;
@@ -152,9 +153,7 @@ class AddGatewayFee extends AbstractService
 
         $new_balance = $this->invoice->balance;
 
-
-        if(floatval($new_balance) - floatval($balance) != 0)
-        {
+        if (floatval($new_balance) - floatval($balance) != 0) {
             $adjustment = $new_balance - $balance;
 
             $this->invoice
@@ -168,7 +167,6 @@ class AddGatewayFee extends AbstractService
             ->updateInvoiceBalance($adjustment * -1, 'Adjustment for adding gateway fee');
         }
 
-
         return $this->invoice;
     }
 }
diff --git a/app/Services/Invoice/ApplyPayment.php b/app/Services/Invoice/ApplyPayment.php
index be9e42767252..eea48ba3974e 100644
--- a/app/Services/Invoice/ApplyPayment.php
+++ b/app/Services/Invoice/ApplyPayment.php
@@ -35,70 +35,48 @@ class ApplyPayment extends AbstractService
     /* Apply payment to a single invoice */
     public function run()
     {
-
         $this->invoice->fresh('client');
- 
+
         $amount_paid = 0;
 
         if ($this->invoice->hasPartial()) {
-            
-            if ($this->invoice->partial == $this->payment_amount) 
-            {
+            if ($this->invoice->partial == $this->payment_amount) {
 
                 //is partial and amount is exactly the partial amount
 
                 $amount_paid = $this->payment_amount * -1;
 
                 $this->invoice->service()->clearPartial()->setDueDate()->setStatus(Invoice::STATUS_PARTIAL)->updateBalance($amount_paid)->save();
-
-            } 
-            elseif ($this->invoice->partial > 0 && $this->invoice->partial > $this->payment_amount) 
-            { 
+            } elseif ($this->invoice->partial > 0 && $this->invoice->partial > $this->payment_amount) {
                 //partial amount exists, but the amount is less than the partial amount
-            
+
                 $amount_paid = $this->payment_amount * -1;
 
                 $this->invoice->service()->updatePartial($amount_paid)->updateBalance($amount_paid)->save();
-            
-            } 
-            elseif ($this->invoice->partial > 0 && $this->invoice->partial < $this->payment_amount) 
-            { 
+            } elseif ($this->invoice->partial > 0 && $this->invoice->partial < $this->payment_amount) {
                 //partial exists and the amount paid is GREATER than the partial amount
 
                 $amount_paid = $this->payment_amount * -1;
-            
-                $this->invoice->service()->clearPartial()->setDueDate()->setStatus(Invoice::STATUS_PARTIAL)->updateBalance($amount_paid)->save();
-            
-            }
 
-        } 
-        else 
-        {
-            if ($this->payment_amount == $this->invoice->balance) 
-            {   
+                $this->invoice->service()->clearPartial()->setDueDate()->setStatus(Invoice::STATUS_PARTIAL)->updateBalance($amount_paid)->save();
+            }
+        } else {
+            if ($this->payment_amount == $this->invoice->balance) {
                 $amount_paid = $this->payment_amount * -1;
 
                 $this->invoice->service()->clearPartial()->setStatus(Invoice::STATUS_PAID)->updateBalance($amount_paid)->save();
-
-            } 
-            elseif ($this->payment_amount < $this->invoice->balance) 
-            { 
+            } elseif ($this->payment_amount < $this->invoice->balance) {
                 //partial invoice payment made
 
                 $amount_paid = $this->payment_amount * -1;
 
                 $this->invoice->service()->clearPartial()->setStatus(Invoice::STATUS_PARTIAL)->updateBalance($amount_paid)->save();
-
-            
-            } 
-            elseif ($this->payment_amount > $this->invoice->balance) 
-            {   
+            } elseif ($this->payment_amount > $this->invoice->balance) {
                 //partial invoice payment made
 
                 $amount_paid = $this->invoice->balance * -1;
-                
+
                 $this->invoice->service()->clearPartial()->setStatus(Invoice::STATUS_PAID)->updateBalance($amount_paid)->save();
-            
             }
         }
 
@@ -107,7 +85,7 @@ class ApplyPayment extends AbstractService
              ->updatePaymentBalance($amount_paid);
 
         // nlog("updating client balance by amount {$amount_paid}");
-        
+
         $this->invoice
              ->client
              ->service()
@@ -115,17 +93,14 @@ class ApplyPayment extends AbstractService
              ->save();
 
         /* Update Pivot Record amount */
-        $this->payment->invoices->each(function ($inv) use($amount_paid){
-
+        $this->payment->invoices->each(function ($inv) use ($amount_paid) {
             if ($inv->id == $this->invoice->id) {
-
-                $inv->pivot->amount = ($amount_paid*-1);
+                $inv->pivot->amount = ($amount_paid * -1);
                 $inv->pivot->save();
 
-                $inv->paid_to_date += floatval($amount_paid*-1);         
+                $inv->paid_to_date += floatval($amount_paid * -1);
                 $inv->save();
             }
-
         });
 
         $this->invoice->service()->applyNumber()->workFlow()->save();
diff --git a/app/Services/Invoice/ApplyPaymentAmount.php b/app/Services/Invoice/ApplyPaymentAmount.php
index 70333384dd04..992d38cb52c5 100644
--- a/app/Services/Invoice/ApplyPaymentAmount.php
+++ b/app/Services/Invoice/ApplyPaymentAmount.php
@@ -50,8 +50,9 @@ class ApplyPaymentAmount extends AbstractService
             return $this->invoice;
         }
 
-        if($this->amount == 0)
+        if ($this->amount == 0) {
             return $this->invoice;
+        }
 
         /* Create Payment */
         $payment = PaymentFactory::create($this->invoice->company_id, $this->invoice->user_id);
@@ -74,7 +75,7 @@ class ApplyPaymentAmount extends AbstractService
         ]);
 
         $this->invoice->next_send_date = null;
-        
+
         $this->invoice->service()
                 ->setExchangeRate()
                 ->updateBalance($payment->amount * -1)
@@ -91,9 +92,10 @@ class ApplyPaymentAmount extends AbstractService
             ->updatePaidToDate($payment->amount)
             ->save();
 
-        if ($this->invoice->client->getSetting('client_manual_payment_notification')) 
+        if ($this->invoice->client->getSetting('client_manual_payment_notification')) {
             $payment->service()->sendEmail();
-        
+        }
+
         /* Update Invoice balance */
 
         $payment->ledger()
@@ -104,30 +106,27 @@ class ApplyPaymentAmount extends AbstractService
         event('eloquent.created: App\Models\Payment', $payment);
         event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
         event(new InvoiceWasPaid($this->invoice, $payment, $payment->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
-        
+
         return $this->invoice;
     }
 
     private function setExchangeRate(Payment $payment)
     {
-
-        if($payment->exchange_rate != 1)
+        if ($payment->exchange_rate != 1) {
             return;
+        }
 
         $client_currency = $payment->client->getSetting('currency_id');
         $company_currency = $payment->client->company->settings->currency_id;
 
         if ($company_currency != $client_currency) {
-
             $exchange_rate = new CurrencyApi();
 
             $payment->exchange_rate = $exchange_rate->exchangeRate($client_currency, $company_currency, Carbon::parse($payment->date));
             //$payment->exchange_currency_id = $client_currency; // 23/06/2021
             $payment->exchange_currency_id = $company_currency;
-        
+
             $payment->saveQuietly();
-
         }
-
     }
 }
diff --git a/app/Services/Invoice/ApplyRecurringNumber.php b/app/Services/Invoice/ApplyRecurringNumber.php
index f1aab7710228..1ef07df11137 100644
--- a/app/Services/Invoice/ApplyRecurringNumber.php
+++ b/app/Services/Invoice/ApplyRecurringNumber.php
@@ -62,30 +62,21 @@ class ApplyRecurringNumber extends AbstractService
 
     private function trySaving()
     {
+        $x = 1;
 
-        $x=1;
-
-        do{
-
-            try{
-
+        do {
+            try {
                 $this->invoice->number = $this->getNextRecurringInvoiceNumber($this->client, $this->invoice);
                 $this->invoice->saveQuietly();
 
                 $this->completed = false;
-                
-
-            }
-            catch(QueryException $e){
-
+            } catch (QueryException $e) {
                 $x++;
 
-                if($x>10)
+                if ($x > 10) {
                     $this->completed = false;
+                }
             }
-        
-        }
-        while($this->completed);
-
+        } while ($this->completed);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/Invoice/AutoBillInvoice.php b/app/Services/Invoice/AutoBillInvoice.php
index fa0f8f0bea05..8e1c0861e5ab 100644
--- a/app/Services/Invoice/AutoBillInvoice.php
+++ b/app/Services/Invoice/AutoBillInvoice.php
@@ -44,7 +44,6 @@ class AutoBillInvoice extends AbstractService
 
     public function run()
     {
-
         MultiDB::setDb($this->db);
 
         $this->client = $this->invoice->client->fresh();
@@ -52,19 +51,22 @@ class AutoBillInvoice extends AbstractService
         $is_partial = false;
 
         /* Is the invoice payable? */
-        if (! $this->invoice->isPayable())
+        if (! $this->invoice->isPayable()) {
             return $this->invoice;
+        }
 
         /* Mark the invoice as sent */
         $this->invoice = $this->invoice->service()->markSent()->save();
 
         /* Mark the invoice as paid if there is no balance */
-        if ((int)$this->invoice->balance == 0)
+        if ((int) $this->invoice->balance == 0) {
             return $this->invoice->service()->markPaid()->save();
+        }
 
         //if the credits cover the payments, we stop here, build the payment with credits and exit early
-        if ($this->client->getSetting('use_credits_payment') != 'off')
+        if ($this->client->getSetting('use_credits_payment') != 'off') {
             $this->applyCreditPayment();
+        }
 
         $amount = 0;
 
@@ -85,24 +87,27 @@ class AutoBillInvoice extends AbstractService
         $gateway_token = $this->getGateway($amount);
 
         /* Bail out if no payment methods available */
-        if (! $gateway_token || ! $gateway_token->gateway || ! $gateway_token->gateway->driver($this->client)->token_billing){
-            nlog("Bailing out - no suitable gateway token found.");
+        if (! $gateway_token || ! $gateway_token->gateway || ! $gateway_token->gateway->driver($this->client)->token_billing) {
+            nlog('Bailing out - no suitable gateway token found.');
+
             return $this->invoice;
         }
 
-        nlog("Gateway present - adding gateway fee");
+        nlog('Gateway present - adding gateway fee');
 
         /* $gateway fee */
         $this->invoice = $this->invoice->service()->addGatewayFee($gateway_token->gateway, $gateway_token->gateway_type_id, $amount)->save();
 
         //change from $this->invoice->amount to $this->invoice->balance
-        if($is_partial)
+        if ($is_partial) {
             $fee = $this->invoice->balance - $invoice_total;
-        else
+        } else {
             $fee = $this->invoice->balance - $amount;
+        }
 
-        if($fee > $amount)
+        if ($fee > $amount) {
             $fee = 0;
+        }
 
         /* Build payment hash */
 
@@ -114,7 +119,7 @@ class AutoBillInvoice extends AbstractService
         ]);
 
         nlog("Payment hash created => {$payment_hash->id}");
-      
+
         $payment = false;
 
         try {
@@ -123,7 +128,6 @@ class AutoBillInvoice extends AbstractService
                 ->setPaymentHash($payment_hash)
                 ->tokenBilling($gateway_token, $payment_hash);
         } catch (\Exception $e) {
-
             $this->invoice->auto_bill_tries += 1;
 
             if ($this->invoice->auto_bill_tries == 3) {
@@ -131,16 +135,15 @@ class AutoBillInvoice extends AbstractService
                 $this->invoice->auto_bill_tries = 0; //reset the counter here in case auto billing is turned on again in the future.
                 $this->invoice->save();
             }
-            
+
             $this->invoice->save();
-            
-            nlog("payment NOT captured for " . $this->invoice->number . " with error " . $e->getMessage());
+
+            nlog('payment NOT captured for '.$this->invoice->number.' with error '.$e->getMessage());
         }
 
         if ($payment) {
-            info("Auto Bill payment captured for " . $this->invoice->number);
+            info('Auto Bill payment captured for '.$this->invoice->number);
         }
-
     }
 
     /**
@@ -175,14 +178,13 @@ class AutoBillInvoice extends AbstractService
             $payment->credits()
                     ->attach($current_credit->id, ['amount' => $credit['amount']]);
 
-            info("adjusting credit balance {$current_credit->balance} by this amount ". $credit['amount']);
+            info("adjusting credit balance {$current_credit->balance} by this amount ".$credit['amount']);
 
             $current_credit->service()
-                           ->adjustBalance($credit['amount']*-1)
+                           ->adjustBalance($credit['amount'] * -1)
                            ->updatePaidToDate($credit['amount'])
                            ->setCalculatedStatus()
                            ->save();
-
         }
 
         $payment->ledger()
@@ -229,7 +231,7 @@ class AutoBillInvoice extends AbstractService
 
         info("available credit balance = {$available_credit_balance}");
 
-        if ((int)$available_credit_balance == 0) {
+        if ((int) $available_credit_balance == 0) {
             return;
         }
 
@@ -283,8 +285,6 @@ class AutoBillInvoice extends AbstractService
         return $this;
     }
 
-
-
     private function applyPaymentToCredit($credit, $amount) :Credit
     {
         $credit_item = new InvoiceItem;
@@ -312,7 +312,6 @@ class AutoBillInvoice extends AbstractService
      * @param  float              $amount The amount to charge
      * @return ClientGatewayToken         The client gateway token
      */
-
     public function getGateway($amount)
     {
 
@@ -320,39 +319,34 @@ class AutoBillInvoice extends AbstractService
         $gateway_tokens = $this->client
                                ->gateway_tokens()
                                ->whereHas('gateway', function ($query) {
-                                    $query->where('is_deleted',0)
-                                          ->where('deleted_at', NULL);
-                             })->orderBy('is_default', 'DESC')
+                                   $query->where('is_deleted', 0)
+                                          ->where('deleted_at', null);
+                               })->orderBy('is_default', 'DESC')
                                ->get();
 
-
-        $filtered_gateways = $gateway_tokens->filter(function ($gateway_token) use($amount) {
-
+        $filtered_gateways = $gateway_tokens->filter(function ($gateway_token) use ($amount) {
             $company_gateway = $gateway_token->gateway;
 
             //check if fees and limits are set
-            if (isset($company_gateway->fees_and_limits) && !is_array($company_gateway->fees_and_limits) && property_exists($company_gateway->fees_and_limits, $gateway_token->gateway_type_id))
-            {
+            if (isset($company_gateway->fees_and_limits) && ! is_array($company_gateway->fees_and_limits) && property_exists($company_gateway->fees_and_limits, $gateway_token->gateway_type_id)) {
                 //if valid we keep this gateway_token
-                if ($this->invoice->client->validGatewayForAmount($company_gateway->fees_and_limits->{$gateway_token->gateway_type_id}, $amount))
+                if ($this->invoice->client->validGatewayForAmount($company_gateway->fees_and_limits->{$gateway_token->gateway_type_id}, $amount)) {
                     return true;
-                else
+                } else {
                     return false;
-
+                }
             }
-            return true; //if no fees_and_limits set then we automatically must add this gateway
 
+            return true; //if no fees_and_limits set then we automatically must add this gateway
         });
 
-        if($filtered_gateways->count() >= 1)
+        if ($filtered_gateways->count() >= 1) {
             return $filtered_gateways->first();
+        }
 
         return false;
     }
 
-
-
-
     /**
      * Adds a gateway fee to the invoice.
      *
@@ -386,5 +380,4 @@ class AutoBillInvoice extends AbstractService
 
         return $this;
     }
-
 }
diff --git a/app/Services/Invoice/CreateInvitations.php b/app/Services/Invoice/CreateInvitations.php
index 08dba19a7c56..eee256b201ab 100644
--- a/app/Services/Invoice/CreateInvitations.php
+++ b/app/Services/Invoice/CreateInvitations.php
@@ -22,7 +22,7 @@ use Illuminate\Support\Str;
 class CreateInvitations extends AbstractService
 {
     use MakesHash;
-    
+
     private $invoice;
 
     public function __construct(Invoice $invoice)
@@ -32,10 +32,9 @@ class CreateInvitations extends AbstractService
 
     public function run()
     {
-
         $contacts = $this->invoice->client->contacts()->where('send_email', true)->get();
 
-        if($contacts->count() == 0){
+        if ($contacts->count() == 0) {
             $this->createBlankContact();
 
             $this->invoice->refresh();
@@ -60,31 +59,30 @@ class CreateInvitations extends AbstractService
             }
         });
 
-        if($this->invoice->invitations()->count() == 0) {
-            
-            if($contacts->count() == 0){
+        if ($this->invoice->invitations()->count() == 0) {
+            if ($contacts->count() == 0) {
                 $contact = $this->createBlankContact();
-            }
-            else{
+            } else {
                 $contact = $contacts->first();
 
-                            $invitation = InvoiceInvitation::where('company_id', $this->invoice->company_id)
+                $invitation = InvoiceInvitation::where('company_id', $this->invoice->company_id)
                                         ->where('client_contact_id', $contact->id)
                                         ->where('invoice_id', $this->invoice->id)
                                         ->withTrashed()
                                         ->first();
 
-                            if($invitation){
-                                $invitation->restore();
-                                return $this->invoice;
-                            }
+                if ($invitation) {
+                    $invitation->restore();
+
+                    return $this->invoice;
+                }
             }
 
-                $ii = InvoiceInvitationFactory::create($this->invoice->company_id, $this->invoice->user_id);
-                $ii->key = $this->createDbHash($this->invoice->company->db);
-                $ii->invoice_id = $this->invoice->id;
-                $ii->client_contact_id = $contact->id;
-                $ii->save();
+            $ii = InvoiceInvitationFactory::create($this->invoice->company_id, $this->invoice->user_id);
+            $ii->key = $this->createDbHash($this->invoice->company->db);
+            $ii->invoice_id = $this->invoice->id;
+            $ii->client_contact_id = $contact->id;
+            $ii->save();
         }
 
         return $this->invoice;
diff --git a/app/Services/Invoice/GenerateDeliveryNote.php b/app/Services/Invoice/GenerateDeliveryNote.php
index 39851845ff77..6357049122b3 100644
--- a/app/Services/Invoice/GenerateDeliveryNote.php
+++ b/app/Services/Invoice/GenerateDeliveryNote.php
@@ -95,21 +95,20 @@ class GenerateDeliveryNote
 
         // Storage::makeDirectory($this->invoice->client->invoice_filepath(), 0775);
 
-            if(config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja'){
-                $pdf = (new NinjaPdf())->build($maker->getCompiledHTML(true));
-            }
-            else {
-                $pdf = $this->makePdf(null, null, $maker->getCompiledHTML());
-            }
+        if (config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja') {
+            $pdf = (new NinjaPdf())->build($maker->getCompiledHTML(true));
+        } else {
+            $pdf = $this->makePdf(null, null, $maker->getCompiledHTML());
+        }
 
         if (config('ninja.log_pdf_html')) {
             info($maker->getCompiledHTML());
         }
 
-        if(!Storage::disk($this->disk)->exists($this->invoice->client->invoice_filepath($invitation)))
-
+        if (! Storage::disk($this->disk)->exists($this->invoice->client->invoice_filepath($invitation))) {
             Storage::disk($this->disk)->makeDirectory($this->invoice->client->invoice_filepath($invitation), 0775);
-            Storage::disk($this->disk)->put($file_path, $pdf, 'public');
+        }
+        Storage::disk($this->disk)->put($file_path, $pdf, 'public');
 
         return $file_path;
     }
diff --git a/app/Services/Invoice/GetInvoicePdf.php b/app/Services/Invoice/GetInvoicePdf.php
index 2b3ab1c9c8a7..16ff30c38bb8 100644
--- a/app/Services/Invoice/GetInvoicePdf.php
+++ b/app/Services/Invoice/GetInvoicePdf.php
@@ -29,15 +29,15 @@ class GetInvoicePdf extends AbstractService
 
     public function run()
     {
-
         if (! $this->contact) {
             $this->contact = $this->invoice->client->primary_contact()->first() ?: $this->invoice->client->contacts()->first();
         }
 
         $invitation = $this->invoice->invitations->where('client_contact_id', $this->contact->id)->first();
 
-        if(!$invitation)
+        if (! $invitation) {
             $invitation = $this->invoice->invitations->first();
+        }
 
         $path = $this->invoice->client->invoice_filepath($invitation);
 
@@ -49,10 +49,9 @@ class GetInvoicePdf extends AbstractService
         $file = Storage::disk($disk)->exists($file_path);
 
         if (! $file) {
-            $file_path = CreateEntityPdf::dispatchNow($invitation);
+            $file_path = (new CreateEntityPdf($invitation))->handle();
         }
 
         return $file_path;
-        
     }
 }
diff --git a/app/Services/Invoice/HandleCancellation.php b/app/Services/Invoice/HandleCancellation.php
index 115d5c0a4ba8..e589cadf48a0 100644
--- a/app/Services/Invoice/HandleCancellation.php
+++ b/app/Services/Invoice/HandleCancellation.php
@@ -54,7 +54,7 @@ class HandleCancellation extends AbstractService
         $this->invoice->fresh();
 
         $this->invoice->service()->workFlow()->save();
-        
+
         event(new InvoiceWasCancelled($this->invoice, $this->invoice->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
         $transaction = [
@@ -80,7 +80,7 @@ class HandleCancellation extends AbstractService
 
         $this->invoice->ledger()->updateInvoiceBalance($adjustment, "Invoice {$this->invoice->number} reversal");
         $this->invoice->fresh();
-        
+
         /* Reverse the invoice status and balance */
         $this->invoice->balance += $adjustment;
         $this->invoice->status_id = $cancellation->status_id;
@@ -93,7 +93,7 @@ class HandleCancellation extends AbstractService
         $this->invoice->backup = $backup;
         $this->invoice->saveQuietly();
         $this->invoice->fresh();
-        
+
         return $this->invoice;
     }
 
diff --git a/app/Services/Invoice/HandleRestore.php b/app/Services/Invoice/HandleRestore.php
index 9db059b450d3..8001c51556a2 100644
--- a/app/Services/Invoice/HandleRestore.php
+++ b/app/Services/Invoice/HandleRestore.php
@@ -32,17 +32,16 @@ class HandleRestore extends AbstractService
     public function run()
     {
         $this->invoice->restore();
-        
-        if (!$this->invoice->is_deleted) {
+
+        if (! $this->invoice->is_deleted) {
             return $this->invoice;
         }
 
         //determine whether we need to un-delete payments OR just modify the payment amount /applied balances.
-        
+
         foreach ($this->invoice->payments as $payment) {
             //restore the payment record
             $this->invoice->restore();
-
         }
 
         //adjust ledger balance
@@ -54,14 +53,13 @@ class HandleRestore extends AbstractService
 
         $this->invoice->is_deleted = false;
         $this->invoice->save();
-        
+
         return $this->invoice;
     }
 
-
     private function windBackInvoiceNumber()
     {
-        $findme = '_' . ctrans('texts.deleted');
+        $findme = '_'.ctrans('texts.deleted');
 
         $pos = strpos($this->invoice->number, $findme);
 
@@ -70,22 +68,22 @@ class HandleRestore extends AbstractService
         if (strlen($new_invoice_number) == 0) {
             $new_invoice_number = null;
         }
-        
-        try {
 
+        try {
             $exists = Invoice::where(['company_id' => $this->invoice->company_id, 'number' => $new_invoice_number])->exists();
 
-            if($exists)
+            if ($exists) {
                 $this->invoice->number = $this->getNextInvoiceNumber($this->invoice->client, $this->invoice, $this->invoice->recurring_id);
-            else
-            $this->invoice->number = $new_invoice_number;
-            
+            } else {
+                $this->invoice->number = $new_invoice_number;
+            }
+
             $this->invoice->saveQuietly();
         } catch (\Exception $e) {
-            nlog("I could not wind back the invoice number");
+            nlog('I could not wind back the invoice number');
 
-            if(Ninja::isHosted()){
-                \Sentry\captureMessage("I could not wind back the invoice number");
+            if (Ninja::isHosted()) {
+                \Sentry\captureMessage('I could not wind back the invoice number');
                 app('sentry')->captureException($e);
             }
         }
diff --git a/app/Services/Invoice/HandleReversal.php b/app/Services/Invoice/HandleReversal.php
index 7def94e50856..03066b6a7c96 100644
--- a/app/Services/Invoice/HandleReversal.php
+++ b/app/Services/Invoice/HandleReversal.php
@@ -40,12 +40,14 @@ class HandleReversal extends AbstractService
     public function run()
     {
         /* Check again!! */
-        if (! $this->invoice->invoiceReversable($this->invoice)) 
+        if (! $this->invoice->invoiceReversable($this->invoice)) {
             return $this->invoice;
+        }
 
         /* If the invoice has been cancelled - we need to unwind the cancellation before reversing*/
-        if ($this->invoice->status_id == Invoice::STATUS_CANCELLED) 
+        if ($this->invoice->status_id == Invoice::STATUS_CANCELLED) {
             $this->invoice = $this->invoice->service()->reverseCancellation()->save();
+        }
 
         $balance_remaining = $this->invoice->balance;
 
@@ -60,7 +62,7 @@ class HandleReversal extends AbstractService
 
             //new concept - when reversing, we unwind the payments
             $payment = Payment::withTrashed()->find($paymentable->payment_id);
-            
+
             $reversable_amount = $paymentable->amount - $paymentable->refunded;
             $total_paid -= $reversable_amount;
 
@@ -69,20 +71,19 @@ class HandleReversal extends AbstractService
 
             $paymentable->amount = $paymentable->refunded;
             $paymentable->save();
-
         });
 
         /* Generate a credit for the $total_paid amount */
         $notes = 'Credit for reversal of '.$this->invoice->number;
         $credit = false;
-        
+
         // if ($total_paid > 0) {
 
         //     $credit = CreditFactory::create($this->invoice->company_id, $this->invoice->user_id);
         //     $credit->client_id = $this->invoice->client_id;
         //     $credit->invoice_id = $this->invoice->id;
         //     $credit->date = now();
-            
+
         //     $item = InvoiceItemFactory::create();
         //     $item->quantity = 1;
         //     $item->cost = (float) $total_paid;
@@ -124,7 +125,7 @@ class HandleReversal extends AbstractService
 
         $this->invoice->balance = 0;
         $this->invoice->paid_to_date = 0;
-        
+
         /* Set invoice status to reversed... somehow*/
         $this->invoice->service()->setStatus(Invoice::STATUS_REVERSED)->save();
 
diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php
index 6da6423975b5..c20594a03e3a 100644
--- a/app/Services/Invoice/InvoiceService.php
+++ b/app/Services/Invoice/InvoiceService.php
@@ -80,15 +80,14 @@ class InvoiceService
      */
     public function setExchangeRate()
     {
-
-        if($this->invoice->exchange_rate != 1)
+        if ($this->invoice->exchange_rate != 1) {
             return $this;
+        }
 
         $client_currency = $this->invoice->client->getSetting('currency_id');
         $company_currency = $this->invoice->company->settings->currency_id;
 
         if ($company_currency != $client_currency) {
-
             $exchange_rate = new CurrencyApi();
 
             $this->invoice->exchange_rate = $exchange_rate->exchangeRate($client_currency, $company_currency, now());
@@ -96,6 +95,7 @@ class InvoiceService
 
         return $this;
     }
+
     /**
      * Applies the recurring invoice number.
      * @return $this InvoiceService object
@@ -124,7 +124,6 @@ class InvoiceService
 
     public function addGatewayFee(CompanyGateway $company_gateway, $gateway_type_id, float $amount)
     {
-
         $this->invoice = (new AddGatewayFee($company_gateway, $gateway_type_id, $this->invoice, $amount))->run();
 
         return $this;
@@ -141,22 +140,22 @@ class InvoiceService
      */
     public function updateBalance($balance_adjustment, bool $is_draft = false)
     {
+        if ((bool) $this->invoice->is_deleted !== false) {
+            nlog($this->invoice->number.' is deleted returning');
 
-        if ((bool)$this->invoice->is_deleted !== false) {
-            nlog($this->invoice->number . " is deleted returning");
             return $this;
         }
 
         $this->invoice->balance += $balance_adjustment;
-        
-        if (round($this->invoice->balance,2) == 0 && !$is_draft) {
+
+        if (round($this->invoice->balance, 2) == 0 && ! $is_draft) {
             $this->invoice->status_id = Invoice::STATUS_PAID;
         }
 
-        if ((int)$this->invoice->balance == 0) {
+        if ((int) $this->invoice->balance == 0) {
             $this->invoice->next_send_date = null;
         }
-            
+
         return $this;
     }
 
@@ -179,7 +178,7 @@ class InvoiceService
         $this->invoice = (new MarkSent($this->invoice->client, $this->invoice))->run();
 
         $this->setExchangeRate();
-        
+
         return $this;
     }
 
@@ -188,7 +187,7 @@ class InvoiceService
         return (new GetInvoicePdf($this->invoice, $contact))->run();
     }
 
-    public function getInvoiceDeliveryNote(\App\Models\Invoice $invoice, \App\Models\ClientContact $contact = null)
+    public function getInvoiceDeliveryNote(Invoice $invoice, \App\Models\ClientContact $contact = null)
     {
         return (new GenerateDeliveryNote($invoice, $contact))->run();
     }
@@ -219,7 +218,7 @@ class InvoiceService
     public function markDeleted()
     {
         $this->removeUnpaidGatewayFees();
-        
+
         $this->invoice = (new MarkInvoiceDeleted($this->invoice))->run();
 
         return $this;
@@ -273,7 +272,7 @@ class InvoiceService
 
         return $this;
     }
-    
+
     public function setReminder($settings = null)
     {
         $this->invoice = (new UpdateReminder($this->invoice, $settings))->run();
@@ -290,7 +289,7 @@ class InvoiceService
 
     public function setCalculatedStatus()
     {
-        if (round($this->invoice->balance,2) == 0) {
+        if (round($this->invoice->balance, 2) == 0) {
             $this->setStatus(Invoice::STATUS_PAID);
         } elseif ($this->invoice->balance > 0 && $this->invoice->balance < $this->invoice->amount) {
             $this->setStatus(Invoice::STATUS_PARTIAL);
@@ -301,13 +300,13 @@ class InvoiceService
 
     public function updateStatus()
     {
-        if($this->invoice->status_id == Invoice::STATUS_DRAFT)
+        if ($this->invoice->status_id == Invoice::STATUS_DRAFT) {
             return $this;
-
-        if(round($this->invoice->balance,2) == 0){
-            $this->invoice->status_id = Invoice::STATUS_PAID;
         }
-        elseif ($this->invoice->balance > 0 && $this->invoice->balance < $this->invoice->amount) {
+
+        if (round($this->invoice->balance, 2) == 0) {
+            $this->invoice->status_id = Invoice::STATUS_PAID;
+        } elseif ($this->invoice->balance > 0 && $this->invoice->balance < $this->invoice->amount) {
             $this->invoice->status_id = Invoice::STATUS_PARTIAL;
         }
         elseif ($this->invoice->balance < 0) {
@@ -337,22 +336,18 @@ class InvoiceService
     {
         $this->invoice->load('invitations');
 
-        $this->invoice->invitations->each(function ($invitation){
+        $this->invoice->invitations->each(function ($invitation) {
+            try {
+                if (Storage::disk(config('filesystems.default'))->exists($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf')) {
+                    Storage::disk(config('filesystems.default'))->delete($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf');
+                }
 
-        try{
-
-            if(Storage::disk(config('filesystems.default'))->exists($this->invoice->client->invoice_filepath($invitation) . $this->invoice->numberFormatter().'.pdf'))
-                Storage::disk(config('filesystems.default'))->delete($this->invoice->client->invoice_filepath($invitation) . $this->invoice->numberFormatter().'.pdf');
-            
-            if(Ninja::isHosted() && Storage::disk('public')->exists($this->invoice->client->invoice_filepath($invitation) . $this->invoice->numberFormatter().'.pdf')) {
-                Storage::disk('public')->delete($this->invoice->client->invoice_filepath($invitation) . $this->invoice->numberFormatter().'.pdf');
+                if (Ninja::isHosted() && Storage::disk('public')->exists($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf')) {
+                    Storage::disk('public')->delete($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf');
+                }
+            } catch (\Exception $e) {
+                nlog($e->getMessage());
             }
-
-        }catch(\Exception $e){
-            nlog($e->getMessage());
-        }
-
-
         });
 
         return $this;
@@ -363,8 +358,9 @@ class InvoiceService
         $balance = $this->invoice->balance;
 
         //return early if type three does not exist.
-        if(!collect($this->invoice->line_items)->contains('type_id', 3))
+        if (! collect($this->invoice->line_items)->contains('type_id', 3)) {
             return $this;
+        }
 
         $pre_count = count($this->invoice->line_items);
 
@@ -374,15 +370,14 @@ class InvoiceService
                                      })->toArray();
 
         $this->invoice = $this->invoice->calc()->getInvoice();
-        
+
         /* 24-03-2022 */
         $new_balance = $this->invoice->balance;
 
         $post_count = count($this->invoice->line_items);
         nlog("pre count = {$pre_count} post count = {$post_count}");
 
-        if((int)$pre_count != (int)$post_count)
-        {
+        if ((int) $pre_count != (int) $post_count) {
             $adjustment = $balance - $new_balance;
 
             $this->invoice
@@ -396,7 +391,6 @@ class InvoiceService
             ->updateInvoiceBalance($adjustment * -1, 'Adjustment for removing gateway fee');
         }
 
-
         return $this;
     }
 
@@ -425,11 +419,9 @@ class InvoiceService
     public function touchPdf($force = false)
     {
         try {
-        
-            if($force){
-
+            if ($force) {
                 $this->invoice->invitations->each(function ($invitation) {
-                    CreateEntityPdf::dispatchNow($invitation);
+                    (new CreateEntityPdf($invitation))->handle();
                 });
 
                 return $this;
@@ -438,12 +430,8 @@ class InvoiceService
             $this->invoice->invitations->each(function ($invitation) {
                 CreateEntityPdf::dispatch($invitation);
             });
-        
-        }
-        catch(\Exception $e){
-
-            nlog("failed creating invoices in Touch PDF");
-        
+        } catch (\Exception $e) {
+            nlog('failed creating invoices in Touch PDF');
         }
 
         return $this;
@@ -506,30 +494,34 @@ class InvoiceService
         return $this;
     }
 
-
     public function fillDefaults()
     {
         $this->invoice->load('client.company');
-        
+
         $settings = $this->invoice->client->getMergedSettings();
 
-        if (! $this->invoice->design_id) 
+        if (! $this->invoice->design_id) {
             $this->invoice->design_id = $this->decodePrimaryKey($settings->invoice_design_id);
-        
-        if (!isset($this->invoice->footer) || empty($this->invoice->footer)) 
+        }
+
+        if (! isset($this->invoice->footer) || empty($this->invoice->footer)) {
             $this->invoice->footer = $settings->invoice_footer;
+        }
 
-        if (!isset($this->invoice->terms)  || empty($this->invoice->terms)) 
+        if (! isset($this->invoice->terms) || empty($this->invoice->terms)) {
             $this->invoice->terms = $settings->invoice_terms;
+        }
 
-        if (!isset($this->invoice->public_notes)  || empty($this->invoice->public_notes)) 
+        if (! isset($this->invoice->public_notes) || empty($this->invoice->public_notes)) {
             $this->invoice->public_notes = $this->invoice->client->public_notes;
-        
-        /* If client currency differs from the company default currency, then insert the client exchange rate on the model.*/
-        if(!isset($this->invoice->exchange_rate) && $this->invoice->client->currency()->id != (int) $this->invoice->company->settings->currency_id)
-            $this->invoice->exchange_rate = $this->invoice->client->currency()->exchange_rate;
+        }
 
-        if($settings->counter_number_applied == 'when_saved'){
+        /* If client currency differs from the company default currency, then insert the client exchange rate on the model.*/
+        if (! isset($this->invoice->exchange_rate) && $this->invoice->client->currency()->id != (int) $this->invoice->company->settings->currency_id) {
+            $this->invoice->exchange_rate = $this->invoice->client->currency()->exchange_rate;
+        }
+
+        if ($settings->counter_number_applied == 'when_saved') {
             $this->invoice->service()->applyNumber()->save();
         }
 
@@ -538,31 +530,28 @@ class InvoiceService
 
     public function workFlow()
     {
-
         if ($this->invoice->status_id == Invoice::STATUS_PAID && $this->invoice->client->getSetting('auto_archive_invoice')) {
             /* Throws: Payment amount xxx does not match invoice totals. */
 
-            if ($this->invoice->trashed()) 
+            if ($this->invoice->trashed()) {
                 return $this;
+            }
 
             $this->invoice->delete();
 
             event(new InvoiceWasArchived($this->invoice, $this->invoice->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
-        
-
         }
 
         if ($this->invoice->status_id == Invoice::STATUS_CANCELLED && $this->invoice->client->getSetting('auto_archive_invoice_cancelled')) {
             /* Throws: Payment amount xxx does not match invoice totals. */
 
-            if ($this->invoice->trashed()) 
+            if ($this->invoice->trashed()) {
                 return $this;
+            }
 
             $this->invoice->delete();
 
             event(new InvoiceWasArchived($this->invoice, $this->invoice->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
-        
-
         }
 
         return $this;
@@ -570,9 +559,9 @@ class InvoiceService
 
     public function adjustInventory($old_invoice = [])
     {
-
-        if($this->invoice->company->track_inventory)
-            AdjustProductInventory::dispatchNow($this->invoice->company, $this->invoice, $old_invoice);
+        if ($this->invoice->company->track_inventory) {
+            (new AdjustProductInventory($this->invoice->company, $this->invoice, $old_invoice))->handle();
+        }
 
         return $this;
     }
diff --git a/app/Services/Invoice/MarkInvoiceDeleted.php b/app/Services/Invoice/MarkInvoiceDeleted.php
index e16843ad915f..8990cbfaa597 100644
--- a/app/Services/Invoice/MarkInvoiceDeleted.php
+++ b/app/Services/Invoice/MarkInvoiceDeleted.php
@@ -40,7 +40,7 @@ class MarkInvoiceDeleted extends AbstractService
         if ($this->invoice->is_deleted) {
             return $this->invoice;
         }
-        
+
         $this->cleanup()
              ->setAdjustmentAmount()
              ->deletePaymentables()
@@ -49,15 +49,15 @@ class MarkInvoiceDeleted extends AbstractService
              ->adjustBalance()
              ->adjustLedger();
 
-            $transaction = [
-                'invoice' => $this->invoice->transaction_event(),
-                'payment' => $this->invoice->payments()->exists() ? $this->invoice->payments()->first()->transaction_event() : [],
-                'client' => $this->invoice->client->transaction_event(),
-                'credit' => [],
-                'metadata' => ['total_payments' => $this->total_payments, 'balance_adjustment' => $this->balance_adjustment, 'adjustment_amount' => $this->adjustment_amount],
-            ];
+        $transaction = [
+            'invoice' => $this->invoice->transaction_event(),
+            'payment' => $this->invoice->payments()->exists() ? $this->invoice->payments()->first()->transaction_event() : [],
+            'client' => $this->invoice->client->transaction_event(),
+            'credit' => [],
+            'metadata' => ['total_payments' => $this->total_payments, 'balance_adjustment' => $this->balance_adjustment, 'adjustment_amount' => $this->adjustment_amount],
+        ];
 
-            TransactionLog::dispatch(TransactionEvent::INVOICE_DELETED, $transaction, $this->invoice->company->db);
+        TransactionLog::dispatch(TransactionEvent::INVOICE_DELETED, $transaction, $this->invoice->company->db);
 
         return $this->invoice;
     }
@@ -85,7 +85,7 @@ class MarkInvoiceDeleted extends AbstractService
         $client = $this->invoice->client->fresh();
         $client->balance += $this->balance_adjustment * -1;
         $client->save();
-        
+
         // $this->invoice->client->service()->updateBalance($this->balance_adjustment * -1)->save(); //reduces the client balance by the invoice amount.
 
         return $this;
@@ -95,13 +95,13 @@ class MarkInvoiceDeleted extends AbstractService
     private function adjustPayments()
     {
         //if total payments = adjustment amount - that means we need to delete the payments as well.
-        
+
         if ($this->adjustment_amount == $this->total_payments) {
             $this->invoice->payments()->update(['payments.deleted_at' => now(), 'payments.is_deleted' => true]);
         } else {
 
             //adjust payments down by the amount applied to the invoice payment.
-            
+
             $this->invoice->payments->each(function ($payment) {
                 $payment_adjustment = $payment->paymentables
                                                 ->where('paymentable_type', '=', 'invoices')
@@ -139,10 +139,9 @@ class MarkInvoiceDeleted extends AbstractService
             $this->adjustment_amount -= $payment->paymentables
                                                 ->where('paymentable_type', '=', 'invoices')
                                                 ->where('paymentable_id', $this->invoice->id)
-                                                ->sum(DB::raw('refunded'));                                                
+                                                ->sum(DB::raw('refunded'));
         }
 
-
         $this->total_payments = $this->invoice->payments->sum('amount') - $this->invoice->payments->sum('refunded');
 
         $this->balance_adjustment = $this->invoice->balance;
@@ -150,23 +149,23 @@ class MarkInvoiceDeleted extends AbstractService
         return $this;
     }
 
-    /* 
+    /*
      *
      * This sets the invoice number to _deleted
      * and also removes the links to existing entities
-     * 
+     *
      */
     private function cleanup()
     {
         $check = false;
-        
-        $x=0;
+
+        $x = 0;
 
         do {
             $number = $this->calcNumber($x);
             $check = $this->checkNumberAvailable(Invoice::class, $this->invoice, $number);
             $x++;
-        } while (!$check);
+        } while (! $check);
 
         $this->invoice->number = $number;
 
@@ -179,10 +178,10 @@ class MarkInvoiceDeleted extends AbstractService
 
     private function calcNumber($x)
     {
-        if ($x==0) {
-            $number = $this->invoice->number . '_' . ctrans('texts.deleted');
+        if ($x == 0) {
+            $number = $this->invoice->number.'_'.ctrans('texts.deleted');
         } else {
-            $number = $this->invoice->number . '_' . ctrans('texts.deleted') . '_'. $x;
+            $number = $this->invoice->number.'_'.ctrans('texts.deleted').'_'.$x;
         }
 
         return $number;
@@ -198,7 +197,6 @@ class MarkInvoiceDeleted extends AbstractService
                     ->update(['deleted_at' => now()]);
         });
 
-        
         return $this;
     }
 }
diff --git a/app/Services/Invoice/MarkPaid.php b/app/Services/Invoice/MarkPaid.php
index 87e321625fd9..e0a49b57cd0b 100644
--- a/app/Services/Invoice/MarkPaid.php
+++ b/app/Services/Invoice/MarkPaid.php
@@ -55,23 +55,26 @@ class MarkPaid extends AbstractService
 
         $payment->amount = $this->invoice->balance;
         $payment->applied = $this->invoice->balance;
-        $payment->number = $this->getNextPaymentNumber($this->invoice->client, $payment);
         $payment->status_id = Payment::STATUS_COMPLETED;
         $payment->client_id = $this->invoice->client_id;
         $payment->transaction_reference = ctrans('texts.manual_entry');
         $payment->currency_id = $this->invoice->client->getSetting('currency_id');
         $payment->is_manual = true;
 
-        if($this->invoice->company->timezone())
+        if ($this->invoice->company->timezone()) {
             $payment->date = now()->addSeconds($this->invoice->company->timezone()->utc_offset)->format('Y-m-d');
+        }
 
         $payment_type_id = $this->invoice->client->getSetting('payment_type_id');
 
-        if((int)$payment_type_id > 0)
-            $payment->type_id = (int)$payment_type_id;
+        if ((int) $payment_type_id > 0) {
+            $payment->type_id = (int) $payment_type_id;
+        }
 
         $payment->saveQuietly();
 
+        $payment->service()->applyNumber()->save();
+        
         $this->setExchangeRate($payment);
 
         /* Create a payment relationship to the invoice entity */
@@ -82,7 +85,7 @@ class MarkPaid extends AbstractService
         event('eloquent.created: App\Models\Payment', $payment);
 
         $this->invoice->next_send_date = null;
-        
+
         $this->invoice
                 ->service()
                 ->setExchangeRate()
@@ -100,14 +103,13 @@ class MarkPaid extends AbstractService
         $payment->ledger()
                 ->updatePaymentBalance($payment->amount * -1);
 
-        \DB::connection(config('database.default'))->transaction(function () use($payment){
+        \DB::connection(config('database.default'))->transaction(function () use ($payment) {
 
         /* Get the last record for the client and set the current balance*/
             $client = Client::withTrashed()->where('id', $this->invoice->client_id)->lockForUpdate()->first();
             $client->paid_to_date += $payment->amount;
             $client->balance -= $payment->amount;
             $client->save();
-
         }, 1);
 
         $this->invoice = $this->invoice
@@ -134,24 +136,21 @@ class MarkPaid extends AbstractService
 
     private function setExchangeRate(Payment $payment)
     {
-
-        if($payment->exchange_rate != 1)
+        if ($payment->exchange_rate != 1) {
             return;
+        }
 
         $client_currency = $payment->client->getSetting('currency_id');
         $company_currency = $payment->client->company->settings->currency_id;
 
         if ($company_currency != $client_currency) {
-
             $exchange_rate = new CurrencyApi();
 
             $payment->exchange_rate = $exchange_rate->exchangeRate($client_currency, $company_currency, Carbon::parse($payment->date));
             //$payment->exchange_currency_id = $client_currency; // 23/06/2021
             $payment->exchange_currency_id = $company_currency;
-        
+
             $payment->saveQuietly();
-
         }
-
     }
 }
diff --git a/app/Services/Invoice/MarkSent.php b/app/Services/Invoice/MarkSent.php
index 9719057374f9..a8b6d17b2481 100644
--- a/app/Services/Invoice/MarkSent.php
+++ b/app/Services/Invoice/MarkSent.php
@@ -26,7 +26,7 @@ class MarkSent extends AbstractService
     public function __construct(Client $client, Invoice $invoice)
     {
         $this->client = $client;
-        
+
         $this->invoice = $invoice;
     }
 
@@ -62,15 +62,13 @@ class MarkSent extends AbstractService
              ->save();
 
         /*Adjust client balance*/
-        
 
-        \DB::connection(config('database.default'))->transaction(function () use($adjustment){
+        \DB::connection(config('database.default'))->transaction(function () use ($adjustment) {
 
         /* Get the last record for the client and set the current balance*/
             $client = Client::withTrashed()->where('id', $this->client->id)->lockForUpdate()->first();
             $client->balance += $adjustment;
             $client->save();
-
         }, 1);
 
         $this->invoice->markInvitationsSent();
diff --git a/app/Services/Invoice/SendEmail.php b/app/Services/Invoice/SendEmail.php
index 5e3d27384ae0..55f9c534fad8 100644
--- a/app/Services/Invoice/SendEmail.php
+++ b/app/Services/Invoice/SendEmail.php
@@ -44,8 +44,8 @@ class SendEmail extends AbstractService
         }
 
         $this->invoice->invitations->each(function ($invitation) {
-            if (!$invitation->contact->trashed() && $invitation->contact->email) {
-                EmailEntity::dispatchNow($invitation, $invitation->company, $this->reminder_template);
+            if (! $invitation->contact->trashed() && $invitation->contact->email) {
+                EmailEntity::dispatch($invitation, $invitation->company, $this->reminder_template)->delay(10);
             }
         });
     }
diff --git a/app/Services/Invoice/TriggeredActions.php b/app/Services/Invoice/TriggeredActions.php
index 8c72d1091ad6..dd838dba6046 100644
--- a/app/Services/Invoice/TriggeredActions.php
+++ b/app/Services/Invoice/TriggeredActions.php
@@ -44,7 +44,7 @@ class TriggeredActions extends AbstractService
             $this->invoice = $this->invoice->service()->markPaid()->save();
         }
 
-        if ($this->request->has('amount_paid') && is_numeric($this->request->input('amount_paid')) ) {
+        if ($this->request->has('amount_paid') && is_numeric($this->request->input('amount_paid'))) {
             $this->invoice = $this->invoice->service()->applyPaymentAmount($this->request->input('amount_paid'))->save();
         }
 
@@ -59,14 +59,13 @@ class TriggeredActions extends AbstractService
 
         if ($this->request->has('cancel') && $this->request->input('cancel') == 'true') {
             $this->invoice = $this->invoice->service()->handleCancellation()->save();
-        }        
+        }
 
         return $this->invoice;
     }
 
     private function sendEmail()
     {
-
         $reminder_template = $this->invoice->calculateTemplate('invoice');
 
         $this->invoice->invitations->load('contact.client.country', 'invoice.client.country', 'invoice.company')->each(function ($invitation) use ($reminder_template) {
diff --git a/app/Services/Invoice/UpdateBalance.php b/app/Services/Invoice/UpdateBalance.php
index b2aa1013810d..3958f2c8835b 100644
--- a/app/Services/Invoice/UpdateBalance.php
+++ b/app/Services/Invoice/UpdateBalance.php
@@ -34,20 +34,20 @@ class UpdateBalance extends AbstractService
         if ($this->invoice->is_deleted) {
             return $this->invoice;
         }
-    
-    nlog("invoice id = {$this->invoice->id}");
-    nlog("invoice balance = {$this->invoice->balance}");
-    nlog("invoice adjustment = {$this->balance_adjustment}");
+
+        nlog("invoice id = {$this->invoice->id}");
+        nlog("invoice balance = {$this->invoice->balance}");
+        nlog("invoice adjustment = {$this->balance_adjustment}");
 
         // $this->invoice->balance += floatval($this->balance_adjustment);
-        
+
         $this->invoice->increment('balance', floatval($this->balance_adjustment));
 
-        if ($this->invoice->balance == 0 && !$this->is_draft) {
+        if ($this->invoice->balance == 0 && ! $this->is_draft) {
             $this->invoice->status_id = Invoice::STATUS_PAID;
         }
 
-    nlog("final balance = {$this->invoice->balance}");
+        nlog("final balance = {$this->invoice->balance}");
 
         return $this->invoice;
     }
diff --git a/app/Services/Invoice/UpdateReminder.php b/app/Services/Invoice/UpdateReminder.php
index 52f604263e0a..642c36b53283 100644
--- a/app/Services/Invoice/UpdateReminder.php
+++ b/app/Services/Invoice/UpdateReminder.php
@@ -18,9 +18,9 @@ use Carbon\Carbon;
 
 class UpdateReminder extends AbstractService
 {
-	public $invoice;
+    public $invoice;
 
-	public $settings;
+    public $settings;
 
     public function __construct(Invoice $invoice, $settings = null)
     {
@@ -30,7 +30,6 @@ class UpdateReminder extends AbstractService
 
     public function run()
     {
-
         if (! $this->settings) {
             $this->settings = $this->invoice->client->getMergedSettings();
         }
@@ -42,8 +41,9 @@ class UpdateReminder extends AbstractService
             return $this->invoice; //exit early
         }
 
-        if($this->invoice->next_send_date)
+        if ($this->invoice->next_send_date) {
             $this->invoice->next_send_date = null;
+        }
 
         $offset = $this->invoice->client->timezone_offset();
 
@@ -53,8 +53,9 @@ class UpdateReminder extends AbstractService
             $this->settings->schedule_reminder1 == 'after_invoice_date') {
             $reminder_date = Carbon::parse($this->invoice->date)->startOfDay()->addDays($this->settings->num_days_reminder1)->addSeconds($offset);
 
-            if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)))
-                $date_collection->push($reminder_date); 
+            if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date))) {
+                $date_collection->push($reminder_date);
+            }
         }
 
         if (is_null($this->invoice->reminder1_sent) &&
@@ -62,8 +63,9 @@ class UpdateReminder extends AbstractService
             $this->settings->schedule_reminder1 == 'before_due_date') {
             $reminder_date = Carbon::parse($this->invoice->due_date)->startOfDay()->subDays($this->settings->num_days_reminder1)->addSeconds($offset);
 
-            if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)))
-                $date_collection->push($reminder_date); 
+            if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date))) {
+                $date_collection->push($reminder_date);
+            }
         }
 
         if (is_null($this->invoice->reminder1_sent) &&
@@ -71,16 +73,18 @@ class UpdateReminder extends AbstractService
             $this->settings->schedule_reminder1 == 'after_due_date') {
             $reminder_date = Carbon::parse($this->invoice->due_date)->startOfDay()->addDays($this->settings->num_days_reminder1)->addSeconds($offset);
 
-            if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)))
-                $date_collection->push($reminder_date); 
+            if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date))) {
+                $date_collection->push($reminder_date);
+            }
         }
 
         if (is_null($this->invoice->reminder2_sent) &&
             $this->settings->schedule_reminder2 == 'after_invoice_date') {
             $reminder_date = Carbon::parse($this->invoice->date)->startOfDay()->addDays($this->settings->num_days_reminder2)->addSeconds($offset);
 
-            if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)))
-                $date_collection->push($reminder_date); 
+            if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date))) {
+                $date_collection->push($reminder_date);
+            }
         }
 
         if (is_null($this->invoice->reminder2_sent) &&
@@ -88,8 +92,9 @@ class UpdateReminder extends AbstractService
             $this->settings->schedule_reminder2 == 'before_due_date') {
             $reminder_date = Carbon::parse($this->invoice->due_date)->startOfDay()->subDays($this->settings->num_days_reminder2)->addSeconds($offset);
 
-            if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)))
+            if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date))) {
                 $date_collection->push($reminder_date);
+            }
         }
 
         if (is_null($this->invoice->reminder2_sent) &&
@@ -97,16 +102,18 @@ class UpdateReminder extends AbstractService
             $this->settings->schedule_reminder2 == 'after_due_date') {
             $reminder_date = Carbon::parse($this->invoice->due_date)->startOfDay()->addDays($this->settings->num_days_reminder2)->addSeconds($offset);
 
-            if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)))
-                $date_collection->push($reminder_date); 
+            if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date))) {
+                $date_collection->push($reminder_date);
+            }
         }
 
         if (is_null($this->invoice->reminder3_sent) &&
             $this->settings->schedule_reminder3 == 'after_invoice_date') {
             $reminder_date = Carbon::parse($this->invoice->date)->startOfDay()->addDays($this->settings->num_days_reminder3)->addSeconds($offset);
 
-            if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)))
-                $date_collection->push($reminder_date); 
+            if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date))) {
+                $date_collection->push($reminder_date);
+            }
         }
 
         if (is_null($this->invoice->reminder3_sent) &&
@@ -114,8 +121,9 @@ class UpdateReminder extends AbstractService
             $this->settings->schedule_reminder3 == 'before_due_date') {
             $reminder_date = Carbon::parse($this->invoice->due_date)->startOfDay()->subDays($this->settings->num_days_reminder3)->addSeconds($offset);
 
-            if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)))
-                $date_collection->push($reminder_date); 
+            if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date))) {
+                $date_collection->push($reminder_date);
+            }
         }
 
         if (is_null($this->invoice->reminder3_sent) &&
@@ -123,58 +131,55 @@ class UpdateReminder extends AbstractService
             $this->settings->schedule_reminder3 == 'after_due_date') {
             $reminder_date = Carbon::parse($this->invoice->due_date)->startOfDay()->addDays($this->settings->num_days_reminder3)->addSeconds($offset);
 
-            if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)))
-                $date_collection->push($reminder_date); 
+            if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date))) {
+                $date_collection->push($reminder_date);
+            }
         }
 
         if ($this->invoice->last_sent_date &&
             $this->settings->enable_reminder_endless) {
+            $reminder_date = $this->addTimeInterval($this->invoice->last_sent_date, (int) $this->settings->endless_reminder_frequency_id);
 
-            $reminder_date = $this->addTimeInterval($this->invoice->last_sent_date, (int)$this->settings->endless_reminder_frequency_id);
-
-            if($reminder_date){
-
+            if ($reminder_date) {
                 $reminder_date->addSeconds($offset);
 
-                if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date)))
+                if ($reminder_date->gt(Carbon::parse($this->invoice->next_send_date))) {
                     $date_collection->push($reminder_date);
-
+                }
             }
-
         }
 
-        if($date_collection->count() >=1 && $date_collection->sort()->first()->gte(now()))
+        if ($date_collection->count() >= 1 && $date_collection->sort()->first()->gte(now())) {
             $this->invoice->next_send_date = $date_collection->sort()->first();
-        else
+        } else {
             $this->invoice->next_send_date = null;
-        
+        }
+
         return $this->invoice;
     }
 
     private function testReminderValid($reminder_number, $reminder_schedule) :bool
     {
-    
         $reminder_sent = "reminder{$reminder_number}_sent";
         $schedule_reminder = "schedule_reminder{$reminder_number}";
         $enable_reminder = "enable_reminder{$reminder_number}";
         $late_fee_amount = "late_fee_amount{$reminder_number}";
         $late_fee_percent = "late_fee_percent{$reminder_number}";
 
-        return (is_null($this->invoice->{$reminder_sent}) && 
-            $this->settings->{$schedule_reminder} == $reminder_schedule && 
-            ($this->settings->{$enable_reminder} || $late_fee_percent > 0 || $late_fee_amount > 0));
-    
+        return is_null($this->invoice->{$reminder_sent}) &&
+            $this->settings->{$schedule_reminder} == $reminder_schedule &&
+            ($this->settings->{$enable_reminder} || $late_fee_percent > 0 || $late_fee_amount > 0);
     }
 
     private function addTimeInterval($date, $endless_reminder_frequency_id) :?Carbon
-    {   
-
-        if (!$date) 
+    {
+        if (! $date) {
             return null;
-        
+        }
+
         switch ($endless_reminder_frequency_id) {
             case RecurringInvoice::FREQUENCY_DAILY:
-                return Carbon::parse($date)->addDay()->startOfDay(); 
+                return Carbon::parse($date)->addDay()->startOfDay();
            case RecurringInvoice::FREQUENCY_WEEKLY:
                 return Carbon::parse($date)->addWeek()->startOfDay();
             case RecurringInvoice::FREQUENCY_TWO_WEEKS:
@@ -201,4 +206,4 @@ class UpdateReminder extends AbstractService
                 return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/Ledger/LedgerService.php b/app/Services/Ledger/LedgerService.php
index fe6d32097bf5..6cb487bb4391 100644
--- a/app/Services/Ledger/LedgerService.php
+++ b/app/Services/Ledger/LedgerService.php
@@ -27,7 +27,6 @@ class LedgerService
 
     public function updateInvoiceBalance($adjustment, $notes = '')
     {
-
         $company_ledger = CompanyLedgerFactory::create($this->entity->company_id, $this->entity->user_id);
         $company_ledger->client_id = $this->entity->client_id;
         $company_ledger->adjustment = $adjustment;
@@ -36,7 +35,7 @@ class LedgerService
         $company_ledger->save();
 
         $this->entity->company_ledger()->save($company_ledger);
-        
+
         ClientLedgerBalanceUpdate::dispatch($this->entity->company, $this->entity->client)->delay(now()->addSeconds(300));
 
         return $this;
@@ -44,7 +43,6 @@ class LedgerService
 
     public function updatePaymentBalance($adjustment, $notes = '')
     {
-
         $company_ledger = CompanyLedgerFactory::create($this->entity->company_id, $this->entity->user_id);
         $company_ledger->client_id = $this->entity->client_id;
         $company_ledger->adjustment = $adjustment;
@@ -61,7 +59,6 @@ class LedgerService
 
     public function updateCreditBalance($adjustment, $notes = '')
     {
-
         $company_ledger = CompanyLedgerFactory::create($this->entity->company_id, $this->entity->user_id);
         $company_ledger->client_id = $this->entity->client_id;
         $company_ledger->adjustment = $adjustment;
@@ -83,4 +80,3 @@ class LedgerService
         return $this->entity;
     }
 }
-
diff --git a/app/Services/Notification/NotificationService.php b/app/Services/Notification/NotificationService.php
index 63022d21c326..c4d44b620ead 100644
--- a/app/Services/Notification/NotificationService.php
+++ b/app/Services/Notification/NotificationService.php
@@ -70,7 +70,6 @@ class NotificationService extends AbstractService
     public function ninja()
     {
         Notification::route('slack', config('ninja.notification.slack'))
-            ->route('mail', config('ninja.notification.mail'))
             ->notify($this->notification);
     }
 }
diff --git a/app/Services/Payment/ApplyNumber.php b/app/Services/Payment/ApplyNumber.php
index 39bd1ef9a64a..d8654c216743 100644
--- a/app/Services/Payment/ApplyNumber.php
+++ b/app/Services/Payment/ApplyNumber.php
@@ -45,30 +45,21 @@ class ApplyNumber extends AbstractService
 
     private function trySaving()
     {
+        $x = 1;
 
-        $x=1;
-
-        do{
-
-            try{
-
+        do {
+            try {
                 $this->payment->number = $this->getNextPaymentNumber($this->client, $this->payment);
                 $this->payment->saveQuietly();
 
                 $this->completed = false;
-                
-
-            }
-            catch(QueryException $e){
-
+            } catch (QueryException $e) {
                 $x++;
 
-                if($x>10)
+                if ($x > 10) {
                     $this->completed = false;
+                }
             }
-        
-        }
-        while($this->completed);
-
+        } while ($this->completed);
     }
 }
diff --git a/app/Services/Payment/DeletePayment.php b/app/Services/Payment/DeletePayment.php
index 86e304182b6e..c4599abe12cf 100644
--- a/app/Services/Payment/DeletePayment.php
+++ b/app/Services/Payment/DeletePayment.php
@@ -50,7 +50,7 @@ class DeletePayment
     {
         $this->payment->is_deleted = true;
         $this->payment->delete();
-        
+
         return $this;
     }
 
@@ -71,17 +71,14 @@ class DeletePayment
     private function adjustInvoices()
     {
         if ($this->payment->invoices()->exists()) {
-
             $this->payment->invoices()->each(function ($paymentable_invoice) {
-
                 $net_deletable = $paymentable_invoice->pivot->amount - $paymentable_invoice->pivot->refunded;
-                
+
                 $client = $this->payment->client->fresh();
 
                 nlog("net deletable amount - refunded = {$net_deletable}");
-                
-                if(!$paymentable_invoice->is_deleted)
-                {
+
+                if (! $paymentable_invoice->is_deleted) {
                     $paymentable_invoice->restore();
 
                     $paymentable_invoice->service()
@@ -102,10 +99,7 @@ class DeletePayment
                     } else {
                         $paymentable_invoice->service()->setStatus(Invoice::STATUS_PARTIAL)->save();
                     }
-
-                }
-                else {
-
+                } else {
                     $paymentable_invoice->restore();
 
                     //If the invoice is deleted we only update the meta data on the invoice
@@ -113,8 +107,6 @@ class DeletePayment
                     $paymentable_invoice->service()
                                         ->updatePaidToDate($net_deletable * -1)
                                         ->save();
-
-
                 }
 
                 $transaction = [
@@ -126,16 +118,14 @@ class DeletePayment
                 ];
 
                 TransactionLog::dispatch(TransactionEvent::PAYMENT_DELETED, $transaction, $paymentable_invoice->company->db);
-
             });
         }
 
-
         $client = $this->payment->client->fresh();
 
         $client
         ->service()
-        ->updatePaidToDate(($this->payment->amount - $this->payment->refunded)*-1)
+        ->updatePaidToDate(($this->payment->amount - $this->payment->refunded) * -1)
         ->save();
 
         $transaction = [
@@ -148,7 +138,6 @@ class DeletePayment
 
         TransactionLog::dispatch(TransactionEvent::CLIENT_STATUS, $transaction, $this->payment->company->db);
 
-    
         return $this;
     }
 
@@ -156,15 +145,15 @@ class DeletePayment
     {
         if ($this->payment->credits()->exists()) {
             $this->payment->credits()->each(function ($paymentable_credit) {
-                
                 $multiplier = 1;
 
-                if($paymentable_credit->pivot->amount < 0)
+                if ($paymentable_credit->pivot->amount < 0) {
                     $multiplier = -1;
+                }
 
                 $paymentable_credit->service()
-                                   ->updateBalance($paymentable_credit->pivot->amount*$multiplier*-1)
-                                   ->updatePaidToDate($paymentable_credit->pivot->amount*$multiplier)
+                                   ->updateBalance($paymentable_credit->pivot->amount * $multiplier * -1)
+                                   ->updatePaidToDate($paymentable_credit->pivot->amount * $multiplier)
                                    ->setStatus(Credit::STATUS_SENT)
                                    ->save();
 
@@ -172,9 +161,8 @@ class DeletePayment
 
                 $client
                 ->service()
-                ->updatePaidToDate(($paymentable_credit->pivot->amount)*-1)
+                ->updatePaidToDate(($paymentable_credit->pivot->amount) * -1)
                 ->save();
-
             });
         }
 
diff --git a/app/Services/Payment/PaymentService.php b/app/Services/Payment/PaymentService.php
index cb5d67d6e379..9f7d2278ac65 100644
--- a/app/Services/Payment/PaymentService.php
+++ b/app/Services/Payment/PaymentService.php
@@ -20,7 +20,7 @@ use App\Utils\Traits\MakesHash;
 class PaymentService
 {
     use MakesHash;
-    
+
     private $payment;
 
     public function __construct($payment)
@@ -61,16 +61,13 @@ class PaymentService
         $client = $this->payment->client;
 
         $invoices->each(function ($invoice) {
-            
             if ($invoice->pivot->amount > 0) {
-
                 $invoice->service()
                         ->updateBalance($invoice->pivot->amount)
-                        ->updatePaidToDate($invoice->pivot->amount*-1)
+                        ->updatePaidToDate($invoice->pivot->amount * -1)
                         ->setStatus(Invoice::STATUS_SENT)
                         ->save();
             }
-
         });
 
         $this->payment
@@ -111,9 +108,8 @@ class PaymentService
     {
         /* Iterate through the invoices and apply credits to them */
         collect($payment_hash->invoices())->each(function ($payable_invoice) use ($payment_hash) {
-
             $invoice = Invoice::withTrashed()->find($this->decodePrimaryKey($payable_invoice->invoice_id));
-            
+
             $amount = $payable_invoice->amount;
 
             $credits = $payment_hash->fee_invoice
@@ -121,7 +117,6 @@ class PaymentService
                                     ->service()
                                     ->getCredits();
 
-
             foreach ($credits as $credit) {
                 //starting invoice balance
                 $invoice_balance = $invoice->balance;
@@ -136,13 +131,13 @@ class PaymentService
                 $amount -= $remaining_balance;
 
                 //break if the invoice is no longer PAYABLE OR there is no more amount to be applied
-                if (!$invoice->isPayable() || (int)$amount == 0) {
+                if (! $invoice->isPayable() || (int) $amount == 0) {
                     break;
                 }
             }
         });
 
-        return $this; 
+        return $this;
     }
 
     public function save()
diff --git a/app/Services/Payment/RefundPayment.php b/app/Services/Payment/RefundPayment.php
index 863b4345f729..7a4b1ef37990 100644
--- a/app/Services/Payment/RefundPayment.php
+++ b/app/Services/Payment/RefundPayment.php
@@ -65,23 +65,20 @@ class RefundPayment
             ->processGatewayRefund() //process the gateway refund if needed
             ->save();
 
-        
-            if(array_key_exists('email_receipt', $this->refund_data) && $this->refund_data['email_receipt'] == 'true'){
-            
-                $contact = $this->payment->client->contacts()->whereNotNull('email')->first();
-                    EmailRefundPayment::dispatch($this->payment, $this->payment->company, $contact);
-                
-            }
+        if (array_key_exists('email_receipt', $this->refund_data) && $this->refund_data['email_receipt'] == 'true') {
+            $contact = $this->payment->client->contacts()->whereNotNull('email')->first();
+            EmailRefundPayment::dispatch($this->payment, $this->payment->company, $contact);
+        }
 
-            $transaction = [
-                'invoice' => [],
-                'payment' => $this->payment->transaction_event(),
-                'client' => $this->payment->client->transaction_event(),
-                'credit' => [],
-                'metadata' => [],
-            ];
+        $transaction = [
+            'invoice' => [],
+            'payment' => $this->payment->transaction_event(),
+            'client' => $this->payment->client->transaction_event(),
+            'credit' => [],
+            'metadata' => [],
+        ];
 
-            TransactionLog::dispatch(TransactionEvent::PAYMENT_REFUND, $transaction, $this->payment->company->db);
+        TransactionLog::dispatch(TransactionEvent::PAYMENT_REFUND, $transaction, $this->payment->company->db);
 
         return $this->payment;
     }
@@ -105,13 +102,12 @@ class RefundPayment
                 if ($response['success'] == false) {
                     $this->payment->save();
 
-                    if(array_key_exists('description', $response))
+                    if (array_key_exists('description', $response)) {
                         throw new PaymentRefundFailed($response['description']);
-                    else
+                    } else {
                         throw new PaymentRefundFailed();
-
+                    }
                 }
-
             }
         } else {
             $this->payment->refunded += $this->total_refund;
@@ -217,17 +213,15 @@ class RefundPayment
                 if ($available_credit > $this->total_refund) {
                     $paymentable_credit->pivot->refunded += $this->total_refund;
                     $paymentable_credit->pivot->save();
-                    
+
                     $paymentable_credit->service()
                                        ->setStatus(Credit::STATUS_SENT)
                                        ->updateBalance($this->total_refund)
-                                       ->updatePaidToDate($this->total_refund*-1)
+                                       ->updatePaidToDate($this->total_refund * -1)
                                        ->save();
 
                     $this->total_refund = 0;
-
                 } else {
-
                     $paymentable_credit->pivot->refunded += $available_credit;
                     $paymentable_credit->pivot->save();
 
@@ -235,7 +229,7 @@ class RefundPayment
                     $paymentable_credit->service()
                                       ->setStatus(Credit::STATUS_SENT)
                                        ->adjustBalance($available_credit)
-                                       ->updatePaidToDate($available_credit*-1)
+                                       ->updatePaidToDate($available_credit * -1)
                                       ->save();
 
                     $this->total_refund -= $available_credit;
@@ -263,8 +257,9 @@ class RefundPayment
             foreach ($this->refund_data['invoices'] as $refunded_invoice) {
                 $invoice = Invoice::withTrashed()->find($refunded_invoice['invoice_id']);
 
-                if($invoice->trashed())
+                if ($invoice->trashed()) {
                     $invoice->restore();
+                }
 
                 $invoice->service()
                         ->updateBalance($refunded_invoice['amount'])
@@ -272,7 +267,7 @@ class RefundPayment
                         ->save();
 
                 $invoice->ledger()->updateInvoiceBalance($refunded_invoice['amount'], "Refund of payment # {$this->payment->number}")->save();
-                
+
                 if ($invoice->amount == $invoice->balance) {
                     $invoice->service()->setStatus(Invoice::STATUS_SENT);
                 } else {
@@ -286,7 +281,6 @@ class RefundPayment
                 $client->balance += $refunded_invoice['amount'];
                 $client->save();
 
-
                 $transaction = [
                     'invoice' => $invoice->transaction_event(),
                     'payment' => [],
@@ -297,48 +291,48 @@ class RefundPayment
 
                 TransactionLog::dispatch(TransactionEvent::PAYMENT_REFUND, $transaction, $invoice->company->db);
 
-                if($invoice->is_deleted)
+                if ($invoice->is_deleted) {
                     $invoice->delete();
-
+                }
             }
 
-            $client = $this->payment->client->fresh();            
+            $client = $this->payment->client->fresh();
 
-            if($client->trashed())
+            if ($client->trashed()) {
                 $client->restore();
+            }
 
             $client->service()->updatePaidToDate(-1 * $refunded_invoice['amount'])->save();
 
-                $transaction = [
-                    'invoice' => [],
-                    'payment' => [],
-                    'client' => $client->transaction_event(),
-                    'credit' => [],
-                    'metadata' => [],
-                ];
+            $transaction = [
+                'invoice' => [],
+                'payment' => [],
+                'client' => $client->transaction_event(),
+                'credit' => [],
+                'metadata' => [],
+            ];
 
-                TransactionLog::dispatch(TransactionEvent::PAYMENT_REFUND, $transaction, $client->company->db);
-
-        }
-        else{
+            TransactionLog::dispatch(TransactionEvent::PAYMENT_REFUND, $transaction, $client->company->db);
+        } else {
             //if we are refunding and no payments have been tagged, then we need to decrement the client->paid_to_date by the total refund amount.
-            
+
             $client = $this->payment->client->fresh();
 
-            if($client->trashed())
+            if ($client->trashed()) {
                 $client->restore();
+            }
 
             $client->service()->updatePaidToDate(-1 * $this->total_refund)->save();
 
-                $transaction = [
-                    'invoice' => [],
-                    'payment' => [],
-                    'client' => $client->transaction_event(),
-                    'credit' => [],
-                    'metadata' => [],
-                ];
+            $transaction = [
+                'invoice' => [],
+                'payment' => [],
+                'client' => $client->transaction_event(),
+                'credit' => [],
+                'metadata' => [],
+            ];
 
-                TransactionLog::dispatch(TransactionEvent::PAYMENT_REFUND, $transaction, $client->company->db);
+            TransactionLog::dispatch(TransactionEvent::PAYMENT_REFUND, $transaction, $client->company->db);
         }
 
         return $this;
diff --git a/app/Services/Payment/SendEmail.php b/app/Services/Payment/SendEmail.php
index d2886e2407df..be7326098c9c 100644
--- a/app/Services/Payment/SendEmail.php
+++ b/app/Services/Payment/SendEmail.php
@@ -34,12 +34,10 @@ class SendEmail
     {
         $this->payment->load('company', 'client.contacts');
 
-        $this->payment->client->contacts->each(function ($contact) {
-            if ($contact->email) {
-                EmailPayment::dispatchNow($this->payment, $this->payment->company, $contact);
-                return false;
-                //11-01-2021 only send payment receipt to the first contact
-            }
-        });
+        $contact = $this->payment->client->contacts()->first();
+
+        if ($contact?->email)
+            EmailPayment::dispatch($this->payment, $this->payment->company, $contact);
+         
     }
 }
diff --git a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php
index a6f60e9b9a1e..d4dd37463016 100644
--- a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php
+++ b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php
@@ -46,7 +46,7 @@ trait DesignHelpers
 
         if (isset($this->context['invoices'])) {
             $this->invoices = $this->context['invoices'];
-            
+
             if ($this->invoices->count() >= 1) {
                 $this->entity = $this->invoices->first();
             }
@@ -65,7 +65,7 @@ trait DesignHelpers
         $this->settings_object = $this->vendor ? $this->vendor->company : $this->client;
 
         $this->company = $this->vendor ? $this->vendor->company : $this->client->company;
-        
+
         return $this;
     }
 
@@ -161,7 +161,7 @@ trait DesignHelpers
         // This sprintf() will help us convert "task" or "product" into "$task" or "$product" without
         // evaluating the variable.
 
-        if (in_array(sprintf('%s%s.tax', '$', $type), (array)$this->context['pdf_variables']["{$type}_columns"])) {
+        if (in_array(sprintf('%s%s.tax', '$', $type), (array) $this->context['pdf_variables']["{$type}_columns"])) {
             $line_items = collect($this->entity->line_items)->filter(function ($item) use ($type_id) {
                 return $item->type_id = $type_id;
             });
@@ -200,9 +200,9 @@ trait DesignHelpers
      */
     public function calculateColspan(int $taken): int
     {
-        $total = (int)count($this->context['pdf_variables']['product_columns']);
+        $total = (int) count($this->context['pdf_variables']['product_columns']);
 
-        return (int)$total - $taken;
+        return (int) $total - $taken;
     }
 
     /**
@@ -233,7 +233,7 @@ trait DesignHelpers
                 t.hidden = false;
             });
         ";
-    
+
         // Unminified version, just for the reference.
         // By default all table headers are hidden with HTML `hidden` property.
         // This will check for table data values & if they're not empty it will remove hidden from the column itself.
@@ -272,7 +272,6 @@ document.addEventListener('DOMContentLoaded', function() {
             document.querySelectorAll(`[data-state="encoded-html"]`).forEach((element) => element.innerHTML = element.innerText)
         }, false);
          */
-
         $html_decode = 'document.addEventListener("DOMContentLoaded",function(){document.querySelectorAll(`[data-state="encoded-html"]`).forEach(e=>e.innerHTML=e.innerText)},!1);';
 
         return ['element' => 'div', 'elements' => [
@@ -292,7 +291,7 @@ document.addEventListener('DOMContentLoaded', function() {
             return false;
         }
 
-        // Some variables don't map 1:1 to table columns. This gives us support for such cases.        
+        // Some variables don't map 1:1 to table columns. This gives us support for such cases.
         $aliases = [
             '$quote.balance_due' => 'partial',
         ];
@@ -334,11 +333,11 @@ document.addEventListener('DOMContentLoaded', function() {
     {
         $custom_columns = [];
 
-        foreach ((array)$this->client->company->custom_fields as $field => $value) {
+        foreach ((array) $this->client->company->custom_fields as $field => $value) {
             info($field);
 
             if (\Illuminate\Support\Str::startsWith($field, $type)) {
-                $custom_columns[] = '$' . $type . '.' . $field;
+                $custom_columns[] = '$'.$type.'.'.$field;
             }
         }
 
@@ -362,11 +361,11 @@ document.addEventListener('DOMContentLoaded', function() {
             'company4' => 'custom_value4',
         ];
 
-        if (!array_key_exists($field, $fields)) {
+        if (! array_key_exists($field, $fields)) {
             return '';
         }
 
-        if ($this->client->company->custom_fields && !property_exists($this->client->company->custom_fields, $field)) {
+        if ($this->client->company->custom_fields && ! property_exists($this->client->company->custom_fields, $field)) {
             return '';
         }
 
@@ -407,8 +406,8 @@ document.addEventListener('DOMContentLoaded', function() {
     {
         foreach ($items as $key => $item) {
             foreach ($item as $variable => $value) {
-               // $item[$variable] = nl2br($value, true);
-               $item[$variable] = str_replace( "\n", '<br>', $value);
+                // $item[$variable] = nl2br($value, true);
+                $item[$variable] = str_replace("\n", '<br>', $value);
             }
 
             $items[$key] = $item;
diff --git a/app/Services/PdfMaker/PdfMaker.php b/app/Services/PdfMaker/PdfMaker.php
index 733c88675159..f95742267cc6 100644
--- a/app/Services/PdfMaker/PdfMaker.php
+++ b/app/Services/PdfMaker/PdfMaker.php
@@ -83,13 +83,13 @@ class PdfMaker
 
     /**
      * Final method to get compiled HTML.
-     * 
+     *
      * @param bool $final @deprecated // is it? i still see it being called elsewhere
-     * @return mixed 
+     * @return mixed
      */
     public function getCompiledHTML($final = false)
     {
-        $html =  $this->document->saveHTML();
+        $html = $this->document->saveHTML();
 
         return str_replace('%24', '$', $html);
     }
diff --git a/app/Services/PdfMaker/PdfMakerUtilities.php b/app/Services/PdfMaker/PdfMakerUtilities.php
index 57080a37caa1..fab5b39ee2d1 100644
--- a/app/Services/PdfMaker/PdfMakerUtilities.php
+++ b/app/Services/PdfMaker/PdfMakerUtilities.php
@@ -49,7 +49,7 @@ trait PdfMakerUtilities
         foreach ($elements as $element) {
             if (isset($element['tag'])) {
                 $node = $this->document->getElementsByTagName($element['tag'])->item(0);
-            } elseif (!is_null($this->document->getElementById($element['id']))) {
+            } elseif (! is_null($this->document->getElementById($element['id']))) {
                 $node = $this->document->getElementById($element['id']);
             } else {
                 continue;
@@ -93,8 +93,7 @@ trait PdfMakerUtilities
 
             if ($child['element'] !== 'script') {
                 if (array_key_exists('process_markdown', $this->data) && array_key_exists('content', $child) && $this->data['process_markdown']) {
-
-                    $child['content'] = str_replace("<br>", "\r", $child['content']);
+                    $child['content'] = str_replace('<br>', "\r", $child['content']);
                     $child['content'] = $this->commonmark->convert($child['content'] ?? '');
                 }
             }
diff --git a/app/Services/PurchaseOrder/ApplyNumber.php b/app/Services/PurchaseOrder/ApplyNumber.php
index 197a555c8dce..4c01b9ecc30d 100644
--- a/app/Services/PurchaseOrder/ApplyNumber.php
+++ b/app/Services/PurchaseOrder/ApplyNumber.php
@@ -11,9 +11,8 @@
 
 namespace App\Services\PurchaseOrder;
 
-
-use App\Models\Vendor;
 use App\Models\PurchaseOrder;
+use App\Models\Vendor;
 use App\Services\AbstractService;
 use App\Utils\Traits\GeneratesCounter;
 use Illuminate\Database\QueryException;
@@ -58,22 +57,21 @@ class ApplyNumber extends AbstractService
 
         return $this->purchase_order;
     }
+
     private function trySaving()
     {
-        $x=1;
-        do{
-            try{
+        $x = 1;
+        do {
+            try {
                 $this->purchase_order->number = $this->getNextPurchaseOrderNumber($this->purchase_order);
                 $this->purchase_order->saveQuietly();
                 $this->completed = false;
-            }
-            catch(QueryException $e){
+            } catch (QueryException $e) {
                 $x++;
-                if($x>10)
+                if ($x > 10) {
                     $this->completed = false;
+                }
             }
-        }
-        while($this->completed);
-
+        } while ($this->completed);
     }
 }
diff --git a/app/Services/PurchaseOrder/CreateInvitations.php b/app/Services/PurchaseOrder/CreateInvitations.php
index cd8634fc5de1..10f53814410b 100644
--- a/app/Services/PurchaseOrder/CreateInvitations.php
+++ b/app/Services/PurchaseOrder/CreateInvitations.php
@@ -9,7 +9,6 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 namespace App\Services\PurchaseOrder;
 
 use App\Factory\PurchaseOrderInvitationFactory;
@@ -44,14 +43,13 @@ class CreateInvitations extends AbstractService
     {
         $contacts = $this->purchase_order->vendor->contacts()->get();
 
-        if($contacts->count() == 0){
+        if ($contacts->count() == 0) {
             $this->createBlankContact();
 
             $this->purchase_order->refresh();
             $contacts = $this->purchase_order->vendor->contacts;
         }
 
-
         $contacts->each(function ($contact) {
             $invitation = PurchaseOrderInvitation::where('company_id', $this->purchase_order->company_id)
                 ->where('vendor_contact_id', $contact->id)
@@ -60,14 +58,13 @@ class CreateInvitations extends AbstractService
                 ->first();
 
             if (! $invitation) {
-                try{
-                $ii = PurchaseOrderInvitationFactory::create($this->purchase_order->company_id, $this->purchase_order->user_id);
-                $ii->key = $this->createDbHash($this->purchase_order->company->db);
-                $ii->purchase_order_id = $this->purchase_order->id;
-                $ii->vendor_contact_id = $contact->id;
-                $ii->save();
-                }
-                catch(\Exception $e){
+                try {
+                    $ii = PurchaseOrderInvitationFactory::create($this->purchase_order->company_id, $this->purchase_order->user_id);
+                    $ii->key = $this->createDbHash($this->purchase_order->company->db);
+                    $ii->purchase_order_id = $this->purchase_order->id;
+                    $ii->vendor_contact_id = $contact->id;
+                    $ii->save();
+                } catch (\Exception $e) {
                     nlog($e->getMessage());
                 }
             } elseif (! $contact->send_email) {
@@ -75,12 +72,10 @@ class CreateInvitations extends AbstractService
             }
         });
 
-        if($this->purchase_order->invitations()->count() == 0) {
-
-            if($contacts->count() == 0){
+        if ($this->purchase_order->invitations()->count() == 0) {
+            if ($contacts->count() == 0) {
                 $contact = $this->createBlankContact();
-            }
-            else{
+            } else {
                 $contact = $contacts->first();
 
                 $invitation = PurchaseOrderInvitation::where('company_id', $this->purchase_order->company_id)
@@ -89,8 +84,9 @@ class CreateInvitations extends AbstractService
                     ->withTrashed()
                     ->first();
 
-                if($invitation){
+                if ($invitation) {
                     $invitation->restore();
+
                     return $this->purchase_order;
                 }
             }
diff --git a/app/Services/PurchaseOrder/GetPurchaseOrderPdf.php b/app/Services/PurchaseOrder/GetPurchaseOrderPdf.php
index 7d074ce4bb24..5d00388b8371 100644
--- a/app/Services/PurchaseOrder/GetPurchaseOrderPdf.php
+++ b/app/Services/PurchaseOrder/GetPurchaseOrderPdf.php
@@ -29,15 +29,15 @@ class GetPurchaseOrderPdf extends AbstractService
 
     public function run()
     {
-
         if (! $this->contact) {
             $this->contact = $this->purchase_order->vendor->contacts()->orderBy('send_email', 'DESC')->first();
         }
 
         $invitation = $this->purchase_order->invitations()->where('vendor_contact_id', $this->contact->id)->first();
 
-        if(!$invitation)
+        if (! $invitation) {
             $invitation = $this->purchase_order->invitations()->first();
+        }
 
         $path = $this->purchase_order->vendor->purchase_order_filepath($invitation);
 
@@ -49,10 +49,9 @@ class GetPurchaseOrderPdf extends AbstractService
         $file = Storage::disk($disk)->exists($file_path);
 
         if (! $file) {
-            $file_path = CreatePurchaseOrderPdf::dispatchNow($invitation);
+            $file_path = (new CreatePurchaseOrderPdf($invitation))->handle();
         }
 
         return $file_path;
-        
     }
 }
diff --git a/app/Services/PurchaseOrder/PurchaseOrderService.php b/app/Services/PurchaseOrder/PurchaseOrderService.php
index c6c1e57d4d90..1cabb4dd7fd8 100644
--- a/app/Services/PurchaseOrder/PurchaseOrderService.php
+++ b/app/Services/PurchaseOrder/PurchaseOrderService.php
@@ -52,7 +52,7 @@ class PurchaseOrderService
         $settings = $this->purchase_order->company->settings;
 
         if (! $this->purchase_order->design_id) 
-            $this->purchase_order->design_id = $this->decodePrimaryKey($settings->invoice_design_id);
+            $this->purchase_order->design_id = $this->decodePrimaryKey($settings->purchase_order_design_id);
         
         if (!isset($this->invoice->footer) || empty($this->invoice->footer)) 
             $this->purchase_order->footer = $settings->purchase_order_footer;
diff --git a/app/Services/PurchaseOrder/TriggeredActions.php b/app/Services/PurchaseOrder/TriggeredActions.php
index 76735129cf13..b6f1f3eee32d 100644
--- a/app/Services/PurchaseOrder/TriggeredActions.php
+++ b/app/Services/PurchaseOrder/TriggeredActions.php
@@ -39,7 +39,6 @@ class TriggeredActions extends AbstractService
 
     public function run()
     {
-
         if ($this->request->has('send_email') && $this->request->input('send_email') == 'true') {
             $this->purchase_order->service()->markSent()->touchPdf()->save();
             $this->sendEmail();
@@ -51,15 +50,13 @@ class TriggeredActions extends AbstractService
 
         // if ($this->request->has('cancel') && $this->request->input('cancel') == 'true') {
         //     $this->purchase_order = $this->purchase_order->service()->handleCancellation()->save();
-        // }        
+        // }
 
         return $this->purchase_order;
     }
 
     private function sendEmail()
     {
-
         PurchaseOrderEmail::dispatch($this->purchase_order, $this->purchase_order->company);
-
     }
 }
diff --git a/app/Services/Quote/ApplyNumber.php b/app/Services/Quote/ApplyNumber.php
index 3ceca85242a6..9b8c69b5fb14 100644
--- a/app/Services/Quote/ApplyNumber.php
+++ b/app/Services/Quote/ApplyNumber.php
@@ -41,7 +41,7 @@ class ApplyNumber
                 break;
             case 'when_sent':
                 if ($quote->status_id == Quote::STATUS_SENT) {
-                $quote = $this->trySaving($quote);
+                    $quote = $this->trySaving($quote);
                     // $quote->number = $this->getNextQuoteNumber($this->client, $quote);
                 }
                 break;
@@ -56,30 +56,22 @@ class ApplyNumber
 
     private function trySaving($quote)
     {
+        $x = 1;
 
-        $x=1;
-
-        do{
-
-            try{
-
+        do {
+            try {
                 $quote->number = $this->getNextQuoteNumber($this->client, $quote);
                 $quote->saveQuietly();
 
                 $this->completed = false;
-                
-
-            }
-            catch(QueryException $e){
-
+            } catch (QueryException $e) {
                 $x++;
 
-                if($x>10)
+                if ($x > 10) {
                     $this->completed = false;
+                }
             }
-        
-        }
-        while($this->completed);
+        } while ($this->completed);
 
         return $quote;
     }
diff --git a/app/Services/Quote/ConvertQuote.php b/app/Services/Quote/ConvertQuote.php
index eedb94bc7184..7d8347e79f18 100644
--- a/app/Services/Quote/ConvertQuote.php
+++ b/app/Services/Quote/ConvertQuote.php
@@ -52,20 +52,16 @@ class ConvertQuote
         $invoice_array['invitations'] = $invites;
 
         //try and convert the invoice number to a quote number here.
-        if($this->client->getSetting('shared_invoice_quote_counter'))
-        {
-           
+        if ($this->client->getSetting('shared_invoice_quote_counter')) {
             $converted_number = $this->harvestQuoteCounter($quote, $invoice, $this->client);
 
-            if($converted_number)
-            {
+            if ($converted_number) {
                 $invoice_array['number'] = $converted_number;
             }
-            
         }
 
         $invoice = $this->invoice_repo->save($invoice_array, $invoice);
-        
+
         $invoice->fresh();
 
         $invoice->service()
@@ -83,23 +79,21 @@ class ConvertQuote
 
     /**
      * Only create the invitations that are defined on the quote.
-     * 
+     *
      * @return Invoice $invoice
      */
     private function createConversionInvitations($invoice, $quote)
     {
         $invites = [];
 
-        foreach($quote->invitations as $quote_invitation){
-
+        foreach ($quote->invitations as $quote_invitation) {
             $ii = InvoiceInvitationFactory::create($invoice->company_id, $invoice->user_id);
             $ii->key = $this->createDbHash($invoice->company->db);
             $ii->client_contact_id = $quote_invitation->client_contact_id;
-        
+
             $invites[] = $ii;
         }
 
         return $invites;
     }
-
 }
diff --git a/app/Services/Quote/CreateInvitations.php b/app/Services/Quote/CreateInvitations.php
index 804bd1483736..3259bfc779ab 100644
--- a/app/Services/Quote/CreateInvitations.php
+++ b/app/Services/Quote/CreateInvitations.php
@@ -21,7 +21,7 @@ use Illuminate\Support\Str;
 class CreateInvitations
 {
     use MakesHash;
-    
+
     public $quote;
 
     public function __construct(Quote $quote)
@@ -31,17 +31,16 @@ class CreateInvitations
 
     public function run()
     {
+        $contacts = $this->quote->client->contacts;
 
-       $contacts = $this->quote->client->contacts;
-
-        if($contacts->count() == 0){
+        if ($contacts->count() == 0) {
             $this->createBlankContact();
 
             $this->quote->refresh();
             $contacts = $this->quote->client->contacts;
         }
 
-        $contacts->each(function ($contact){
+        $contacts->each(function ($contact) {
             $invitation = QuoteInvitation::whereCompanyId($this->quote->company_id)
                 ->whereClientContactId($contact->id)
                 ->whereQuoteId($this->quote->id)
@@ -59,31 +58,30 @@ class CreateInvitations
             }
         });
 
-        if($this->quote->invitations()->count() == 0) {
-            
-            if($contacts->count() == 0){
+        if ($this->quote->invitations()->count() == 0) {
+            if ($contacts->count() == 0) {
                 $contact = $this->createBlankContact();
-            }
-            else{
+            } else {
                 $contact = $contacts->first();
 
-                            $invitation = QuoteInvitation::where('company_id', $this->quote->company_id)
+                $invitation = QuoteInvitation::where('company_id', $this->quote->company_id)
                                         ->where('client_contact_id', $contact->id)
                                         ->where('quote_id', $this->quote->id)
                                         ->withTrashed()
                                         ->first();
 
-                            if($invitation){
-                                $invitation->restore();
-                                return $this->quote;
-                            }
+                if ($invitation) {
+                    $invitation->restore();
+
+                    return $this->quote;
+                }
             }
 
-                $ii = QuoteInvitationFactory::create($this->quote->company_id, $this->quote->user_id);
-                $ii->key = $this->createDbHash($this->quote->company->db);
-                $ii->quote_id = $this->quote->id;
-                $ii->client_contact_id = $contact->id;
-                $ii->save();
+            $ii = QuoteInvitationFactory::create($this->quote->company_id, $this->quote->user_id);
+            $ii->key = $this->createDbHash($this->quote->company->db);
+            $ii->quote_id = $this->quote->id;
+            $ii->client_contact_id = $contact->id;
+            $ii->save();
         }
 
         return $this->quote->fresh();
@@ -97,5 +95,4 @@ class CreateInvitations
         $new_contact->is_primary = true;
         $new_contact->save();
     }
-
 }
diff --git a/app/Services/Quote/GetQuotePdf.php b/app/Services/Quote/GetQuotePdf.php
index 4ad3a480144d..2c6d6e820ed3 100644
--- a/app/Services/Quote/GetQuotePdf.php
+++ b/app/Services/Quote/GetQuotePdf.php
@@ -29,7 +29,7 @@ class GetQuotePdf extends AbstractService
 
     public function run()
     {
-        if (! $this->contact) {
+        if (!$this->contact) {
             $this->contact = $this->quote->client->primary_contact()->first() ?: $this->quote->client->contacts()->first();
         }
 
@@ -37,13 +37,14 @@ class GetQuotePdf extends AbstractService
 
         $path = $this->quote->client->quote_filepath($invitation);
 
-        $file_path = $path.$this->quote->numberFormatter().'.pdf';
+        $file_path = $path . $this->quote->numberFormatter() . '.pdf';
 
         // $disk = 'public';
         $disk = config('filesystems.default');
-        
-        $file_path = CreateEntityPdf::dispatchNow($invitation);
-        
+
+
+        $file_path = (new CreateEntityPdf($invitation))->handle();
+
         return $file_path;
         //return Storage::disk($disk)->path($file_path);
     }
diff --git a/app/Services/Quote/MarkSent.php b/app/Services/Quote/MarkSent.php
index a7dd63098ac2..34113ba7550e 100644
--- a/app/Services/Quote/MarkSent.php
+++ b/app/Services/Quote/MarkSent.php
@@ -39,9 +39,7 @@ class MarkSent
         $this->quote->markInvitationsSent();
 
         if ($this->quote->due_date != '' || $this->quote->client->getSetting('valid_until') == '') {
-            
-        }
-        else{
+        } else {
             $this->quote->due_date = Carbon::parse($this->quote->date)->addDays($this->quote->client->getSetting('valid_until'));
         }
 
diff --git a/app/Services/Quote/QuoteService.php b/app/Services/Quote/QuoteService.php
index 09bee6aea763..8a8174c3ea4c 100644
--- a/app/Services/Quote/QuoteService.php
+++ b/app/Services/Quote/QuoteService.php
@@ -25,7 +25,7 @@ use App\Utils\Traits\MakesHash;
 class QuoteService
 {
     use MakesHash;
-    
+
     public $quote;
 
     public $invoice;
@@ -107,7 +107,7 @@ class QuoteService
     {
         $this->setStatus(Quote::STATUS_APPROVED)->save();
 
-        if (!$contact) {
+        if (! $contact) {
             $contact = $this->quote->invitations->first()->contact;
         }
 
@@ -119,7 +119,6 @@ class QuoteService
                  ->markSent()
                  ->touchPdf()
                  ->save();
-
         }
 
         event(new QuoteWasApproved($contact, $this->quote, $this->quote->company, Ninja::eventVars()));
@@ -135,11 +134,9 @@ class QuoteService
     public function touchPdf($force = false)
     {
         try {
-        
-            if($force){
-
+            if ($force) {
                 $this->quote->invitations->each(function ($invitation) {
-                    CreateEntityPdf::dispatchNow($invitation);
+                    (new CreateEntityPdf($invitation))->handle();
                 });
 
                 return $this;
@@ -148,12 +145,8 @@ class QuoteService
             $this->quote->invitations->each(function ($invitation) {
                 CreateEntityPdf::dispatch($invitation);
             });
-        
-        }
-        catch(\Exception $e){
-
-            nlog("failed creating invoices in Touch PDF");
-        
+        } catch (\Exception $e) {
+            nlog('failed creating invoices in Touch PDF');
         }
 
         return $this;
@@ -163,19 +156,17 @@ class QuoteService
     {
         $this->setStatus(Quote::STATUS_APPROVED)->save();
 
-        if (!$contact) {
+        if (! $contact) {
             $contact = $this->quote->invitations->first()->contact;
         }
-        
+
         event(new QuoteWasApproved($contact, $this->quote, $this->quote->company, Ninja::eventVars()));
 
         return $this;
     }
-    
 
     public function convertToInvoice()
     {
-
         $this->convert();
 
         $this->invoice->service()->createInvitations();
@@ -200,22 +191,27 @@ class QuoteService
     {
         $settings = $this->quote->client->getMergedSettings();
 
-        if (! $this->quote->design_id) 
+        if (! $this->quote->design_id) {
             $this->quote->design_id = $this->decodePrimaryKey($settings->quote_design_id);
-            
-        if (!isset($this->quote->footer)) 
-            $this->quote->footer = $settings->quote_footer;
-        
-        if (!isset($this->quote->terms)) 
-            $this->quote->terms = $settings->quote_terms;
-        
-        /* If client currency differs from the company default currency, then insert the client exchange rate on the model.*/
-        if(!isset($this->quote->exchange_rate) && $this->quote->client->currency()->id != (int) $this->quote->company->settings->currency_id)
-            $this->quote->exchange_rate = $this->quote->client->currency()->exchange_rate;
+        }
 
-        if (!isset($this->quote->public_notes)) 
+        if (! isset($this->quote->footer)) {
+            $this->quote->footer = $settings->quote_footer;
+        }
+
+        if (! isset($this->quote->terms)) {
+            $this->quote->terms = $settings->quote_terms;
+        }
+
+        /* If client currency differs from the company default currency, then insert the client exchange rate on the model.*/
+        if (! isset($this->quote->exchange_rate) && $this->quote->client->currency()->id != (int) $this->quote->company->settings->currency_id) {
+            $this->quote->exchange_rate = $this->quote->client->currency()->exchange_rate;
+        }
+
+        if (! isset($this->quote->public_notes)) {
             $this->quote->public_notes = $this->quote->client->public_notes;
-        
+        }
+
         return $this;
     }
 
@@ -228,10 +224,8 @@ class QuoteService
 
     public function deletePdf()
     {
-        $this->quote->invitations->each(function ($invitation){
-
-            UnlinkFile::dispatchNow(config('filesystems.default'), $this->quote->client->quote_filepath($invitation) . $this->quote->numberFormatter().'.pdf');
-
+        $this->quote->invitations->each(function ($invitation) {
+            (new UnlinkFile(config('filesystems.default'), $this->quote->client->quote_filepath($invitation).$this->quote->numberFormatter().'.pdf'))->handle();
         });
 
         return $this;
diff --git a/app/Services/Quote/SendEmail.php b/app/Services/Quote/SendEmail.php
index c433d03d9790..9c319325a48c 100644
--- a/app/Services/Quote/SendEmail.php
+++ b/app/Services/Quote/SendEmail.php
@@ -40,13 +40,14 @@ class SendEmail
         if (! $this->reminder_template) {
             $this->reminder_template = $this->quote->calculateTemplate('quote');
         }
+        
+        $this->quote->service()->markSent()->save();
 
         $this->quote->invitations->each(function ($invitation) {
-            if (!$invitation->contact->trashed() && $invitation->contact->email) {
-                EmailEntity::dispatchNow($invitation, $invitation->company, $this->reminder_template);
+            if (! $invitation->contact->trashed() && $invitation->contact->email) {
+                EmailEntity::dispatch($invitation, $invitation->company, $this->reminder_template);
             }
         });
 
-        $this->quote->service()->markSent();
     }
 }
diff --git a/app/Services/Quote/TriggeredActions.php b/app/Services/Quote/TriggeredActions.php
index 69b17af53880..ee2c619c690a 100644
--- a/app/Services/Quote/TriggeredActions.php
+++ b/app/Services/Quote/TriggeredActions.php
@@ -36,7 +36,6 @@ class TriggeredActions extends AbstractService
 
     public function run()
     {
-
         if ($this->request->has('send_email') && $this->request->input('send_email') == 'true') {
             $this->quote = $this->quote->service()->markSent()->save();
             $this->sendEmail();
@@ -48,19 +47,17 @@ class TriggeredActions extends AbstractService
 
         if ($this->request->has('convert') && $this->request->input('convert') == 'true') {
             $this->quote = $this->quote->service()->convert()->save();
-        }        
+        }
 
         if ($this->request->has('approve') && $this->request->input('approve') == 'true' && in_array($this->quote->status_id, [Quote::STATUS_SENT, Quote::STATUS_DRAFT])) {
             $this->quote = $this->quote->service()->approveWithNoCoversion()->save();
-        }        
+        }
 
-        
         return $this->quote;
     }
 
     private function sendEmail()
     {
-
         $reminder_template = $this->quote->calculateTemplate('quote');
         // $reminder_template = 'email_template_quote';
 
diff --git a/app/Services/Recurring/ApplyNumber.php b/app/Services/Recurring/ApplyNumber.php
index 227c12c4c584..e43bbb8b1492 100644
--- a/app/Services/Recurring/ApplyNumber.php
+++ b/app/Services/Recurring/ApplyNumber.php
@@ -36,8 +36,9 @@ class ApplyNumber extends AbstractService
     /* Recurring numbers are set when saved */
     public function run()
     {
-        if ($this->recurring_entity->number != '')
+        if ($this->recurring_entity->number != '') {
             return $this->recurring_entity;
+        }
 
         $this->trySaving();
         //$this->recurring_entity->number = $this->getNextRecurringInvoiceNumber($this->client, $this->recurring_entity);
@@ -47,30 +48,21 @@ class ApplyNumber extends AbstractService
 
     private function trySaving()
     {
+        $x = 1;
 
-        $x=1;
-
-        do{
-
-            try{
-
+        do {
+            try {
                 $this->recurring_entity->number = $this->getNextRecurringInvoiceNumber($this->client, $this->recurring_entity);
                 $this->recurring_entity->saveQuietly();
 
                 $this->completed = false;
-                
-
-            }
-            catch(QueryException $e){
-
+            } catch (QueryException $e) {
                 $x++;
 
-                if($x>10)
+                if ($x > 10) {
                     $this->completed = false;
+                }
             }
-        
-        }
-        while($this->completed);
-
+        } while ($this->completed);
     }
 }
diff --git a/app/Services/Recurring/CreateRecurringInvitations.php b/app/Services/Recurring/CreateRecurringInvitations.php
index 4a778a8055e7..0aec0a0eafaa 100644
--- a/app/Services/Recurring/CreateRecurringInvitations.php
+++ b/app/Services/Recurring/CreateRecurringInvitations.php
@@ -19,7 +19,7 @@ use Illuminate\Support\Str;
 class CreateRecurringInvitations extends AbstractService
 {
     use MakesHash;
-    
+
     private $entity;
 
     private $entity_name;
@@ -34,9 +34,9 @@ class CreateRecurringInvitations extends AbstractService
     {
         $this->entity = $entity;
         $this->entity_name = lcfirst(Str::snake(class_basename($entity)));
-        $this->entity_id_name = $this->entity_name . "_id";
-        $this->invitation_class = 'App\Models\\' . ucfirst(Str::camel($this->entity_name)) . "Invitation";
-        $this->invitation_factory = 'App\Factory\\' . ucfirst(Str::camel($this->entity_name)) . "InvitationFactory";
+        $this->entity_id_name = $this->entity_name.'_id';
+        $this->invitation_class = 'App\Models\\'.ucfirst(Str::camel($this->entity_name)).'Invitation';
+        $this->invitation_factory = 'App\Factory\\'.ucfirst(Str::camel($this->entity_name)).'InvitationFactory';
     }
 
     public function run()
@@ -63,6 +63,19 @@ class CreateRecurringInvitations extends AbstractService
             info($e->getMessage());
         }
 
+        if ($this->entity->invitations()->count() == 0) {
+
+            $invitation = $this->invitation_class::where('company_id', $this->entity->company_id)
+                                    ->where($this->entity_id_name, $this->entity->id)
+                                    ->withTrashed()
+                                    ->first();
+
+            if ($invitation) 
+                $invitation->restore();
+                
+        }
+
+
         return $this->entity;
     }
 }
diff --git a/app/Services/Recurring/GetInvoicePdf.php b/app/Services/Recurring/GetInvoicePdf.php
index e66b0a3923bd..bde2f4b6ff65 100644
--- a/app/Services/Recurring/GetInvoicePdf.php
+++ b/app/Services/Recurring/GetInvoicePdf.php
@@ -46,9 +46,9 @@ class GetInvoicePdf extends AbstractService
         $file = Storage::disk($disk)->exists($file_path);
 
         if (! $file) {
-            $file_path = CreateEntityPdf::dispatchNow($invitation);
+            $file_path = (new CreateEntityPdf($invitation))->handle();
         }
- 
+
         return $file_path;
     }
 }
diff --git a/app/Services/Recurring/RecurringService.php b/app/Services/Recurring/RecurringService.php
index f02173fbcdb6..e4ac54840230 100644
--- a/app/Services/Recurring/RecurringService.php
+++ b/app/Services/Recurring/RecurringService.php
@@ -125,7 +125,7 @@ class RecurringService
     
         if($this->recurring_entity instanceof RecurringInvoice && $this->recurring_entity->status_id == RecurringInvoice::STATUS_DRAFT){
             $this->start()->save();
-            SendRecurring::dispatchNow($this->recurring_entity, $this->recurring_entity->company->db); 
+            SendRecurring::dispatch($this->recurring_entity, $this->recurring_entity->company->db); 
         }
 
         return $this->recurring_entity;
diff --git a/app/Services/Report/ProfitLoss.php b/app/Services/Report/ProfitLoss.php
index 7905301cd713..ac8c62a0727d 100644
--- a/app/Services/Report/ProfitLoss.php
+++ b/app/Services/Report/ProfitLoss.php
@@ -21,8 +21,8 @@ use App\Utils\Ninja;
 use App\Utils\Number;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\App;
-use League\Csv\Writer;
 use Illuminate\Support\Str;
+use League\Csv\Writer;
 
 class ProfitLoss
 {
@@ -58,26 +58,26 @@ class ProfitLoss
 
     protected CurrencyApi $currency_api;
 
-   /*
-        payload variables.
+    /*
+         payload variables.
 
-        start_date - Y-m-d
-        end_date - Y-m-d
-        date_range - 
-            all
-            last7
-            last30
-            this_month
-            last_month
-            this_quarter
-            last_quarter
-            this_year
-            custom
-        is_income_billed - true = Invoiced || false = Payments
-        is_expense_billed - true = Expensed || false = Expenses marked as paid
-        include_tax - true tax_included || false - tax_excluded
+         start_date - Y-m-d
+         end_date - Y-m-d
+         date_range -
+             all
+             last7
+             last30
+             this_month
+             last_month
+             this_quarter
+             last_quarter
+             this_year
+             custom
+         is_income_billed - true = Invoiced || false = Payments
+         is_expense_billed - true = Expensed || false = Expenses marked as paid
+         include_tax - true tax_included || false - tax_excluded
 
-    */
+     */
 
     protected array $payload;
 
@@ -93,17 +93,16 @@ class ProfitLoss
 
         $this->setBillingReportType();
     }
-    
+
     public function build()
     {
         MultiDB::setDb($this->company->db);
 
-        if($this->is_income_billed){ //get invoiced amounts
-            
-            $this->filterIncome();
+        if ($this->is_income_billed) { //get invoiced amounts
+
+            $this->filterIncome();
+        } else {
 
-        }else {
-            
             //$this->filterPaymentIncome();
             $this->filterInvoicePaymentIncome();
         }
@@ -115,7 +114,7 @@ class ProfitLoss
 
     public function getIncome() :float
     {
-        return round($this->income,2);
+        return round($this->income, 2);
     }
 
     public function getIncomeMap() :array
@@ -125,7 +124,7 @@ class ProfitLoss
 
     public function getIncomeTaxes() :float
     {
-        return round($this->income_taxes,2);
+        return round($this->income_taxes, 2);
     }
 
     public function getExpenses() :array
@@ -134,7 +133,7 @@ class ProfitLoss
     }
 
     public function getExpenseBreakDown() :array
-    {   
+    {
         ksort($this->expense_break_down);
 
         return $this->expense_break_down;
@@ -150,27 +149,24 @@ class ProfitLoss
         $this->income_taxes = 0;
         $this->income_map = $invoices;
 
-        foreach($invoices as $invoice){
+        foreach ($invoices as $invoice) {
             $this->income += $invoice->net_converted_amount;
             $this->income_taxes += $invoice->net_converted_taxes;
 
-
-            $currency = Currency::find(intval(str_replace('"','',$invoice->currency_id)));
+            $currency = Currency::find(intval(str_replace('"', '', $invoice->currency_id)));
             $currency->name = ctrans('texts.currency_'.Str::slug($currency->name, '_'));
 
             $this->foreign_income[] = ['currency' => $currency->name, 'amount' => $invoice->amount, 'total_taxes' => $invoice->total_taxes];
         }
 
         return $this;
-
     }
 
     private function filterInvoicePaymentIncome()
     {
-
         $this->paymentEloquentIncome();
 
-        foreach($this->invoice_payment_map as $map) {
+        foreach ($this->invoice_payment_map as $map) {
             $this->income += $map->amount_payment_paid_converted - $map->tax_amount_converted;
             $this->income_taxes += $map->tax_amount_converted;
 
@@ -190,7 +186,6 @@ class ProfitLoss
         // }
 
         return $this;
-        
     }
 
     private function getForeignIncome() :array
@@ -232,8 +227,8 @@ class ProfitLoss
        ]
    */
     private function invoiceIncome()
-    { 
-        return \DB::select( \DB::raw("
+    {
+        return \DB::select(\DB::raw("
             SELECT
             sum(invoices.amount) as amount,
             sum(invoices.total_taxes) as total_taxes,
@@ -251,39 +246,36 @@ class ProfitLoss
             AND invoices.is_deleted = 0
             AND (invoices.date BETWEEN :start_date AND :end_date)
             GROUP BY currency_id
-        "), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $this->start_date, 'end_date' => $this->end_date]  );
-
+        "), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $this->start_date, 'end_date' => $this->end_date]);
     }
 
     /**
      * The income calculation is based on the total payments received during
      * the selected time period.
-     * 
+     *
      * Once we have the payments we iterate through the attached invoices and
      * we also determine the total taxes paid as our
      * Profit and loss statement should be net of all taxes
-     * 
+     *
      * This calculation also considers partial payments and pro rata's any taxes.
-     * 
+     *
      * This calculation also considers exchange rates and we convert (based on the payment exchange rate)
      * to the native company currency.
      */
     private function paymentEloquentIncome()
     {
-
         $this->invoice_payment_map = [];
 
         Payment::where('company_id', $this->company->id)
-                        ->whereIn('status_id', [1,4,5])
+                        ->whereIn('status_id', [1, 4, 5])
                         ->where('is_deleted', 0)
                         ->whereBetween('date', [$this->start_date, $this->end_date])
                         ->whereHas('client', function ($query) {
-                             $query->where('is_deleted',0);
+                            $query->where('is_deleted', 0);
                         })
-                        ->with(['company','client'])
+                        ->with(['company', 'client'])
                         ->cursor()
-                        ->each(function ($payment){
-
+                        ->each(function ($payment) {
                             $company = $payment->company;
                             $client = $payment->client;
 
@@ -297,11 +289,8 @@ class ProfitLoss
                             $tax_amount_credit = 0;
                             $tax_amount_credit_converted = $tax_amount_credit_converted = 0;
 
-                            foreach($payment->paymentables as $pivot)
-                            {
-
-                                if($pivot->paymentable instanceOf \App\Models\Invoice){
-
+                            foreach ($payment->paymentables as $pivot) {
+                                if ($pivot->paymentable instanceof \App\Models\Invoice) {
                                     $invoice = $pivot->paymentable;
 
                                     $amount_payment_paid += $pivot->amount - $pivot->refunded;
@@ -309,19 +298,15 @@ class ProfitLoss
 
                                     $tax_amount += ($amount_payment_paid / $invoice->amount) * $invoice->total_taxes;
                                     $tax_amount_converted += (($amount_payment_paid / $invoice->amount) * $invoice->total_taxes) / $payment->exchange_rate;
-
                                 }
 
-
-                                if($pivot->paymentable instanceOf \App\Models\Credit){
-
+                                if ($pivot->paymentable instanceof \App\Models\Credit) {
                                     $amount_credit_paid += $pivot->amount - $pivot->refunded;
                                     $amount_credit_paid_converted += $amount_payment_paid / ($payment->exchange_rate ?: 1);
 
                                     $tax_amount_credit += ($amount_payment_paid / $invoice->amount) * $invoice->total_taxes;
                                     $tax_amount_credit_converted += (($amount_payment_paid / $invoice->amount) * $invoice->total_taxes) / $payment->exchange_rate;
                                 }
-
                             }
 
                             $map->amount_payment_paid = $amount_payment_paid;
@@ -335,11 +320,9 @@ class ProfitLoss
                             $map->currency_id = $payment->currency_id;
 
                             $this->invoice_payment_map[] = $map;
-
                         });
 
         return $this;
-
     }
 
     /**
@@ -359,11 +342,9 @@ class ProfitLoss
        +"currency_id": ""2"",
      },
    ]
-   */
-
+     */
     public function getCsv()
     {
-
         MultiDB::setDb($this->company->db);
         App::forgetInstance('translator');
         App::setLocale($this->company->locale());
@@ -389,8 +370,7 @@ class ProfitLoss
         //expense
 
         $csv->insertOne(['--------------------']);
-        foreach($this->expense_break_down as $expense_breakdown)
-        {
+        foreach ($this->expense_break_down as $expense_breakdown) {
             $csv->insertOne([$expense_breakdown['category_name'], Number::formatMoney($expense_breakdown['total'], $this->company)]);
         }
         //total expense taxes
@@ -400,7 +380,6 @@ class ProfitLoss
 
         $csv->insertOne([ctrans('texts.total_taxes'), Number::formatMoney(array_sum(array_column($this->expense_break_down, 'tax')), $this->company)]);
 
-
         $csv->insertOne(['--------------------']);
         $csv->insertOne([ctrans('texts.total_profit'), Number::formatMoney($this->income - array_sum(array_column($this->expense_break_down, 'total')), $this->company)]);
 
@@ -411,18 +390,16 @@ class ProfitLoss
         $csv->insertOne(['']);
 
         $csv->insertOne([ctrans('texts.currency'), ctrans('texts.amount'), ctrans('texts.total_taxes')]);
-        foreach($this->foreign_income as $foreign_income)
-        {
+        foreach ($this->foreign_income as $foreign_income) {
             $csv->insertOne([$foreign_income['currency'], ($foreign_income['amount'] - $foreign_income['total_taxes']), $foreign_income['total_taxes']]);
         }
 
-        return  $csv->toString(); 
-
+        return  $csv->toString();
     }
 
     private function invoicePaymentIncome()
     {
-        return \DB::select( \DB::raw("
+        return \DB::select(\DB::raw("
             SELECT
             sum(invoices.amount - invoices.balance) as amount,
             sum(invoices.total_taxes) * ((sum(invoices.amount - invoices.balance)/invoices.amount)) as total_taxes,
@@ -439,17 +416,17 @@ class ProfitLoss
             AND invoices.is_deleted = 0
             AND (invoices.date BETWEEN :start_date AND :end_date)
             GROUP BY currency_id
-        "), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $this->start_date, 'end_date' => $this->end_date]  );
+        "), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $this->start_date, 'end_date' => $this->end_date]);
     }
 
     /**
        +"payments": "12260.870000",
        +"payments_converted": "12260.870000000000",
        +"currency_id": 1,
-    */
+     */
     private function paymentIncome()
     {
-        return \DB::select( \DB::raw("
+        return \DB::select(\DB::raw('
              SELECT 
              SUM(coalesce(payments.amount - payments.refunded,0)) as payments,
              SUM(coalesce(payments.amount - payments.refunded,0)) * IFNULL(payments.exchange_rate ,1) as payments_converted,
@@ -465,25 +442,20 @@ class ProfitLoss
              AND (payments.date BETWEEN :start_date AND :end_date)
              GROUP BY currency_id
              ORDER BY currency_id;
-        "), ['company_id' => $this->company->id, 'start_date' => $this->start_date, 'end_date' => $this->end_date]);
-    
-
+        '), ['company_id' => $this->company->id, 'start_date' => $this->start_date, 'end_date' => $this->end_date]);
     }
 
     private function expenseData()
     {
-
         $expenses = Expense::where('company_id', $this->company->id)
                            ->where('is_deleted', 0)
                            ->withTrashed()
                            ->whereBetween('date', [$this->start_date, $this->end_date])
                            ->cursor();
 
-
         $this->expenses = [];
 
-        foreach($expenses as $expense)
-        {
+        foreach ($expenses as $expense) {
             $map = new \stdClass;
 
             $amount = $expense->amount;
@@ -491,44 +463,42 @@ class ProfitLoss
             $map->total = $expense->amount;
             $map->converted_total = $converted_total = $this->getConvertedTotal($expense->amount, $expense->exchange_rate);
             $map->tax = $tax = $this->getTax($expense);
-            $map->net_converted_total = $expense->uses_inclusive_taxes ? ( $converted_total - $tax ) : $converted_total;
+            $map->net_converted_total = $expense->uses_inclusive_taxes ? ($converted_total - $tax) : $converted_total;
             $map->category_id = $expense->category_id;
-            $map->category_name = $expense->category ? $expense->category->name : "No Category Defined";
+            $map->category_name = $expense->category ? $expense->category->name : 'No Category Defined';
             $map->currency_id = $expense->currency_id ?: $expense->company->settings->currency_id;
 
-                $this->expenses[] = $map;
-
+            $this->expenses[] = $map;
         }
 
-        
-        return $this;        
+        return $this;
     }
 
     private function buildExpenseBreakDown()
     {
         $data = [];
 
-        foreach($this->expenses as $expense)
-        {
-            if(!array_key_exists($expense->category_id, $data))
+        foreach ($this->expenses as $expense) {
+            if (! array_key_exists($expense->category_id, $data)) {
                 $data[$expense->category_id] = [];
+            }
 
-            if(!array_key_exists('total', $data[$expense->category_id]))
+            if (! array_key_exists('total', $data[$expense->category_id])) {
                 $data[$expense->category_id]['total'] = 0;
-            
-            if(!array_key_exists('tax', $data[$expense->category_id]))
+            }
+
+            if (! array_key_exists('tax', $data[$expense->category_id])) {
                 $data[$expense->category_id]['tax'] = 0;
-            
+            }
+
             $data[$expense->category_id]['total'] += $expense->net_converted_total;
             $data[$expense->category_id]['category_name'] = $expense->category_name;
             $data[$expense->category_id]['tax'] += $expense->tax;
-
         }
 
         $this->expense_break_down = $data;
 
         return $this;
-
     }
 
     private function getTax($expense)
@@ -536,8 +506,7 @@ class ProfitLoss
         $amount = $expense->amount;
         //is amount tax
 
-        if($expense->calculate_tax_by_amount)
-        {
+        if ($expense->calculate_tax_by_amount) {
             nlog($expense->tax_amount1);
             nlog($expense->tax_amount2);
             nlog($expense->tax_amount3);
@@ -545,17 +514,14 @@ class ProfitLoss
             return $expense->tax_amount1 + $expense->tax_amount2 + $expense->tax_amount3;
         }
 
-
-        if($expense->uses_inclusive_taxes){
-
+        if ($expense->uses_inclusive_taxes) {
             $inclusive = 0;
 
             $inclusive += ($amount - ($amount / (1 + ($expense->tax_rate1 / 100))));
             $inclusive += ($amount - ($amount / (1 + ($expense->tax_rate2 / 100))));
             $inclusive += ($amount - ($amount / (1 + ($expense->tax_rate3 / 100))));
 
-            return round($inclusive,2);
-
+            return round($inclusive, 2);
         }
 
         $exclusive = 0;
@@ -564,20 +530,17 @@ class ProfitLoss
         $exclusive += $amount * ($expense->tax_rate2 / 100);
         $exclusive += $amount * ($expense->tax_rate3 / 100);
 
-
         return $exclusive;
-
     }
 
     private function getConvertedTotal($amount, $exchange_rate = 1)
     {
-        return round(($amount * $exchange_rate) ,2);
+        return round(($amount * $exchange_rate), 2);
     }
 
     private function expenseCalcWithTax()
     {
-
-      return \DB::select( \DB::raw("
+        return \DB::select(\DB::raw('
             SELECT sum(expenses.amount) as amount,
             IFNULL(expenses.currency_id, :company_currency) as currency_id
             FROM expenses
@@ -585,48 +548,44 @@ class ProfitLoss
             AND expenses.company_id = :company_id
             AND (expenses.date BETWEEN :start_date AND :end_date)
             GROUP BY currency_id
-        "), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $this->start_date, 'end_date' => $this->end_date]  );
-
+        '), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $this->start_date, 'end_date' => $this->end_date]);
     }
 
     private function setBillingReportType()
     {
-
-        if(array_key_exists('is_income_billed', $this->payload))
+        if (array_key_exists('is_income_billed', $this->payload)) {
             $this->is_income_billed = boolval($this->payload['is_income_billed']);
+        }
 
-        if(array_key_exists('is_expense_billed', $this->payload))
+        if (array_key_exists('is_expense_billed', $this->payload)) {
             $this->is_expense_billed = boolval($this->payload['is_expense_billed']);
+        }
 
-        if(array_key_exists('include_tax', $this->payload))
+        if (array_key_exists('include_tax', $this->payload)) {
             $this->is_tax_included = boolval($this->payload['include_tax']);
+        }
 
         $this->addDateRange();
 
         return $this;
-
     }
 
     private function addDateRange()
     {
         $date_range = 'this_year';
 
-        if(array_key_exists('date_range', $this->payload))
+        if (array_key_exists('date_range', $this->payload)) {
             $date_range = $this->payload['date_range'];
-        
-        try{
-
-            $custom_start_date = Carbon::parse($this->payload['start_date']);
-            $custom_end_date = Carbon::parse($this->payload['end_date']);    
-
         }
-        catch(\Exception $e){
 
+        try {
+            $custom_start_date = Carbon::parse($this->payload['start_date']);
+            $custom_end_date = Carbon::parse($this->payload['end_date']);
+        } catch (\Exception $e) {
             $custom_start_date = now()->startOfYear();
             $custom_end_date = now();
-
         }
-        
+
         switch ($date_range) {
 
             case 'all':
@@ -673,7 +632,5 @@ class ProfitLoss
         }
 
         return $this;
-
     }
-
 }
diff --git a/app/Services/Subscription/ZeroCostProduct.php b/app/Services/Subscription/ZeroCostProduct.php
index 0d1f8def7850..f0947cb0a35e 100644
--- a/app/Services/Subscription/ZeroCostProduct.php
+++ b/app/Services/Subscription/ZeroCostProduct.php
@@ -28,13 +28,12 @@ class ZeroCostProduct extends AbstractService
         'contact_id' => $this->contact->id,
         'client_id' => $this->contact->client->id,
     ];
-    */  
+     */
     public function __construct(Subscription $subscription, array $data)
     {
         $this->subscription = $subscription;
 
         $this->data = $data;
-
     }
 
     public function run()
@@ -51,8 +50,7 @@ class ZeroCostProduct extends AbstractService
 
         //create a recurring zero dollar invoice attached to this subscription.
 
-        if(strlen($this->subscription->recurring_product_ids) >=1){
-
+        if (strlen($this->subscription->recurring_product_ids) >= 1) {
             $recurring_invoice = $this->subscription->service()->convertInvoiceToRecurring($this->data['client_id']);
             $recurring_invoice_repo = new RecurringInvoiceRepository();
 
@@ -83,5 +81,4 @@ class ZeroCostProduct extends AbstractService
 
         return ['redirect_url' => $redirect_url];
     }
-
 }
diff --git a/app/Services/TaskScheduler/TaskSchedulerService.php b/app/Services/TaskScheduler/TaskSchedulerService.php
index 63b022a0d552..497601e9c43e 100644
--- a/app/Services/TaskScheduler/TaskSchedulerService.php
+++ b/app/Services/TaskScheduler/TaskSchedulerService.php
@@ -11,7 +11,6 @@
 
 namespace App\Services\TaskScheduler;
 
-
 use App\Export\CSV\ClientExport;
 use App\Export\CSV\ContactExport;
 use App\Export\CSV\CreditExport;
@@ -52,13 +51,12 @@ class TaskSchedulerService
     {
         $scheduler->action_name = $request->job;
         $scheduler->paused = $request->get('paused', false);
-        $scheduler->start_from = $request->get('start_from') ? Carbon::parse((int)$request->get('start_from')) : Carbon::now();
+        $scheduler->start_from = $request->get('start_from') ? Carbon::parse((int) $request->get('start_from')) : Carbon::now();
         $scheduler->repeat_every = $request->get('repeat_every');
-        $scheduler->scheduled_run = $request->get('start_from') ? Carbon::parse((int)$request->get('start_from')) : Carbon::now();;
+        $scheduler->scheduled_run = $request->get('start_from') ? Carbon::parse((int) $request->get('start_from')) : Carbon::now();
         $scheduler->company_id = auth()->user()->company()->id;
         $scheduler = $this->setJobParameters($scheduler, $request);
         $scheduler->save();
-
     }
 
     public function update(Scheduler $scheduler, UpdateScheduleRequest $request)
diff --git a/app/Services/User/UserService.php b/app/Services/User/UserService.php
index 72eb0f5d187d..b5ca12273ab4 100644
--- a/app/Services/User/UserService.php
+++ b/app/Services/User/UserService.php
@@ -21,7 +21,6 @@ use App\Utils\Ninja;
 
 class UserService
 {
-
     public $user;
 
     public function __construct(User $user)
@@ -32,7 +31,6 @@ class UserService
     public function invite($company)
     {
         try {
-
             $nmo = new NinjaMailerObject;
             $nmo->mailable = new NinjaMailer((new VerifyUserObject($this->user, $company))->build());
             $nmo->company = $company;
@@ -42,9 +40,8 @@ class UserService
             NinjaMailerJob::dispatch($nmo, true);
 
             Ninja::registerNinjaUser($this->user);
-            
         } catch (\Exception $e) {
-            nlog("I couldn't send the verification email " . $e->getMessage());
+            nlog("I couldn't send the verification email ".$e->getMessage());
         }
 
         return $this->user;
diff --git a/app/Transformers/AccountTransformer.php b/app/Transformers/AccountTransformer.php
index c8c0b10274b5..46bce69240ed 100644
--- a/app/Transformers/AccountTransformer.php
+++ b/app/Transformers/AccountTransformer.php
@@ -88,6 +88,7 @@ class AccountTransformer extends EntityTransformer
             'is_hosted' => (bool) Ninja::isHosted(),
             'set_react_as_default_ap' => (bool) $account->set_react_as_default_ap,
             'trial_days_left' => Ninja::isHosted() ? (int) $account->getTrialDays() : 0,
+            'account_sms_verified' => (bool) $account->account_sms_verified,
         ];
     }
 
diff --git a/app/Transformers/ActivityTransformer.php b/app/Transformers/ActivityTransformer.php
index ccf85586988c..7cfaf47941a1 100644
--- a/app/Transformers/ActivityTransformer.php
+++ b/app/Transformers/ActivityTransformer.php
@@ -150,5 +150,4 @@ class ActivityTransformer extends EntityTransformer
 
         return $this->includeItem($activity->task, $transformer, Task::class);
     }
-
 }
diff --git a/app/Transformers/ClientGatewayTokenTransformer.php b/app/Transformers/ClientGatewayTokenTransformer.php
index b0d386144c1f..d9169fde5e86 100644
--- a/app/Transformers/ClientGatewayTokenTransformer.php
+++ b/app/Transformers/ClientGatewayTokenTransformer.php
@@ -49,23 +49,23 @@ class ClientGatewayTokenTransformer extends EntityTransformer
         $casted = new stdClass;
 
         if (property_exists($meta, 'exp_month')) {
-            $casted->exp_month = (string)$meta->exp_month;
+            $casted->exp_month = (string) $meta->exp_month;
         }
 
         if (property_exists($meta, 'exp_year')) {
-            $casted->exp_year = (string)$meta->exp_year;
+            $casted->exp_year = (string) $meta->exp_year;
         }
 
         if (property_exists($meta, 'brand')) {
-            $casted->brand = (string)$meta->brand;
+            $casted->brand = (string) $meta->brand;
         }
 
         if (property_exists($meta, 'last4')) {
-            $casted->last4 = (string)$meta->last4;
+            $casted->last4 = (string) $meta->last4;
         }
 
         if (property_exists($meta, 'type')) {
-            $casted->type = (int)$meta->type;
+            $casted->type = (int) $meta->type;
         }
 
         return $casted;
diff --git a/app/Transformers/ClientTransformer.php b/app/Transformers/ClientTransformer.php
index a45519ab9525..8b8772ac1d2f 100644
--- a/app/Transformers/ClientTransformer.php
+++ b/app/Transformers/ClientTransformer.php
@@ -118,7 +118,7 @@ class ClientTransformer extends EntityTransformer
             'last_login' => (int) $client->last_login,
             'size_id' => (string) $client->size_id,
             'public_notes' => $client->public_notes ?: '',
-            'client_hash' => (string)$client->client_hash,
+            'client_hash' => (string) $client->client_hash,
             'address1' => $client->address1 ?: '',
             'address2' => $client->address2 ?: '',
             'phone' => $client->phone ?: '',
diff --git a/app/Transformers/CompanyGatewayTransformer.php b/app/Transformers/CompanyGatewayTransformer.php
index 75c9eef2e46e..0d0dd01793ee 100644
--- a/app/Transformers/CompanyGatewayTransformer.php
+++ b/app/Transformers/CompanyGatewayTransformer.php
@@ -25,6 +25,7 @@ class CompanyGatewayTransformer extends EntityTransformer
 {
     use MakesHash;
     use SoftDeletes;
+
     /**
      * @var array
      */
diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php
index 554e33ab27f2..d4870fb56899 100644
--- a/app/Transformers/CompanyTransformer.php
+++ b/app/Transformers/CompanyTransformer.php
@@ -154,14 +154,14 @@ class CompanyTransformer extends EntityTransformer
             'invoice_task_documents' => (bool) $company->invoice_task_documents,
             'show_tasks_table' => (bool) $company->show_tasks_table,
             'use_credits_payment' => 'always', // @deprecate 1-2-2021
-            'default_task_is_date_based' => (bool)$company->default_task_is_date_based,
-            'enable_product_discount' => (bool)$company->enable_product_discount,
-            'calculate_expense_tax_by_amount' =>(bool)$company->calculate_expense_tax_by_amount,
+            'default_task_is_date_based' => (bool) $company->default_task_is_date_based,
+            'enable_product_discount' => (bool) $company->enable_product_discount,
+            'calculate_expense_tax_by_amount' =>(bool) $company->calculate_expense_tax_by_amount,
             'hide_empty_columns_on_pdf' => false, // @deprecate 1-2-2021
-            'expense_inclusive_taxes' => (bool)$company->expense_inclusive_taxes,
-            'expense_amount_is_pretax' =>(bool)true, //@deprecate 1-2-2021
-            'oauth_password_required' => (bool)$company->oauth_password_required,
-            'session_timeout' => (int)$company->session_timeout,
+            'expense_inclusive_taxes' => (bool) $company->expense_inclusive_taxes,
+            'expense_amount_is_pretax' =>(bool) true, //@deprecate 1-2-2021
+            'oauth_password_required' => (bool) $company->oauth_password_required,
+            'session_timeout' => (int) $company->session_timeout,
             'default_password_timeout' => (int) $company->default_password_timeout,
             'invoice_task_datelog' => (bool) $company->invoice_task_datelog,
             'show_task_end_date' => (bool) $company->show_task_end_date,
@@ -177,6 +177,7 @@ class CompanyTransformer extends EntityTransformer
             'inventory_notification_threshold' => (int) $company->inventory_notification_threshold,
             'track_inventory' => (bool) $company->track_inventory,
             'enable_applying_payments' => (bool) $company->enable_applying_payments,
+            'enabled_expense_tax_rates' => (int) $company->enabled_expense_tax_rates,
         ];
     }
 
@@ -242,6 +243,7 @@ class CompanyTransformer extends EntityTransformer
 
         $users = $company->users->map(function ($user) use ($company) {
             $user->company_id = $company->id;
+
             return $user;
         });
 
diff --git a/app/Transformers/CompanyUserTransformer.php b/app/Transformers/CompanyUserTransformer.php
index 2f3650aae7e6..720a247f7e30 100644
--- a/app/Transformers/CompanyUserTransformer.php
+++ b/app/Transformers/CompanyUserTransformer.php
@@ -24,7 +24,7 @@ class CompanyUserTransformer extends EntityTransformer
      */
     protected $defaultIncludes = [
         // 'user',
-     ];
+    ];
 
     /**
      * @var array
diff --git a/app/Transformers/Contact/InvoiceTransformer.php b/app/Transformers/Contact/InvoiceTransformer.php
index dae33ec42e8d..feb0b85c830e 100644
--- a/app/Transformers/Contact/InvoiceTransformer.php
+++ b/app/Transformers/Contact/InvoiceTransformer.php
@@ -20,7 +20,7 @@ class InvoiceTransformer extends EntityTransformer
     use MakesHash;
 
     protected $defaultIncludes = [
-    //    'invoice_items',
+        //    'invoice_items',
     ];
 
     protected $availableIncludes = [
diff --git a/app/Transformers/CreditInvitationTransformer.php b/app/Transformers/CreditInvitationTransformer.php
index 249a80f25af5..abd8eb35827d 100644
--- a/app/Transformers/CreditInvitationTransformer.php
+++ b/app/Transformers/CreditInvitationTransformer.php
@@ -32,7 +32,7 @@ class CreditInvitationTransformer extends EntityTransformer
             'archived_at'       => (int) $invitation->deleted_at,
             'created_at'		=> (int) $invitation->created_at,
             'email_status'      => $invitation->email_status ?: '',
-            'email_error'       => (string)$invitation->email_error,
+            'email_error'       => (string) $invitation->email_error,
         ];
     }
 }
diff --git a/app/Transformers/DesignTransformer.php b/app/Transformers/DesignTransformer.php
index 301f021eca78..27f2a66e89cd 100644
--- a/app/Transformers/DesignTransformer.php
+++ b/app/Transformers/DesignTransformer.php
@@ -22,6 +22,7 @@ class DesignTransformer extends EntityTransformer
 {
     use MakesHash;
     use SoftDeletes;
+
     /**
      * @var array
      */
diff --git a/app/Transformers/EntityTransformer.php b/app/Transformers/EntityTransformer.php
index 69ff7908d95f..a7e1a58f50f3 100644
--- a/app/Transformers/EntityTransformer.php
+++ b/app/Transformers/EntityTransformer.php
@@ -18,6 +18,7 @@ class EntityTransformer extends TransformerAbstract
     protected $serializer;
 
     const API_SERIALIZER_ARRAY = 'array';
+
     const API_SERIALIZER_JSON = 'json';
 
     public function __construct($serializer = null)
diff --git a/app/Transformers/ExpenseCategoryTransformer.php b/app/Transformers/ExpenseCategoryTransformer.php
index a799f406a885..dc42d0c3d3de 100644
--- a/app/Transformers/ExpenseCategoryTransformer.php
+++ b/app/Transformers/ExpenseCategoryTransformer.php
@@ -32,7 +32,6 @@ class ExpenseCategoryTransformer extends EntityTransformer
     protected $availableIncludes = [
     ];
 
-
     /**
      * @param ExpenseCategory $expense_category
      *
diff --git a/app/Transformers/GroupSettingTransformer.php b/app/Transformers/GroupSettingTransformer.php
index 1fe180c7028f..715b71b741dc 100644
--- a/app/Transformers/GroupSettingTransformer.php
+++ b/app/Transformers/GroupSettingTransformer.php
@@ -25,7 +25,7 @@ class GroupSettingTransformer extends EntityTransformer
     use MakesHash;
 
     protected $defaultIncludes = [
-        'documents'
+        'documents',
     ];
 
     /**
@@ -57,5 +57,4 @@ class GroupSettingTransformer extends EntityTransformer
 
         return $this->includeCollection($group_setting->documents, $transformer, Document::class);
     }
-
 }
diff --git a/app/Transformers/InvoiceHistoryTransformer.php b/app/Transformers/InvoiceHistoryTransformer.php
index 5247497f7617..30a9a07f2937 100644
--- a/app/Transformers/InvoiceHistoryTransformer.php
+++ b/app/Transformers/InvoiceHistoryTransformer.php
@@ -29,8 +29,7 @@ class InvoiceHistoryTransformer extends EntityTransformer
 
     public function transform(?Backup $backup)
     {
-        if(!$backup){
-            
+        if (! $backup) {
             return [
                 'id' => '',
                 'activity_id' => '',
@@ -40,7 +39,6 @@ class InvoiceHistoryTransformer extends EntityTransformer
                 'created_at' => (int) 0,
                 'updated_at' => (int) 0,
             ];
-
         }
 
         return [
diff --git a/app/Transformers/InvoiceInvitationTransformer.php b/app/Transformers/InvoiceInvitationTransformer.php
index e7391a703cb0..fb9088b8c2af 100644
--- a/app/Transformers/InvoiceInvitationTransformer.php
+++ b/app/Transformers/InvoiceInvitationTransformer.php
@@ -32,7 +32,7 @@ class InvoiceInvitationTransformer extends EntityTransformer
             'archived_at'       => (int) $invitation->deleted_at,
             'created_at'        => (int) $invitation->created_at,
             'email_status'      => $invitation->email_status ?: '',
-            'email_error'       => (string)$invitation->email_error,
+            'email_error'       => (string) $invitation->email_error,
         ];
     }
 }
diff --git a/app/Transformers/InvoiceTransformer.php b/app/Transformers/InvoiceTransformer.php
index 1f902cd04450..e25762b6f4b9 100644
--- a/app/Transformers/InvoiceTransformer.php
+++ b/app/Transformers/InvoiceTransformer.php
@@ -57,10 +57,9 @@ class InvoiceTransformer extends EntityTransformer
         return $this->includeItem($invoice->client, $transformer, Client::class);
     }
 
-
     public function includePayments(Invoice $invoice)
     {
-        $transformer = new PaymentTransformer( $this->serializer);
+        $transformer = new PaymentTransformer($this->serializer);
 
         return $this->includeCollection($invoice->payments, $transformer, Payment::class);
     }
@@ -87,7 +86,6 @@ class InvoiceTransformer extends EntityTransformer
         return $this->includeCollection($invoice->activities, $transformer, Activity::class);
     }
 
-
     public function transform(Invoice $invoice)
     {
         return [
diff --git a/app/Transformers/PaymentTransformer.php b/app/Transformers/PaymentTransformer.php
index 0f276cde7960..1c4c3b6f0d55 100644
--- a/app/Transformers/PaymentTransformer.php
+++ b/app/Transformers/PaymentTransformer.php
@@ -30,8 +30,8 @@ class PaymentTransformer extends EntityTransformer
     ];
 
     protected $availableIncludes = [
-         'client',
-         'invoices',
+        'client',
+        'invoices',
     ];
 
     public function __construct($serializer = null)
diff --git a/app/Transformers/PurchaseOrderInvitationTransformer.php b/app/Transformers/PurchaseOrderInvitationTransformer.php
index 95187cc81c2c..5a4474fbc0ca 100644
--- a/app/Transformers/PurchaseOrderInvitationTransformer.php
+++ b/app/Transformers/PurchaseOrderInvitationTransformer.php
@@ -1,9 +1,7 @@
 <?php
 
-
 namespace App\Transformers;
 
-
 use App\Models\PurchaseOrderInvitation;
 use App\Utils\Traits\MakesHash;
 
@@ -21,12 +19,11 @@ class PurchaseOrderInvitationTransformer extends EntityTransformer
             'sent_date' => $invitation->sent_date ?: '',
             'viewed_date' => $invitation->viewed_date ?: '',
             'opened_date' => $invitation->opened_date ?: '',
-            'updated_at' => (int)$invitation->updated_at,
-            'archived_at' => (int)$invitation->deleted_at,
-            'created_at' => (int)$invitation->created_at,
+            'updated_at' => (int) $invitation->updated_at,
+            'archived_at' => (int) $invitation->deleted_at,
+            'created_at' => (int) $invitation->created_at,
             'email_status' => $invitation->email_status ?: '',
-            'email_error' => (string)$invitation->email_error,
+            'email_error' => (string) $invitation->email_error,
         ];
     }
-
 }
diff --git a/app/Transformers/QuoteInvitationTransformer.php b/app/Transformers/QuoteInvitationTransformer.php
index 45a6ea2b28c0..7f6b492acfcf 100644
--- a/app/Transformers/QuoteInvitationTransformer.php
+++ b/app/Transformers/QuoteInvitationTransformer.php
@@ -32,7 +32,7 @@ class QuoteInvitationTransformer extends EntityTransformer
             'archived_at'       => (int) $invitation->deleted_at,
             'created_at'       => (int) $invitation->created_at,
             'email_status'      => $invitation->email_status ?: '',
-            'email_error'       => (string)$invitation->email_error,
+            'email_error'       => (string) $invitation->email_error,
         ];
     }
 }
diff --git a/app/Transformers/QuoteTransformer.php b/app/Transformers/QuoteTransformer.php
index 46b003cfa76c..fcdc5c9f2f29 100644
--- a/app/Transformers/QuoteTransformer.php
+++ b/app/Transformers/QuoteTransformer.php
@@ -25,8 +25,8 @@ class QuoteTransformer extends EntityTransformer
     use MakesHash;
 
     protected $defaultIncludes = [
-            'invitations',
-            'documents',
+        'invitations',
+        'documents',
     ];
 
     protected $availableIncludes = [
diff --git a/app/Transformers/RecurringExpenseTransformer.php b/app/Transformers/RecurringExpenseTransformer.php
index b5632e8f9f0c..5830f7a2ad5d 100644
--- a/app/Transformers/RecurringExpenseTransformer.php
+++ b/app/Transformers/RecurringExpenseTransformer.php
@@ -23,7 +23,7 @@ class RecurringExpenseTransformer extends EntityTransformer
 {
     use MakesHash;
     use SoftDeletes;
-    
+
     protected $defaultIncludes = [
         'documents',
     ];
@@ -81,7 +81,7 @@ class RecurringExpenseTransformer extends EntityTransformer
             'transaction_reference' => (string) $recurring_expense->transaction_reference ?: '',
             'transaction_id' => (string) $recurring_expense->transaction_id ?: '',
             'date' => $recurring_expense->date ?: '',
-            'number' => (string)$recurring_expense->number ?: '',
+            'number' => (string) $recurring_expense->number ?: '',
             'payment_date' => $recurring_expense->payment_date ?: '',
             'custom_value1' => $recurring_expense->custom_value1 ?: '',
             'custom_value2' => $recurring_expense->custom_value2 ?: '',
@@ -105,9 +105,10 @@ class RecurringExpenseTransformer extends EntityTransformer
             'recurring_dates' => (array) [],
         ];
 
-        if(request()->has('show_dates') && request()->query('show_dates') == 'true')
+        if (request()->has('show_dates') && request()->query('show_dates') == 'true') {
             $data['recurring_dates'] = (array) $recurring_expense->recurringDates();
+        }
 
-             return $data;
+        return $data;
     }
-}
\ No newline at end of file
+}
diff --git a/app/Transformers/RecurringInvoiceInvitationTransformer.php b/app/Transformers/RecurringInvoiceInvitationTransformer.php
index c495f48fca8a..c9e4cb9e0bf2 100644
--- a/app/Transformers/RecurringInvoiceInvitationTransformer.php
+++ b/app/Transformers/RecurringInvoiceInvitationTransformer.php
@@ -32,7 +32,7 @@ class RecurringInvoiceInvitationTransformer extends EntityTransformer
             'archived_at'       => (int) $invitation->deleted_at,
             'created_at'       => (int) $invitation->created_at,
             'email_status'      => $invitation->email_status ?: '',
-            'email_error'       => (string)$invitation->email_error,
+            'email_error'       => (string) $invitation->email_error,
         ];
     }
 }
diff --git a/app/Transformers/RecurringInvoiceTransformer.php b/app/Transformers/RecurringInvoiceTransformer.php
index feb855ddaacd..b5db046192a0 100644
--- a/app/Transformers/RecurringInvoiceTransformer.php
+++ b/app/Transformers/RecurringInvoiceTransformer.php
@@ -36,20 +36,20 @@ class RecurringInvoiceTransformer extends EntityTransformer
         'activities',
         'client',
     ];
-   
+
     public function includeHistory(RecurringInvoice $invoice)
     {
         $transformer = new InvoiceHistoryTransformer($this->serializer);
 
         return $this->includeCollection($invoice->history, $transformer, Backup::class);
     }
-       
+
     public function includeActivities(RecurringInvoice $invoice)
     {
         $transformer = new ActivityTransformer($this->serializer);
 
         return $this->includeCollection($invoice->activities, $transformer, Activity::class);
-    }   
+    }
 
     public function includeInvitations(RecurringInvoice $invoice)
     {
@@ -64,7 +64,7 @@ class RecurringInvoiceTransformer extends EntityTransformer
 
         return $this->includeCollection($invoice->documents, $transformer, Document::class);
     }
-    
+
     public function includeClient(RecurringInvoice $invoice)
     {
         $transformer = new ClientTransformer($this->serializer);
@@ -74,7 +74,6 @@ class RecurringInvoiceTransformer extends EntityTransformer
 
     public function transform(RecurringInvoice $invoice)
     {
-        
         $data = [
             'id' => $this->encodePrimaryKey($invoice->id),
             'user_id' => $this->encodePrimaryKey($invoice->user_id),
@@ -96,7 +95,7 @@ class RecurringInvoiceTransformer extends EntityTransformer
             'date' => $invoice->date ?: '',
             'last_sent_date' => $invoice->last_sent_date ?: '',
             // 'next_send_date' => $invoice->next_send_date ?: '',
-            'next_send_date' => $invoice->next_send_date_client ?: '',  
+            'next_send_date' => $invoice->next_send_date_client ?: '',
             'due_date' => $invoice->due_date ?: '',
             'terms' => $invoice->terms ?: '',
             'public_notes' => $invoice->public_notes ?: '',
@@ -137,14 +136,14 @@ class RecurringInvoiceTransformer extends EntityTransformer
             'auto_bill_enabled' => (bool) $invoice->auto_bill_enabled,
             'due_date_days' => (string) $invoice->due_date_days ?: '',
             'paid_to_date' => (float) $invoice->paid_to_date,
-            'subscription_id' => (string)$this->encodePrimaryKey($invoice->subscription_id),
-            'recurring_dates' => (array) [],        
+            'subscription_id' => (string) $this->encodePrimaryKey($invoice->subscription_id),
+            'recurring_dates' => (array) [],
         ];
 
-        
-        if(request()->has('show_dates') && request()->query('show_dates') == 'true')
+        if (request()->has('show_dates') && request()->query('show_dates') == 'true') {
             $data['recurring_dates'] = (array) $invoice->recurringDates();
+        }
 
-             return $data;
+        return $data;
     }
 }
diff --git a/app/Transformers/RecurringQuoteInvitationTransformer.php b/app/Transformers/RecurringQuoteInvitationTransformer.php
index 3eb50ff2e55e..379700414450 100644
--- a/app/Transformers/RecurringQuoteInvitationTransformer.php
+++ b/app/Transformers/RecurringQuoteInvitationTransformer.php
@@ -32,7 +32,7 @@ class RecurringQuoteInvitationTransformer extends EntityTransformer
             'archived_at'       => (int) $invitation->deleted_at,
             'created_at'       => (int) $invitation->created_at,
             'email_status'      => $invitation->email_status ?: '',
-            'email_error'       => (string)$invitation->email_error,
+            'email_error'       => (string) $invitation->email_error,
         ];
     }
 }
diff --git a/app/Transformers/RecurringQuoteTransformer.php b/app/Transformers/RecurringQuoteTransformer.php
index 8403fede6389..0e4d341ee1bb 100644
--- a/app/Transformers/RecurringQuoteTransformer.php
+++ b/app/Transformers/RecurringQuoteTransformer.php
@@ -35,22 +35,22 @@ class RecurringQuoteTransformer extends EntityTransformer
         'documents',
         'activities',
         // 'history',
-    //    'client',
+        //    'client',
     ];
-   
+
     public function includeHistory(RecurringQuote $quote)
     {
         $transformer = new QuoteHistoryTransformer($this->serializer);
 
         return $this->includeCollection($quote->history, $transformer, Backup::class);
     }
-       
+
     public function includeActivities(RecurringQuote $quote)
     {
         $transformer = new ActivityTransformer($this->serializer);
 
         return $this->includeCollection($quote->activities, $transformer, Activity::class);
-    }   
+    }
 
     public function includeInvitations(RecurringQuote $quote)
     {
@@ -65,7 +65,7 @@ class RecurringQuoteTransformer extends EntityTransformer
 
         return $this->includeCollection($quote->documents, $transformer, Document::class);
     }
-    
+
     public function transform(RecurringQuote $quote)
     {
         return [
@@ -129,7 +129,7 @@ class RecurringQuoteTransformer extends EntityTransformer
             'auto_bill_enabled' => (bool) $quote->auto_bill_enabled,
             'due_date_days' => (string) $quote->due_date_days ?: '',
             'paid_to_date' => (float) $quote->paid_to_date,
-            'subscription_id' => (string)$this->encodePrimaryKey($quote->subscription_id),
+            'subscription_id' => (string) $this->encodePrimaryKey($quote->subscription_id),
         ];
     }
 }
diff --git a/app/Transformers/SubscriptionTransformer.php b/app/Transformers/SubscriptionTransformer.php
index 7dbf48865038..01580d27b48e 100644
--- a/app/Transformers/SubscriptionTransformer.php
+++ b/app/Transformers/SubscriptionTransformer.php
@@ -39,36 +39,35 @@ class SubscriptionTransformer extends EntityTransformer
             'id' => $this->encodePrimaryKey($subscription->id),
             'user_id' => $this->encodePrimaryKey($subscription->user_id),
             'group_id' => $this->encodePrimaryKey($subscription->group_id),
-            'product_ids' => (string)$subscription->product_ids,
-            'name' => (string)$subscription->name,
-            'recurring_product_ids' => (string)$subscription->recurring_product_ids,
+            'product_ids' => (string) $subscription->product_ids,
+            'name' => (string) $subscription->name,
+            'recurring_product_ids' => (string) $subscription->recurring_product_ids,
             'assigned_user_id' => $this->encodePrimaryKey($subscription->assigned_user_id),
             'company_id' => $this->encodePrimaryKey($subscription->company_id),
             'price' => (float) $subscription->price,
             'promo_price' => (float) $subscription->promo_price,
-            'frequency_id' => (string)$subscription->frequency_id,
-            'auto_bill' => (string)$subscription->auto_bill,
-            'promo_code' => (string)$subscription->promo_code,
-            'promo_discount' => (float)$subscription->promo_discount,
-            'is_amount_discount' => (bool)$subscription->is_amount_discount,
-            'allow_cancellation' => (bool)$subscription->allow_cancellation,
-            'per_seat_enabled' => (bool)$subscription->per_seat_enabled,
-            'max_seats_limit' => (int)$subscription->max_seats_limit,
-            'trial_enabled' => (bool)$subscription->trial_enabled,
-            'trial_duration' => (int)$subscription->trial_duration,
-            'allow_query_overrides' => (bool)$subscription->allow_query_overrides,
-            'allow_plan_changes' => (bool)$subscription->allow_plan_changes,
-            'refund_period' => (int)$subscription->refund_period,
+            'frequency_id' => (string) $subscription->frequency_id,
+            'auto_bill' => (string) $subscription->auto_bill,
+            'promo_code' => (string) $subscription->promo_code,
+            'promo_discount' => (float) $subscription->promo_discount,
+            'is_amount_discount' => (bool) $subscription->is_amount_discount,
+            'allow_cancellation' => (bool) $subscription->allow_cancellation,
+            'per_seat_enabled' => (bool) $subscription->per_seat_enabled,
+            'max_seats_limit' => (int) $subscription->max_seats_limit,
+            'trial_enabled' => (bool) $subscription->trial_enabled,
+            'trial_duration' => (int) $subscription->trial_duration,
+            'allow_query_overrides' => (bool) $subscription->allow_query_overrides,
+            'allow_plan_changes' => (bool) $subscription->allow_plan_changes,
+            'refund_period' => (int) $subscription->refund_period,
             'webhook_configuration' => $subscription->webhook_configuration ?: [],
-            'purchase_page' => (string)$company->domain() .  "/client/subscriptions/{$subscription->hashed_id}/purchase",
+            'purchase_page' => (string) $company->domain()."/client/subscriptions/{$subscription->hashed_id}/purchase",
             //'purchase_page' => (string)route('client.subscription.purchase', $subscription->hashed_id),
             'currency_id' => (string) $subscription->currency_id,
-            'is_deleted' => (bool)$subscription->is_deleted,
-            'created_at' => (int)$subscription->created_at,
-            'updated_at' => (int)$subscription->updated_at,
-            'archived_at' => (int)$subscription->deleted_at,
+            'is_deleted' => (bool) $subscription->is_deleted,
+            'created_at' => (int) $subscription->created_at,
+            'updated_at' => (int) $subscription->updated_at,
+            'archived_at' => (int) $subscription->deleted_at,
             'plan_map' => '', //@deprecated 03/04/2021
         ];
     }
-
 }
diff --git a/app/Transformers/TaskSchedulerTransformer.php b/app/Transformers/TaskSchedulerTransformer.php
index d49bad7d22b2..88fbf9d29999 100644
--- a/app/Transformers/TaskSchedulerTransformer.php
+++ b/app/Transformers/TaskSchedulerTransformer.php
@@ -18,23 +18,21 @@ class TaskSchedulerTransformer extends EntityTransformer
 {
     use MakesHash;
 
-
     public function transform(Scheduler $scheduler)
     {
         return [
             'id' => $this->encodePrimaryKey($scheduler->id),
-            'is_deleted' => (bool)$scheduler->is_deleted,
-            'paused' => (bool)$scheduler->paused,
-            'repeat_every' => (string)$scheduler->repeat_every,
-            'start_from' => (int)$scheduler->start_from,
-            'scheduled_run' => (int)$scheduler->scheduled_run,
-            'updated_at' => (int)$scheduler->updated_at,
-            'created_at' => (int)$scheduler->created_at,
+            'is_deleted' => (bool) $scheduler->is_deleted,
+            'paused' => (bool) $scheduler->paused,
+            'repeat_every' => (string) $scheduler->repeat_every,
+            'start_from' => (int) $scheduler->start_from,
+            'scheduled_run' => (int) $scheduler->scheduled_run,
+            'updated_at' => (int) $scheduler->updated_at,
+            'created_at' => (int) $scheduler->created_at,
             'archived_at' => (int) $scheduler->deleted_at,
             'action_name' => (string) $scheduler->action_name,
             'action_class' => (string) $scheduler->action_class,
-            'parameters'=> (array)$scheduler->parameters,
+            'parameters'=> (array) $scheduler->parameters,
         ];
     }
-
 }
diff --git a/app/Transformers/TaskStatusTransformer.php b/app/Transformers/TaskStatusTransformer.php
index c7dd4956d072..a290aab90bf3 100644
--- a/app/Transformers/TaskStatusTransformer.php
+++ b/app/Transformers/TaskStatusTransformer.php
@@ -29,7 +29,7 @@ class TaskStatusTransformer extends EntityTransformer
             'created_at'  => (int) $task_status->created_at,
             'updated_at'  => (int) $task_status->updated_at,
             'archived_at' => (int) $task_status->deleted_at,
-            'status_order' => is_null($task_status->status_order) ? null : (int)$task_status->status_order,
+            'status_order' => is_null($task_status->status_order) ? null : (int) $task_status->status_order,
         ];
     }
 }
diff --git a/app/Transformers/TaskTransformer.php b/app/Transformers/TaskTransformer.php
index 8f67de8e52a9..047d10ecc1df 100644
--- a/app/Transformers/TaskTransformer.php
+++ b/app/Transformers/TaskTransformer.php
@@ -26,7 +26,7 @@ class TaskTransformer extends EntityTransformer
     use MakesHash;
 
     protected $defaultIncludes = [
-        'documents'
+        'documents',
     ];
 
     /**
@@ -92,7 +92,7 @@ class TaskTransformer extends EntityTransformer
             'status_id' => $this->encodePrimaryKey($task->status_id) ?: '',
             'status_sort_order' => (int) $task->status_sort_order, //deprecated 5.0.34
             'is_date_based' => (bool) $task->is_date_based,
-            'status_order' => is_null($task->status_order) ? null : (int)$task->status_order,
+            'status_order' => is_null($task->status_order) ? null : (int) $task->status_order,
         ];
     }
 }
diff --git a/app/Transformers/UserTransformer.php b/app/Transformers/UserTransformer.php
index 593f9768daab..b489d2aafeed 100644
--- a/app/Transformers/UserTransformer.php
+++ b/app/Transformers/UserTransformer.php
@@ -95,7 +95,7 @@ class UserTransformer extends EntityTransformer
 
     public function includeCompanyUser(User $user)
     {
-        if (!$user->company_id && request()->header('X-API-TOKEN')) {
+        if (! $user->company_id && request()->header('X-API-TOKEN')) {
             $company_token = CompanyToken::where('token', request()->header('X-API-TOKEN'))->first();
             $user->company_id = $company_token->company_id;
         }
diff --git a/app/Transformers/VendorContactTransformer.php b/app/Transformers/VendorContactTransformer.php
index da9f5a6f3e0e..dbbdf6daedc4 100644
--- a/app/Transformers/VendorContactTransformer.php
+++ b/app/Transformers/VendorContactTransformer.php
@@ -42,6 +42,7 @@ class VendorContactTransformer extends EntityTransformer
             'custom_value2' => $vendor->custom_value2 ?: '',
             'custom_value3' => $vendor->custom_value3 ?: '',
             'custom_value4' => $vendor->custom_value4 ?: '',
+            'link' => $vendor->getLoginLink(),
         ];
     }
 }
diff --git a/app/Transformers/VendorTransformer.php b/app/Transformers/VendorTransformer.php
index dd8c57e023fc..be324ae8e6a9 100644
--- a/app/Transformers/VendorTransformer.php
+++ b/app/Transformers/VendorTransformer.php
@@ -27,7 +27,7 @@ class VendorTransformer extends EntityTransformer
 
     protected $defaultIncludes = [
         'contacts',
-        'documents'
+        'documents',
     ];
 
     /**
diff --git a/app/Utils/ClientPortal/CustomMessage/CustomMessage.php b/app/Utils/ClientPortal/CustomMessage/CustomMessage.php
index abc380542218..d1737d583f40 100644
--- a/app/Utils/ClientPortal/CustomMessage/CustomMessage.php
+++ b/app/Utils/ClientPortal/CustomMessage/CustomMessage.php
@@ -87,57 +87,57 @@ class CustomMessage
     private function compose(): array
     {
         return [
-            '$company.id' => optional($this->company)->id,
-            '$company.name' => optional($this->company)->getSetting('name'),
-            '$company.website' => optional($this->company)->getSetting('website'),
+            '$company.id' => $this->company?->id,
+            '$company.name' => $this->company?->getSetting('name'),
+            '$company.website' => $this->company?->getSetting('website'),
 
-            '$client.id' => optional($this->client)->id,
-            '$client.name' => optional($this->client)->name,
-            '$client.website' => optional($this->client)->website,
-            '$client.public_notes' => optional($this->client)->public_notes,
-            '$client.phone' => optional($this->client)->phone,
-            '$client.balance' => optional($this->client)->balance,
-            '$client.address1' => optional(optional($this->client)->present())->address1,
-            '$client.address2' => optional(optional($this->client)->present())->address2,
-            '$client.city' => optional(optional($this->client)->present())->city,
-            '$client.state' => optional(optional($this->client)->present())->state,
-            '$client.postal_code' => optional(optional($this->client)->present())->postal_code,
-            '$client.country' => optional(optional(optional($this->client)->present())->country)->full_name,
-            '$client.address' => optional(optional($this->client)->present())->address(),
-            '$client.shipping_address' => optional(optional($this->client)->present())->shipping_address(),
-            '$client.primary_contact_name' => optional(optional($this->client)->present())->primary_contact_name(),
-            '$client.city_state' => optional(optional($this->client)->present())->getCityState(),
+            '$client.id' => $this->client?->id,
+            '$client.name' => $this->client?->name,
+            '$client.website' => $this->client?->website,
+            '$client.public_notes' => $this->client?->public_notes,
+            '$client.phone' => $this->client?->phone,
+            '$client.balance' => $this->client?->balance,
+            '$client.address1' => $this->client?->present()?->address1,
+            '$client.address2' => $this->client?->present()?->address2,
+            '$client.city' => $this->client?->present()?->city,
+            '$client.state' => $this->client?->present()?->state,
+            '$client.postal_code' => $this->client?->present()?->postal_code,
+            '$client.country' => $this->client?->present()?->country?->full_name,
+            '$client.address' => $this->client?->present()?->address(),
+            '$client.shipping_address' => $this->client?->present()?->shipping_address(),
+            '$client.primary_contact_name' => $this->client?->present()?->primary_contact_name(),
+            '$client.city_state' => $this->client?->present()?->getCityState(),
 
-            '$contact.first_name' => optional($this->contact)->first_name,
-            '$contact.last_name' => optional($this->contact)->last_name,
-            '$contact.phone' => optional($this->contact)->phone,
-            '$contact.email' => optional($this->contact)->email,
-            '$contact.avatar' => optional($this->contact)->avatar,
+            '$contact.first_name' => $this->contact?->first_name,
+            '$contact.last_name' => $this->contact?->last_name,
+            '$contact.phone' => $this->contact?->phone,
+            '$contact.email' => $this->contact?->email,
+            '$contact.avatar' => $this->contact?->avatar,
 
-            '$group.id' => optional($this->group)->id,
+            '$group.id' => $this->group?->id,
 
-            '$entity.id' => optional($this->entity)->hashed_id,
-            '$entity.number' => optional($this->entity)->number,
-            '$entity.discount' => optional($this->entity)->discount,
-            '$entity.date' => optional($this->entity)->date, // Todo: Handle formatDate
-            '$entity.due_date' => optional($this->entity)->due_date, // Todo: Handle formatDate
-            '$entity.last_sent_date' => optional($this->entity)->last_sent_date,
-            '$entity.public_notes' => optional($this->entity)->public_notes,
-            '$entity.terms' => optional($this->entity)->terms,
-            '$entity.amount' => optional($this->entity)->amount, // Todo: Handle moneyformat
-            '$entity.balance' => optional($this->entity)->balance, // Todo: Handle moneyformat
-            '$entity.created_at' => optional($this->entity)->created_at, // Todo: Handle formatDate
+            '$entity.id' => $this->entity?->hashed_id,
+            '$entity.number' => $this->entity?->number,
+            '$entity.discount' => $this->entity?->discount,
+            '$entity.date' => $this->entity?->date, // Todo: Handle formatDate
+            '$entity.due_date' => $this->entity?->due_date, // Todo: Handle formatDate
+            '$entity.last_sent_date' => $this->entity?->last_sent_date,
+            '$entity.public_notes' => $this->entity?->public_notes,
+            '$entity.terms' => $this->entity?->terms,
+            '$entity.amount' => $this->entity?->amount, // Todo: Handle moneyformat
+            '$entity.balance' => $this->entity?->balance, // Todo: Handle moneyformat
+            '$entity.created_at' => $this->entity?->created_at, // Todo: Handle formatDate
 
-            '$entity.status' => optional(optional($this->entity))->badgeForStatus(optional($this->entity)->status_id), // It would be nice if we have method that will only return status as text, not with markup.
-            '$entity.project' => optional(optional($this->entity)->project)->name,
-            '$entity.project.date' => optional(optional($this->entity)->project)->date,
+            '$entity.status' => optional(optional($this->entity))->badgeForStatus($this->entity?->status_id), // It would be nice if we have method that will only return status as text, not with markup.
+            '$entity.project' => $this->entity?->project?->name,
+            '$entity.project.date' => $this->entity?->project?->date,
 
-            '$invitation.id' => optional($this->invitation)->id,
-            '$invitation.user.first_name' => optional(optional($this->invitation)->user)->first_name,
-            '$invitation.user.last_name' => optional(optional($this->invitation)->user)->last_name,
-            '$invitation.sent_date' => optional($this->invitation)->sent_date, // Todo: Handle formatDate
-            '$invitation.viewed_date' => optional($this->invitation)->viewed_date, // Todo: Handle formatDate,
-            '$invitation.opened_date' => optional($this->invitation)->opened_date, // Todo: Handle formatDate,
+            '$invitation.id' => $this->invitation?->id,
+            '$invitation.user.first_name' => $this->invitation?->user?->first_name,
+            '$invitation.user.last_name' => $this->invitation?->user?->last_name,
+            '$invitation.sent_date' => $this->invitation?->sent_date, // Todo: Handle formatDate
+            '$invitation.viewed_date' => $this->invitation?->viewed_date, // Todo: Handle formatDate,
+            '$invitation.opened_date' => $this->invitation?->opened_date, // Todo: Handle formatDate,
         ];
     }
 }
diff --git a/app/Utils/ClientPortal/MagicLink.php b/app/Utils/ClientPortal/MagicLink.php
index f16bba7fe8f5..381b9da60fe7 100644
--- a/app/Utils/ClientPortal/MagicLink.php
+++ b/app/Utils/ClientPortal/MagicLink.php
@@ -16,7 +16,6 @@ use Illuminate\Support\Str;
 
 class MagicLink
 {
-
     //return a magic login link URL
     public static function create($email, $company_id, $url = null) :string
     {
@@ -24,8 +23,8 @@ class MagicLink
         $timeout = 600; //seconds
 
         $payload = [
-        	'email' => $email, 
-        	'company_id' => $company_id,
+            'email' => $email,
+            'company_id' => $company_id,
         ];
 
         Cache::add($magic_key, $payload, $timeout);
diff --git a/app/Utils/CssInlinerPlugin.php b/app/Utils/CssInlinerPlugin.php
index 0a6d8d961265..bcd49b447e64 100644
--- a/app/Utils/CssInlinerPlugin.php
+++ b/app/Utils/CssInlinerPlugin.php
@@ -69,7 +69,7 @@ class CssInlinerPlugin implements \Swift_Events_SendListener
     {
         $output = '';
         foreach ($cssResources as $cssResource) {
-            $output.= $this->fetchCss($cssResource);
+            $output .= $this->fetchCss($cssResource);
         }
 
         return $output;
@@ -84,7 +84,7 @@ class CssInlinerPlugin implements \Swift_Events_SendListener
         $fixedFilename = $filename;
         // Fix relative protocols on hrefs. Assume https.
         if (substr($filename, 0, 2) === '//') {
-            $fixedFilename = 'https:' . $filename;
+            $fixedFilename = 'https:'.$filename;
         }
 
         $content = file_get_contents($fixedFilename);
diff --git a/app/Utils/Helpers.php b/app/Utils/Helpers.php
index 2bd59028e76d..1c94970f8424 100644
--- a/app/Utils/Helpers.php
+++ b/app/Utils/Helpers.php
@@ -24,11 +24,12 @@ class Helpers
 
     public static function sharedEmailVariables(?Client $client, array $settings = null): array
     {
-        if (!$client) {
+        if (! $client) {
             $elements['signature'] = '';
             $elements['settings'] = new stdClass;
             $elements['whitelabel'] = true;
             $elements['company'] = '';
+
             return $elements;
         }
 
@@ -38,7 +39,7 @@ class Helpers
         $elements['settings'] = $_settings;
         $elements['whitelabel'] = $client->company->account->isPaid() ? true : false;
         $elements['company'] = $client->company;
-        
+
         return $elements;
     }
 
@@ -75,7 +76,7 @@ class Helpers
                 break;
 
             default:
-                return is_null($value) ? '' : $value;
+                return is_null($value) ? '' : $this->processReservedKeywords($value, $entity);
                 break;
         }
     }
@@ -102,28 +103,29 @@ class Helpers
 
     /**
      * Process reserved keywords on PDF.
-     *  
-     * @param string $value 
+     *
+     * @param string $value
      * @param Client|Company $entity
-     * @return null|string 
+     * @return null|string
      */
     public static function processReservedKeywords(?string $value, $entity): ?string
     {
-        if(!$value)
+        if (! $value) {
             return '';
-        
+        }
+
         Carbon::setLocale($entity->locale());
 
         $replacements = [
             'literal' => [
                 ':MONTHYEAR' => \sprintf(
-                    '%s %s', 
+                    '%s %s',
                     Carbon::createFromDate(now()->month)->translatedFormat('F'),
                     now()->year,
                 ),
                 ':MONTH' => Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F'),
                 ':YEAR' => now()->year,
-                ':QUARTER' => 'Q' . now()->quarter,
+                ':QUARTER' => 'Q'.now()->quarter,
                 ':WEEK_BEFORE' => \sprintf(
                     '%s %s %s',
                     Carbon::now()->subDays(7)->translatedFormat($entity->date_format()),
@@ -137,9 +139,9 @@ class Helpers
                     Carbon::now()->addDays(14)->translatedFormat($entity->date_format())
                 ),
                 ':WEEK' => \sprintf(
-                    '%s %s %s', 
-                    Carbon::now()->translatedFormat($entity->date_format()), 
-                    ctrans('texts.to'), 
+                    '%s %s %s',
+                    Carbon::now()->translatedFormat($entity->date_format()),
+                    ctrans('texts.to'),
                     Carbon::now()->addDays(7)->translatedFormat($entity->date_format())
                 ),
             ],
@@ -150,7 +152,7 @@ class Helpers
                 ':QUARTER' => now()->quarter,
             ],
             'ranges' => [
-              'MONTHYEAR' => Carbon::createFromDate(now()->year, now()->month),
+                'MONTHYEAR' => Carbon::createFromDate(now()->year, now()->month),
             ],
             'ranges_raw' => [
                 'MONTH' => now()->month,
@@ -164,7 +166,7 @@ class Helpers
         $matches = array_shift($ranges);
 
         foreach ($matches as $match) {
-            if (!Str::contains($match, '|')) {
+            if (! Str::contains($match, '|')) {
                 continue;
             }
 
@@ -175,7 +177,7 @@ class Helpers
                 $right = substr($parts[1], 0, -1); // MONTH+2
 
                 // If left side is not part of replacements, skip.
-                if (!array_key_exists($left, $replacements['ranges'])) {
+                if (! array_key_exists($left, $replacements['ranges'])) {
                     continue;
                 }
 
@@ -183,7 +185,7 @@ class Helpers
                 $_right = '';
 
                 // If right side doesn't have any calculations, replace with raw ranges keyword.
-                if (!Str::contains($right, ['-', '+', '/', '*'])) {
+                if (! Str::contains($right, ['-', '+', '/', '*'])) {
                     $_right = Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F Y');
                 }
 
@@ -206,7 +208,6 @@ class Helpers
             }
         }
 
-
         // Second case with more common calculations.
         preg_match_all('/:([^:\s]+)/', $value, $common);
 
@@ -221,7 +222,7 @@ class Helpers
                 continue;
             }
 
-            if (!Str::contains($match, ['-', '+', '/', '*'])) {
+            if (! Str::contains($match, ['-', '+', '/', '*'])) {
                 $value = preg_replace(
                     sprintf('/%s/', $matches->keys()->first()), $replacements['literal'][$matches->keys()->first()], $value, 1
                 );
@@ -236,26 +237,26 @@ class Helpers
 
                 $raw = strtr($matches->keys()->first(), $replacements['raw']); // :MONTH => 1
 
-                $number = $res = preg_replace("/[^0-9]/", '', $_value[1]); // :MONTH+1. || :MONTH+2! => 1 || 2
+                $number = $res = preg_replace('/[^0-9]/', '', $_value[1]); // :MONTH+1. || :MONTH+2! => 1 || 2
 
                 $target = "/{$matches->keys()->first()}\\{$_operation}{$number}/"; // /:$KEYWORD\\$OPERATION$VALUE => /:MONTH\\+1
 
-                $output = (int) $raw + (int)$_value[1];
+                $output = (int) $raw + (int) $_value[1];
 
                 if ($operation == '+') {
-                    $output = (int) $raw + (int)$_value[1]; // 1 (:MONTH) + 4
+                    $output = (int) $raw + (int) $_value[1]; // 1 (:MONTH) + 4
                 }
 
                 if ($_operation == '-') {
-                    $output = (int)$raw - (int)$_value[1]; // 1 (:MONTH) - 4
+                    $output = (int) $raw - (int) $_value[1]; // 1 (:MONTH) - 4
                 }
 
-                if ($_operation == '/' && (int)$_value[1] != 0) {
-                    $output = (int)$raw / (int)$_value[1]; // 1 (:MONTH) / 4
+                if ($_operation == '/' && (int) $_value[1] != 0) {
+                    $output = (int) $raw / (int) $_value[1]; // 1 (:MONTH) / 4
                 }
 
                 if ($_operation == '*') {
-                    $output = (int)$raw * (int)$_value[1]; // 1 (:MONTH) * 4
+                    $output = (int) $raw * (int) $_value[1]; // 1 (:MONTH) * 4
                 }
 
                 if ($matches->keys()->first() == ':MONTH') {
@@ -263,15 +264,13 @@ class Helpers
                 }
 
                 if ($matches->keys()->first() == ':MONTHYEAR') {
-                    
-                    $final_date = now()->addMonths($output-now()->month);
+                    $final_date = now()->addMonths($output - now()->month);
 
-                    $output =    \sprintf(
-                            '%s %s', 
+                    $output = \sprintf(
+                            '%s %s',
                             $final_date->translatedFormat('F'),
                             $final_date->year,
                         );
-
                 }
 
                 $value = preg_replace(
@@ -287,9 +286,9 @@ class Helpers
 
     /**
      * Resolve the font from the supported fonts array.
-     * 
-     * @param string $font 
-     * @return array 
+     *
+     * @param string $font
+     * @return array
      */
     public static function resolveFont(string $font = 'Arial'): array
     {
diff --git a/app/Utils/HostedPDF/NinjaPdf.php b/app/Utils/HostedPDF/NinjaPdf.php
index 3ab05c08acf0..7a6da2097b53 100644
--- a/app/Utils/HostedPDF/NinjaPdf.php
+++ b/app/Utils/HostedPDF/NinjaPdf.php
@@ -15,23 +15,19 @@ use GuzzleHttp\RequestOptions;
 
 class NinjaPdf
 {
-
     private $url = 'https://pdf.invoicing.co/api/';
 
     public function build($html)
     {
-
-        $client =  new \GuzzleHttp\Client(['headers' => 
-            [ 
-            'X-Ninja-Token' => 'test_token_for_now',        
-            ]
+        $client = new \GuzzleHttp\Client(['headers' => [
+            'X-Ninja-Token' => 'test_token_for_now',
+        ],
         ]);
 
-        $response = $client->post($this->url,[
-            RequestOptions::JSON => ['html' => $html]
+        $response = $client->post($this->url, [
+            RequestOptions::JSON => ['html' => $html],
         ]);
-    
+
         return $response->getBody();
     }
-
 }
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 2a411578dc76..410b4b0cdcf4 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -22,15 +22,18 @@ use App\Models\RecurringInvoiceInvitation;
 use App\Services\PdfMaker\Designs\Utilities\DesignHelpers;
 use App\Utils\Ninja;
 use App\Utils\Number;
+use App\Utils\Traits\AppSetup;
 use App\Utils\Traits\MakesDates;
 use App\Utils\transformTranslations;
 use Exception;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache;
 
 class HtmlEngine
 {
     use MakesDates;
-
+    use AppSetup;
+    
     public $entity;
 
     public $invitation;
@@ -644,7 +647,27 @@ class HtmlEngine
 
     private function getCountryName() :string
     {
-        $country = Country::find($this->settings->country_id);
+
+        $countries = Cache::get('countries');
+
+        if (! $countries) {
+            $this->buildCache(true);
+
+            $countries = Cache::get('countries');
+
+        }
+
+        if($countries){
+
+         
+            $country = $countries->filter(function ($item) {
+                return $item->id == $this->settings->country_id;
+            })->first();
+
+   
+        }
+        else
+            $country = Country::find($this->settings->country_id);
 
         if ($country) {
             return ctrans('texts.country_' . $country->name);
diff --git a/app/Utils/Ninja.php b/app/Utils/Ninja.php
index f4fd380cbfb1..695b05ac15a5 100644
--- a/app/Utils/Ninja.php
+++ b/app/Utils/Ninja.php
@@ -49,7 +49,7 @@ class Ninja
             'Server OS: '.php_uname('s').' '.php_uname('r').'\\n'.
             'PHP Version: '.phpversion().'\\n'.
             'MySQL Version: '.$mysql_version.'\\n'.
-            'Version: '. request()->has('version') ? request()->input('version') : 'No Version Supplied.';
+            'Version: '.request()->has('version') ? request()->input('version') : 'No Version Supplied.';
 
         return $info;
     }
@@ -114,15 +114,15 @@ class Ninja
 
     public static function eventVars($user_id = null)
     {
+        $ip = '';
 
-            $ip = '';
-            
-            if(request()->hasHeader('Cf-Connecting-Ip'))
-                $ip = request()->header('Cf-Connecting-Ip');
-            elseif(request()->hasHeader('X-Forwarded-For'))
-                $ip = request()->header('X-Forwarded-For');
-            else
-                $ip = request()->ip() ?: ' ';
+        if (request()->hasHeader('Cf-Connecting-Ip')) {
+            $ip = request()->header('Cf-Connecting-Ip');
+        } elseif (request()->hasHeader('X-Forwarded-For')) {
+            $ip = request()->header('X-Forwarded-For');
+        } else {
+            $ip = request()->ip() ?: ' ';
+        }
 
         return [
             'ip' => $ip,
@@ -136,7 +136,7 @@ class Ninja
     {
         $translations = [];
 
-        $trans = (array)$settings->translations;
+        $trans = (array) $settings->translations;
 
         if (count($trans) == 0) {
             return $translations;
@@ -181,29 +181,37 @@ class Ninja
 
     //     return implode('-', $parts);
     // }
-    // 
-    
+    //
+
     /*
      * Available - but not recommended for use
      *
-     * This will guarantee a given string IS the correct format for a 
+     * This will guarantee a given string IS the correct format for a
      * base64 encoded string ,
      * but can't guarantee that it is a base64 encoded string
-     *  
+     *
      */
     public static function isBase64Encoded(string $s) : bool
     {
 
     // Check if there are valid base64 characters
-    if (!preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $s)) return false;
-    // Decode the string in strict mode and check the results
-    $decoded = base64_decode($s, true);
-    if(false === $decoded) return false;
-    // if string returned contains not printable chars
-    if (0 < preg_match('/((?![[:graph:]])(?!\s)(?!\p{L}))./', $decoded, $matched)) return false;
-    // Encode the string again
-    if(base64_encode($decoded) != $s) return false;
-    return true;
+        if (! preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $s)) {
+            return false;
+        }
+        // Decode the string in strict mode and check the results
+        $decoded = base64_decode($s, true);
+        if (false === $decoded) {
+            return false;
+        }
+        // if string returned contains not printable chars
+        if (0 < preg_match('/((?![[:graph:]])(?!\s)(?!\p{L}))./', $decoded, $matched)) {
+            return false;
+        }
+        // Encode the string again
+        if (base64_encode($decoded) != $s) {
+            return false;
+        }
 
+        return true;
     }
 }
diff --git a/app/Utils/Number.php b/app/Utils/Number.php
index 7ff06174939b..2aa06e0f9748 100644
--- a/app/Utils/Number.php
+++ b/app/Utils/Number.php
@@ -68,7 +68,7 @@ class Number
 
         $precision = 10;
 
-        return rtrim(rtrim(number_format($value, $precision, $decimal, $thousand), "0"),$decimal);
+        return rtrim(rtrim(number_format($value, $precision, $decimal, $thousand), '0'), $decimal);
     }
 
     /**
@@ -86,8 +86,9 @@ class Number
         // remove everything except numbers and dot "."
         $s = preg_replace("/[^0-9\.]/", '', $s);
 
-        if($s < 1)
-            return (float)$s;
+        if ($s < 1) {
+            return (float) $s;
+        }
 
         // remove all seperators from first part and keep the end
         $s = str_replace('.', '', substr($s, 0, -3)).substr($s, -3);
@@ -166,7 +167,7 @@ class Number
         }
     }
 
-/**
+    /**
      * Formats a given value based on the clients currency AND country.
      *
      * @param floatval $value The number to be formatted
@@ -203,11 +204,12 @@ class Number
         }
 
         /* 08-01-2022 allow increased precision for unit price*/
-        $v = rtrim(sprintf('%f', $value),"0");
+        $v = rtrim(sprintf('%f', $value), '0');
         // $precision = strlen(substr(strrchr($v, $decimal), 1));
-        
-        if($v<1)
+
+        if ($v < 1) {
             $precision = strlen($v) - strrpos($v, '.') - 1;
+        }
 
         // if($precision == 1)
         //     $precision = 2;
@@ -227,5 +229,4 @@ class Number
             return self::formatValue($value, $currency);
         }
     }
-
 }
diff --git a/app/Utils/PhantomJS/Phantom.php b/app/Utils/PhantomJS/Phantom.php
index 87addb599ee3..9a0b686e5163 100644
--- a/app/Utils/PhantomJS/Phantom.php
+++ b/app/Utils/PhantomJS/Phantom.php
@@ -27,9 +27,9 @@ use App\Utils\HtmlEngine;
 use App\Utils\Traits\MakesHash;
 use App\Utils\Traits\Pdf\PageNumbering;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
 
 class Phantom
@@ -83,9 +83,9 @@ class Phantom
         $url = config('ninja.app_url').'/phantom/'.$entity.'/'.$invitation->key.'?phantomjs_secret='.config('ninja.phantomjs_secret');
         info($url);
 
-        $key         = config( 'ninja.phantomjs_key' );
+        $key = config('ninja.phantomjs_key');
         $phantom_url = "https://phantomjscloud.com/api/browser/v2/{$key}/";
-        $pdf         = CurlUtils::post( $phantom_url, json_encode( [
+        $pdf = CurlUtils::post($phantom_url, json_encode([
             'url'            => $url,
             'renderType'     => 'pdf',
             'outputAsJson'   => false,
@@ -96,19 +96,20 @@ class Phantom
                     'printBackground'   => true,
                 ],
             ],
-        ] ) );
+        ]));
 
         $this->checkMime($pdf, $invitation, $entity);
-        
-            $numbered_pdf = $this->pageNumbering($pdf, $invitation->company);
 
-                if($numbered_pdf)
-                    $pdf = $numbered_pdf;
-                
+        $numbered_pdf = $this->pageNumbering($pdf, $invitation->company);
 
-        if(!Storage::disk(config('filesystems.default'))->exists($path))
+        if ($numbered_pdf) {
+            $pdf = $numbered_pdf;
+        }
+
+        if (! Storage::disk(config('filesystems.default'))->exists($path)) {
             Storage::disk(config('filesystems.default'))->makeDirectory($path, 0775);
-                
+        }
+
         $instance = Storage::disk(config('filesystems.default'))->put($file_path, $pdf);
 
         return $file_path;
@@ -116,9 +117,9 @@ class Phantom
 
     public function convertHtmlToPdf($html)
     {
-        $key         = config( 'ninja.phantomjs_key' );
+        $key = config('ninja.phantomjs_key');
         $phantom_url = "https://phantomjscloud.com/api/browser/v2/{$key}/";
-        $pdf         = CurlUtils::post( $phantom_url, json_encode( [
+        $pdf = CurlUtils::post($phantom_url, json_encode([
             'content'            => $html,
             'renderType'     => 'pdf',
             'outputAsJson'   => false,
@@ -129,7 +130,7 @@ class Phantom
                     'printBackground'   => true,
                 ],
             ],
-        ] ) );
+        ]));
 
         $response = Response::make($pdf, 200);
         $response->header('Content-Type', 'application/pdf');
@@ -140,11 +141,9 @@ class Phantom
     /* Check if the returning PDF is valid. */
     private function checkMime($pdf, $invitation, $entity)
     {
-
         $finfo = new \finfo(FILEINFO_MIME);
 
-        if($finfo->buffer($pdf) != 'application/pdf; charset=binary')
-        {
+        if ($finfo->buffer($pdf) != 'application/pdf; charset=binary') {
             SystemLogger::dispatch(
                 $pdf,
                 SystemLog::CATEGORY_PDF,
@@ -155,20 +154,16 @@ class Phantom
             );
 
             throw new PhantomPDFFailure('There was an error generating the PDF with Phantom JS');
-        }
-        else {
-
+        } else {
             SystemLogger::dispatch(
-                "Entity PDF generated sucessfully => " . $invitation->{$entity}->number,
+                'Entity PDF generated sucessfully => '.$invitation->{$entity}->number,
                 SystemLog::CATEGORY_PDF,
                 SystemLog::EVENT_PDF_RESPONSE,
                 SystemLog::TYPE_PDF_SUCCESS,
                 $invitation->contact->client,
                 $invitation->company,
             );
-
         }
-
     }
 
     public function displayInvitation(string $entity, string $invitation_key)
@@ -184,10 +179,11 @@ class Phantom
 
         App::setLocale($invitation->contact->preferredLocale());
 
-        $entity_design_id = $entity . '_design_id';
+        $entity_design_id = $entity.'_design_id';
 
-        if($entity == 'recurring_invoice')
+        if ($entity == 'recurring_invoice') {
             $entity_design_id = 'invoice_design_id';
+        }
 
         $design_id = $entity_obj->design_id ? $entity_obj->design_id : $this->decodePrimaryKey($entity_obj->client->getSetting($entity_design_id));
 
@@ -196,8 +192,8 @@ class Phantom
 
         if ($design->is_custom) {
             $options = [
-            'custom_partials' => json_decode(json_encode($design->design), true)
-          ];
+                'custom_partials' => json_decode(json_encode($design->design), true),
+            ];
             $template = new PdfMakerDesign(PdfDesignModel::CUSTOM, $options);
         } else {
             $template = new PdfMakerDesign(strtolower($design->name));
diff --git a/app/Utils/Statics.php b/app/Utils/Statics.php
index d64d12620fd6..d62e60f51a11 100644
--- a/app/Utils/Statics.php
+++ b/app/Utils/Statics.php
@@ -70,11 +70,10 @@ class Statics
         $data = [];
 
         foreach (config('ninja.cached_tables') as $name => $class) {
-            
-            if (!Cache::has($name)) {
+            if (! Cache::has($name)) {
 
                 // check that the table exists in case the migration is pending
-                if (!Schema::hasTable((new $class())->getTable())) {
+                if (! Schema::hasTable((new $class())->getTable())) {
                     continue;
                 }
                 if ($name == 'payment_terms') {
diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php
index 70d1cef93afa..90c3bf8dcd40 100644
--- a/app/Utils/SystemHealth.php
+++ b/app/Utils/SystemHealth.php
@@ -34,7 +34,7 @@ class SystemHealth
         'bcmath',
     ];
 
-    private static $php_version = 7.4;
+    private static $php_version = 8.1;
 
     /**
      * Check loaded extensions / PHP version / DB Connections.
@@ -54,7 +54,7 @@ class SystemHealth
             $system_health = false;
         }
 
-        if (!self::simpleDbCheck() && $check_database) {
+        if (! self::simpleDbCheck() && $check_database) {
             info('db fails');
             $system_health = false;
         }
@@ -63,25 +63,25 @@ class SystemHealth
             'system_health' => $system_health,
             'extensions' => self::extensions(),
             'php_version' => [
-                'minimum_php_version' => (string)self::$php_version,
+                'minimum_php_version' => (string) self::$php_version,
                 'current_php_version' => phpversion(),
-                'current_php_cli_version' => (string)self::checkPhpCli(),
+                'current_php_cli_version' => (string) self::checkPhpCli(),
                 'is_okay' => version_compare(phpversion(), self::$php_version, '>='),
+                'memory_limit' => ini_get('memory_limit'),
             ],
             'env_writable' => self::checkEnvWritable(),
-            //'mail' => self::testMailServer(),
-            'simple_db_check' => (bool)self::simpleDbCheck(),
+            'simple_db_check' => self::simpleDbCheck(),
             'cache_enabled' => self::checkConfigCache(),
-            'phantom_enabled' => (bool)config('ninja.phantomjs_pdf_generation'),
-            'exec' => (bool)self::checkExecWorks(),
-            'open_basedir' => (bool)self::checkOpenBaseDir(),
-            'mail_mailer' => (string)self::checkMailMailer(),
-            'flutter_renderer' => (string)config('ninja.flutter_canvas_kit'),
+            'phantom_enabled' => (bool) config('ninja.phantomjs_pdf_generation'),
+            'exec' => (bool) self::checkExecWorks(),
+            'open_basedir' => (bool) self::checkOpenBaseDir(),
+            'mail_mailer' => (string) self::checkMailMailer(),
+            'flutter_renderer' => (string) config('ninja.flutter_canvas_kit'),
             'jobs_pending' => (int) self::checkQueueSize(),
             'pdf_engine' => (string) self::getPdfEngine(),
             'queue' => (string) config('queue.default'),
             'trailing_slash' => (bool) self::checkUrlState(),
-            'file_permissions' => (string) self::checkFileSystem()
+            'file_permissions' => (string) self::checkFileSystem(),
         ];
     }
 
@@ -89,11 +89,9 @@ class SystemHealth
     {
         $count = 0;
 
-        try{
+        try {
             $count = Queue::size();
-        }
-        catch(\Exception $e){
-
+        } catch (\Exception $e) {
         }
 
         return $count;
@@ -101,13 +99,12 @@ class SystemHealth
 
     public static function checkFileSystem()
     {
-
         $directoryIterator = new \RecursiveDirectoryIterator(base_path(), \RecursiveDirectoryIterator::SKIP_DOTS);
 
         foreach (new \RecursiveIteratorIterator($directoryIterator) as $file) {
-
-            if(strpos($file->getPathname(), '.git') !== false)
+            if (strpos($file->getPathname(), '.git') !== false) {
                 continue;
+            }
 
             //nlog($file->getPathname());
 
@@ -117,26 +114,26 @@ class SystemHealth
         }
 
         return 'Ok';
-
     }
 
     public static function checkUrlState()
     {
-        if (env('APP_URL') && substr(env('APP_URL'), -1) == '/')
+        if (env('APP_URL') && substr(env('APP_URL'), -1) == '/') {
             return true;
+        }
 
         return false;
-
     }
 
     public static function getPdfEngine()
     {
-        if(config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja')
+        if (config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja') {
             return 'Invoice Ninja Hosted PDF Generator';
-        elseif(config('ninja.phantomjs_pdf_generation') || config('ninja.pdf_generator') == 'phantom')
+        } elseif (config('ninja.phantomjs_pdf_generation') || config('ninja.pdf_generator') == 'phantom') {
             return 'Phantom JS Web Generator';
-        else
+        } else {
             return 'SnapPDF PDF Generator';
+        }
     }
 
     public static function checkMailMailer()
@@ -201,7 +198,7 @@ class SystemHealth
     private static function extensions(): array
     {
         $loaded_extensions = null;
-        
+
         $loaded_extensions = [];
 
         foreach (self::$extensions as $extension) {
@@ -215,7 +212,7 @@ class SystemHealth
     {
         $result = ['success' => false];
 
-        if ($request && !config('ninja.preconfigured_install')) {
+        if ($request && ! config('ninja.preconfigured_install')) {
             config(['database.connections.mysql.host' => $request->input('db_host')]);
             config(['database.connections.mysql.port' => $request->input('db_port')]);
             config(['database.connections.mysql.database' => $request->input('db_database')]);
@@ -226,13 +223,13 @@ class SystemHealth
             DB::purge('mysql');
         }
 
-        if (!config('ninja.db.multi_db_enabled')) {
+        if (! config('ninja.db.multi_db_enabled')) {
             try {
                 $pdo = DB::connection()->getPdo();
-                $result[] = [DB::connection()->getDatabaseName() => true];
+                $x = DB::connection()->getDatabaseName();
                 $result['success'] = true;
             } catch (Exception $e) {
-                $result[] = [config('database.connections.' . config('database.default') . '.database') => false];
+                // $x = [config('database.connections.'.config('database.default').'.database') => false];
                 $result['success'] = false;
                 $result['message'] = $e->getMessage();
             }
@@ -242,10 +239,10 @@ class SystemHealth
 
                 try {
                     $pdo = DB::connection()->getPdo();
-                    $result[] = [DB::connection()->getDatabaseName() => true];
+                    $x = DB::connection()->getDatabaseName();
                     $result['success'] = true;
                 } catch (Exception $e) {
-                    $result[] = [config('database.connections.' . config('database.default') . '.database') => false];
+                   // $x = [config('database.connections.'.config('database.default').'.database') => false];
                     $result['success'] = false;
                     $result['message'] = $e->getMessage();
                 }
@@ -289,6 +286,6 @@ class SystemHealth
 
     private static function checkEnvWritable()
     {
-        return is_writable(base_path() . '/.env');
+        return is_writable(base_path().'/.env');
     }
 }
diff --git a/app/Utils/TempFile.php b/app/Utils/TempFile.php
index 712eab787340..2c2621f7d9b1 100644
--- a/app/Utils/TempFile.php
+++ b/app/Utils/TempFile.php
@@ -15,7 +15,7 @@ class TempFile
 {
     public static function path($url) :string
     {
-        $temp_path = @tempnam(sys_get_temp_dir() . '/' . sha1(time()), basename($url));
+        $temp_path = @tempnam(sys_get_temp_dir().'/'.sha1(time()), basename($url));
         copy($url, $temp_path);
 
         return $temp_path;
@@ -24,16 +24,14 @@ class TempFile
     /* Downloads a file to temp storage and returns the path - used for mailers */
     public static function filePath($data, $filename) :string
     {
-
         $dir_hash = sys_get_temp_dir().'/'.sha1(microtime());
 
         mkdir($dir_hash);
-        
-        $file_path = $dir_hash . '/' . $filename;
+
+        $file_path = $dir_hash.'/'.$filename;
 
         file_put_contents($file_path, $data);
 
         return $file_path;
-
     }
 }
diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php
index a360a078cca1..8eb0db321a22 100644
--- a/app/Utils/TemplateEngine.php
+++ b/app/Utils/TemplateEngine.php
@@ -60,6 +60,7 @@ class TemplateEngine
     private $raw_body;
 
     private $raw_subject;
+
     /**
      * @var array
      */
@@ -152,7 +153,7 @@ class TemplateEngine
     private function replaceValues()
     {
         $this->raw_body = $this->body;
-        $this->raw_subject  = $this->subject;
+        $this->raw_subject = $this->subject;
 
         if($this->entity == 'purchaseOrder'){
             $this->fakerValues();
@@ -243,13 +244,11 @@ class TemplateEngine
             } else {
                 $wrapper = '';
             }
-        }
-        elseif ($email_style == 'plain') {
+        } elseif ($email_style == 'plain') {
             $wrapper = view($this->getTemplatePath($email_style), $data)->render();
             $injection = '';
             $wrapper = str_replace('<head>', $injection, $wrapper);
-        }
-        else {
+        } else {
             $wrapper = view($this->getTemplatePath('client'), $data)->render();
             $injection = '';
             $wrapper = str_replace('<head>', $injection, $wrapper);
@@ -260,7 +259,7 @@ class TemplateEngine
             'body' => $this->body,
             'wrapper' => $wrapper,
             'raw_body' => $this->raw_body,
-            'raw_subject' => $this->raw_subject
+            'raw_subject' => $this->raw_subject,
         ];
 
         $this->tearDown();
@@ -278,48 +277,45 @@ class TemplateEngine
         $vendor = false;
 
         $client = Client::factory()->create([
-                'user_id' => auth()->user()->id,
-                'company_id' => auth()->user()->company()->id,
-            ]);
+            'user_id' => auth()->user()->id,
+            'company_id' => auth()->user()->company()->id,
+        ]);
 
         $contact = ClientContact::factory()->create([
+            'user_id' => auth()->user()->id,
+            'company_id' => auth()->user()->company()->id,
+            'client_id' => $client->id,
+            'is_primary' => 1,
+            'send_email' => true,
+        ]);
+
+        if (! $this->entity || $this->entity == 'invoice') {
+            $this->entity_obj = Invoice::factory()->create([
                 'user_id' => auth()->user()->id,
                 'company_id' => auth()->user()->company()->id,
                 'client_id' => $client->id,
-                'is_primary' => 1,
-                'send_email' => true,
             ]);
 
-
-        if(!$this->entity || $this->entity == 'invoice')
-        {
-            $this->entity_obj = Invoice::factory()->create([
-                        'user_id' => auth()->user()->id,
-                        'company_id' => auth()->user()->company()->id,
-                        'client_id' => $client->id,
-                    ]);
-
             $invitation = InvoiceInvitation::factory()->create([
-                        'user_id' => auth()->user()->id,
-                        'company_id' => auth()->user()->company()->id,
-                        'invoice_id' => $this->entity_obj->id,
-                        'client_contact_id' => $contact->id,
+                'user_id' => auth()->user()->id,
+                'company_id' => auth()->user()->company()->id,
+                'invoice_id' => $this->entity_obj->id,
+                'client_contact_id' => $contact->id,
             ]);
         }
 
-        if($this->entity == 'quote')
-        {
+        if ($this->entity == 'quote') {
             $this->entity_obj = Quote::factory()->create([
-                        'user_id' => auth()->user()->id,
-                        'company_id' => auth()->user()->company()->id,
-                        'client_id' => $client->id,
-                    ]);
+                'user_id' => auth()->user()->id,
+                'company_id' => auth()->user()->company()->id,
+                'client_id' => $client->id,
+            ]);
 
             $invitation = QuoteInvitation::factory()->create([
-                        'user_id' => auth()->user()->id,
-                        'company_id' => auth()->user()->company()->id,
-                        'quote_id' => $this->entity_obj->id,
-                        'client_contact_id' => $contact->id,
+                'user_id' => auth()->user()->id,
+                'company_id' => auth()->user()->company()->id,
+                'quote_id' => $this->entity_obj->id,
+                'client_contact_id' => $contact->id,
             ]);
         }
 
diff --git a/app/Utils/Traits/AppSetup.php b/app/Utils/Traits/AppSetup.php
index 68c135aa47df..50fffb2a60af 100644
--- a/app/Utils/Traits/AppSetup.php
+++ b/app/Utils/Traits/AppSetup.php
@@ -15,10 +15,10 @@ namespace App\Utils\Traits;
 use App\DataMapper\EmailTemplateDefaults;
 use App\Utils\Ninja;
 use App\Utils\SystemHealth;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Str;
-use Illuminate\Support\Facades\Artisan;
 
 trait AppSetup
 {
@@ -38,10 +38,10 @@ trait AppSetup
         $cached_tables = config('ninja.cached_tables');
 
         foreach ($cached_tables as $name => $class) {
-            if (!Cache::has($name) || $force) {
+            if (! Cache::has($name) || $force) {
 
                 // check that the table exists in case the migration is pending
-                if (!Schema::hasTable((new $class())->getTable())) {
+                if (! Schema::hasTable((new $class())->getTable())) {
                     continue;
                 }
                 if ($name == 'payment_terms') {
@@ -62,10 +62,8 @@ trait AppSetup
 
         /*Build template cache*/
         $this->buildTemplates();
-        
     }
 
-
     private function buildTemplates($name = 'templates')
     {
         $data = [
@@ -139,10 +137,10 @@ trait AppSetup
         $words_count = count(explode(' ', trim($value)));
 
         if (is_null($position)) {
-            $words_count > 1 ? $env[] = "{$property}=" . '"' . $value . '"' . "\n" : $env[] = "{$property}=" . $value . "\n";
+            $words_count > 1 ? $env[] = "{$property}=".'"'.$value.'"'."\n" : $env[] = "{$property}=".$value."\n";
         } else {
-            $env[$position] = "{$property}=" . '"' . $value . '"' . "\n"; // If value of variable is more than one word, surround with quotes.
-        } 
+            $env[$position] = "{$property}=".'"'.$value.'"'."\n"; // If value of variable is more than one word, surround with quotes.
+        }
 
         try {
             file_put_contents(base_path('.env'), $env);
diff --git a/app/Utils/Traits/BulkOptions.php b/app/Utils/Traits/BulkOptions.php
index 401931a95743..45c4ae56f21c 100644
--- a/app/Utils/Traits/BulkOptions.php
+++ b/app/Utils/Traits/BulkOptions.php
@@ -38,7 +38,6 @@ trait BulkOptions
      * Available bulk options - used in requests (eg. BulkClientRequests).
      *
      * @return array
-     * @var array
      */
     public function getBulkOptions()
     {
@@ -51,7 +50,6 @@ trait BulkOptions
      * Shared rules for bulk requests.
      *
      * @return array
-     * @var array
      */
     public function getGlobalRules()
     {
diff --git a/app/Utils/Traits/CleanLineItems.php b/app/Utils/Traits/CleanLineItems.php
index 6169e4c35414..a2ce5ad4101b 100644
--- a/app/Utils/Traits/CleanLineItems.php
+++ b/app/Utils/Traits/CleanLineItems.php
@@ -21,14 +21,14 @@ trait CleanLineItems
 {
     public function cleanItems($items) :array
     {
-        if (! isset($items) || !is_array($items)) {
+        if (! isset($items) || ! is_array($items)) {
             return [];
         }
 
         $cleaned_items = [];
 
         foreach ($items as $item) {
-            $cleaned_items[] = $this->cleanLineItem((array)$item);
+            $cleaned_items[] = $this->cleanLineItem((array) $item);
         }
 
         return $cleaned_items;
@@ -44,7 +44,7 @@ trait CleanLineItems
         $invoice_item = (object) get_class_vars(InvoiceItem::class);
 
         unset($invoice_item->casts);
-        
+
         foreach ($invoice_item as $key => $value) {
 
             //if the key has not been set, we set it to a default value
@@ -56,18 +56,22 @@ trait CleanLineItems
                 $item[$key] = BaseSettings::castAttribute(InvoiceItem::$casts[$key], $item[$key]);
             }
 
-            if(array_key_exists('type_id', $item) && $item['type_id'] == '0')
+            if (array_key_exists('type_id', $item) && $item['type_id'] == '0') {
                 $item['type_id'] = '1';
-            
-            if(!array_key_exists('type_id', $item))
+            }
+
+            if (! array_key_exists('type_id', $item)) {
                 $item['type_id'] = '1';
-            
+            }
+
+            // if($item['type_id'] == '2'){
+            //     str_replace()
+            // }
         }
 
         if (array_key_exists('id', $item)) {
             unset($item['id']);
         }
-        
 
         return $item;
     }
diff --git a/app/Utils/Traits/ClientGroupSettingsSaver.php b/app/Utils/Traits/ClientGroupSettingsSaver.php
index 7d819d754ef6..585b42ee8e99 100644
--- a/app/Utils/Traits/ClientGroupSettingsSaver.php
+++ b/app/Utils/Traits/ClientGroupSettingsSaver.php
@@ -86,8 +86,9 @@ trait ClientGroupSettingsSaver
 
         ksort($casts);
 
-        if(property_exists($settings, 'translations'))
+        if (property_exists($settings, 'translations')) {
             unset($settings->translations);
+        }
 
         //18-07-2022 removed || empty($settings->{$key}) from this check to allow "0" values to persist
         foreach ($settings as $key => $value) {
@@ -97,8 +98,7 @@ trait ClientGroupSettingsSaver
         }
 
         foreach ($casts as $key => $value) {
-
-            if($value == 'float' && property_exists($settings, $key)){
+            if ($value == 'float' && property_exists($settings, $key)) {
                 $settings->{$key} = floatval($settings->{$key});
             }
 
@@ -114,12 +114,11 @@ trait ClientGroupSettingsSaver
                 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' && property_exists($settings, 'payment_terms') && strlen($settings->{$key}) >= 1) || 
-                ($key == 'valid_until' && property_exists($settings, 'valid_until') && strlen($settings->{$key}) >= 1)) {  
-                    
-                    $value = 'integer';
+            elseif (substr($key, -3) == '_id' ||
+                substr($key, -14) == 'number_counter' ||
+                ($key == 'payment_terms' && property_exists($settings, 'payment_terms') && strlen($settings->{$key}) >= 1) ||
+                ($key == 'valid_until' && property_exists($settings, 'valid_until') && strlen($settings->{$key}) >= 1)) {
+                $value = 'integer';
 
                 if (! property_exists($settings, $key)) {
                     continue;
@@ -161,24 +160,22 @@ trait ClientGroupSettingsSaver
         $casts = CompanySettings::$casts;
 
         foreach ($casts as $key => $value) {
-
-            if($value == 'float' && property_exists($settings, $key)){
+            if ($value == 'float' && property_exists($settings, $key)) {
                 $settings->{$key} = floatval($settings->{$key});
             }
-            
-            /*Separate loop if it is a _id field which is an integer cast as a string*/
-            if (substr($key, -3) == '_id' || 
-                substr($key, -14) == 'number_counter' || 
-                ($key == 'payment_terms' && property_exists($settings, 'payment_terms') && strlen($settings->{$key}) >= 1) || 
-                ($key == 'valid_until' && property_exists($settings, 'valid_until') && strlen($settings->{$key}) >= 1)) {    
 
+            /*Separate loop if it is a _id field which is an integer cast as a string*/
+            if (substr($key, -3) == '_id' ||
+                substr($key, -14) == 'number_counter' ||
+                ($key == 'payment_terms' && property_exists($settings, 'payment_terms') && strlen($settings->{$key}) >= 1) ||
+                ($key == 'valid_until' && property_exists($settings, 'valid_until') && strlen($settings->{$key}) >= 1)) {
                 $value = 'integer';
 
                 if (! property_exists($settings, $key)) {
                     continue;
                 } elseif ($this->checkAttribute($value, $settings->{$key})) {
-                    if (substr($key, -3) == '_id'|| 
-                        ($key == 'payment_terms' && property_exists($settings, 'payment_terms') && strlen($settings->{$key}) >= 1) || 
+                    if (substr($key, -3) == '_id' ||
+                        ($key == 'payment_terms' && property_exists($settings, 'payment_terms') && strlen($settings->{$key}) >= 1) ||
                         ($key == 'valid_until' && property_exists($settings, 'valid_until') && strlen($settings->{$key}) >= 1)) {
                         settype($settings->{$key}, 'string');
                     } else {
@@ -226,10 +223,10 @@ trait ClientGroupSettingsSaver
             case 'real':
             case 'float':
             case 'double':
-                return !is_string($value) && (is_float($value) || is_numeric(strval($value)));
+                return ! is_string($value) && (is_float($value) || is_numeric(strval($value)));
                 //return is_float($value) || is_numeric(strval($value));
             case 'string':
-                return ( is_string( $value ) && method_exists($value, '__toString') ) || is_null($value) || is_string($value);
+                return (is_string($value) && method_exists($value, '__toString')) || is_null($value) || is_string($value);
             case 'bool':
             case 'boolean':
                 return is_bool($value) || (int) filter_var($value, FILTER_VALIDATE_BOOLEAN);
@@ -239,6 +236,7 @@ trait ClientGroupSettingsSaver
                 return is_array($value);
             case 'json':
                 json_decode($value);
+
                     return json_last_error() == JSON_ERROR_NONE;
             default:
                 return false;
diff --git a/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php b/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php
index ee8c57f523c5..24bcafe7cf03 100644
--- a/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php
+++ b/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php
@@ -28,8 +28,7 @@ trait CompanyGatewayFeesAndLimitsSaver
             $fee_and_limit = (object) $fee_and_limit;
 
             foreach ($casts as $key => $value) {
-
-                if($value == 'float' && property_exists($fee_and_limit, $key)){
+                if ($value == 'float' && property_exists($fee_and_limit, $key)) {
                     $fee_and_limit->{$key} = floatval($fee_and_limit->{$key});
                 }
 
@@ -63,10 +62,10 @@ trait CompanyGatewayFeesAndLimitsSaver
             case 'real':
             case 'float':
             case 'double':
-               return !is_string($value) && (is_float($value) || is_numeric(strval($value)));
+               return ! is_string($value) && (is_float($value) || is_numeric(strval($value)));
            //     return is_float($value) || is_numeric(strval($value));
             case 'string':
-                return ( is_string( $value ) && method_exists($value, '__toString') ) || is_null($value) || is_string($value);
+                return (is_string($value) && method_exists($value, '__toString')) || is_null($value) || is_string($value);
             case 'bool':
             case 'boolean':
                 return is_bool($value) || (int) filter_var($value, FILTER_VALIDATE_BOOLEAN);
diff --git a/app/Utils/Traits/CompanySettingsSaver.php b/app/Utils/Traits/CompanySettingsSaver.php
index 5dd2bad44033..226213358547 100644
--- a/app/Utils/Traits/CompanySettingsSaver.php
+++ b/app/Utils/Traits/CompanySettingsSaver.php
@@ -59,23 +59,17 @@ trait CompanySettingsSaver
             }
         }
 
-        if(property_exists($settings, 'translations'))
-        {
-        //this pass will handle any null values that are in the translations
+        if (property_exists($settings, 'translations')) {
+            //this pass will handle any null values that are in the translations
             foreach ($settings->translations as $key => $value) {
-
-                if(is_array($settings->translations))
-                {
+                if (is_array($settings->translations)) {
                     if (is_null($settings->translations[$key])) {
                         $settings->translations[$key] = '';
                     }
-                }
-                elseif(is_object($settings->translations)){
-                    
+                } elseif (is_object($settings->translations)) {
                     if (is_null($settings->translations->{$key})) {
                         $settings->translations->{$key} = '';
                     }
-                    
                 }
             }
 
@@ -187,8 +181,9 @@ trait CompanySettingsSaver
             if (substr($key, -3) == '_id' || substr($key, -14) == 'number_counter') {
                 $value = 'integer';
 
-                if($key == 'gmail_sending_user_id')
+                if ($key == 'gmail_sending_user_id') {
                     $value = 'string';
+                }
 
                 if($key == 'besr_id')
                     $value = 'string';
@@ -211,7 +206,7 @@ trait CompanySettingsSaver
             }
 
             //try casting floats here
-            if($value == 'float' && property_exists($settings, $key)){
+            if ($value == 'float' && property_exists($settings, $key)) {
                 $settings->{$key} = floatval($settings->{$key});
             }
 
@@ -246,12 +241,12 @@ trait CompanySettingsSaver
         switch ($key) {
             case 'int':
             case 'integer':
-                return ctype_digit(strval(abs((int)$value)));
+                return ctype_digit(strval(abs((int) $value)));
                 // return is_int($value) || ctype_digit(strval(abs($value)));
             case 'real':
             case 'float':
             case 'double':
-                return !is_string($value) && (is_float($value) || is_numeric(strval($value)));
+                return ! is_string($value) && (is_float($value) || is_numeric(strval($value)));
 //                return is_float($value) || is_numeric(strval($value));
             case 'string':
                 return (is_string($value) && method_exists($value, '__toString')) || is_null($value) || is_string($value);
diff --git a/app/Utils/Traits/GeneratesConvertedQuoteCounter.php b/app/Utils/Traits/GeneratesConvertedQuoteCounter.php
index 7c33334cac7c..3b1d3cf6a70d 100644
--- a/app/Utils/Traits/GeneratesConvertedQuoteCounter.php
+++ b/app/Utils/Traits/GeneratesConvertedQuoteCounter.php
@@ -33,33 +33,31 @@ use Illuminate\Support\Str;
  */
 trait GeneratesConvertedQuoteCounter
 {
-
     private function harvestQuoteCounter($quote, $invoice, Client $client)
     {
-    
         $settings = $client->getMergedSettings();
 
         $pattern = $settings->quote_number_pattern;
-        
-        if(strlen($pattern) > 1 && (stripos($pattern, 'counter') === false))
+
+        if (strlen($pattern) > 1 && (stripos($pattern, 'counter') === false)) {
             $pattern = $pattern.'{$counter}';
+        }
 
         $number = $this->applyNumberPattern($quote, '_stubling_', $pattern);
 
-        $prefix_counter = str_replace('_stubling_', "", $number);
-        $counter = str_replace($prefix_counter, "", $quote->number);
+        $prefix_counter = str_replace('_stubling_', '', $number);
+        $counter = str_replace($prefix_counter, '', $quote->number);
 
         return $this->getNextEntityNumber($invoice, $client, intval($counter));
     }
 
-    private function getNextEntityNumber($invoice, Client $client, $counter)
+    private function getNextEntityNumber($invoice, Client $client, $counter='')
     {
-
         $settings = $client->getMergedSettings();
 
         $pattern = $settings->invoice_number_pattern;
-        
-        if(strlen($pattern) > 1 && (stripos($pattern, 'counter') === false)){
+
+        if (strlen($pattern) > 1 && (stripos($pattern, 'counter') === false)) {
             $pattern = $pattern.'{$counter}';
         }
 
@@ -71,12 +69,11 @@ trait GeneratesConvertedQuoteCounter
 
         $check = Invoice::whereCompanyId($client->company_id)->whereNumber($number)->withTrashed()->exists();
 
-        if($check){
+        if ($check) {
             return false;
         }
 
         return $number;
-
     }
 
     private function getNumberPattern($entity, Client $client)
@@ -115,9 +112,10 @@ trait GeneratesConvertedQuoteCounter
                 break;
             case Quote::class:
 
-                if ($this->hasSharedCounter($client, 'quote')) 
+                if ($this->hasSharedCounter($client, 'quote')) {
                     return 'invoice_number_counter';
-                
+                }
+
                 return 'quote_number_counter';
                 break;
             case RecurringInvoice::class:
@@ -133,9 +131,10 @@ trait GeneratesConvertedQuoteCounter
                 return 'payment_number_counter';
                 break;
             case Credit::class:
-                if ($this->hasSharedCounter($client, 'credit')) 
+                if ($this->hasSharedCounter($client, 'credit')) {
                     return 'invoice_number_counter';
-            
+                }
+
                 return 'credit_number_counter';
                 break;
             case Project::class:
@@ -175,7 +174,6 @@ trait GeneratesConvertedQuoteCounter
         $entity_number = $this->getNextEntityNumber(Credit::class, $client);
 
         return $this->replaceUserVars($credit, $entity_number);
-
     }
 
     /**
@@ -190,7 +188,6 @@ trait GeneratesConvertedQuoteCounter
         $entity_number = $this->getNextEntityNumber(Quote::class, $client);
 
         return $this->replaceUserVars($quote, $entity_number);
-
     }
 
     public function getNextRecurringInvoiceNumber(Client $client, $recurring_invoice)
@@ -198,7 +195,6 @@ trait GeneratesConvertedQuoteCounter
         $entity_number = $this->getNextEntityNumber(RecurringInvoice::class, $client);
 
         return $this->replaceUserVars($recurring_invoice, $entity_number);
-
     }
 
     public function getNextRecurringQuoteNumber(Client $client, $recurring_quote)
@@ -206,7 +202,6 @@ trait GeneratesConvertedQuoteCounter
         $entity_number = $this->getNextEntityNumber(RecurringQuote::class, $client);
 
         return $this->replaceUserVars($recurring_quote, $entity_number);
-
     }
 
     /**
@@ -221,7 +216,6 @@ trait GeneratesConvertedQuoteCounter
         $entity_number = $this->getNextEntityNumber(Payment::class, $client);
 
         return $this->replaceUserVars($payment, $entity_number);
-
     }
 
     /**
@@ -247,10 +241,8 @@ trait GeneratesConvertedQuoteCounter
         $entity_number = $client_number;
 
         return $this->replaceUserVars($client, $entity_number);
-
     }
 
-
     /**
      * Gets the next client number.
      *
@@ -271,7 +263,6 @@ trait GeneratesConvertedQuoteCounter
         $entity_number = $vendor_number;
 
         return $this->replaceUserVars($vendor, $entity_number);
-
     }
 
     /**
@@ -286,7 +277,6 @@ trait GeneratesConvertedQuoteCounter
         return $this->replaceUserVars($project, $entity_number);
     }
 
-
     /**
      * Gets the next task number.
      *
@@ -307,7 +297,6 @@ trait GeneratesConvertedQuoteCounter
         $entity_number = $task_number;
 
         return $this->replaceUserVars($task, $entity_number);
-
     }
 
     /**
@@ -330,7 +319,6 @@ trait GeneratesConvertedQuoteCounter
         $entity_number = $expense_number;
 
         return $this->replaceUserVars($expense, $entity_number);
-
     }
 
     /**
@@ -344,7 +332,7 @@ trait GeneratesConvertedQuoteCounter
         $this->resetCompanyCounters($expense->company);
 
         // - 18/09/21 need to set this property if it doesn't exist. //todo refactor this for other properties
-        if(!property_exists($expense->company->settings, 'recurring_expense_number_counter')){
+        if (! property_exists($expense->company->settings, 'recurring_expense_number_counter')) {
             $settings = $expense->company->settings;
             $settings->recurring_expense_number_counter = 1;
             $settings->recurring_expense_number_pattern = '';
@@ -362,10 +350,8 @@ trait GeneratesConvertedQuoteCounter
         $entity_number = $expense_number;
 
         return $this->replaceUserVars($expense, $entity_number);
-
     }
 
-
     /**
      * Determines if it has shared counter.
      *
@@ -373,13 +359,15 @@ trait GeneratesConvertedQuoteCounter
      *
      * @return     bool             True if has shared counter, False otherwise.
      */
-    public function hasSharedCounter(Client $client, string $type = 'quote') : bool 
+    public function hasSharedCounter(Client $client, string $type = 'quote') : bool
     {
-        if($type == 'quote')
+        if ($type == 'quote') {
             return (bool) $client->getSetting('shared_invoice_quote_counter');
+        }
 
-        if($type == 'credit')
+        //if ($type == 'credit') {
             return (bool) $client->getSetting('shared_invoice_credit_counter');
+        
     }
 
     /**
@@ -396,12 +384,10 @@ trait GeneratesConvertedQuoteCounter
      */
     private function checkEntityNumber($class, $entity, $counter, $padding, $pattern, $prefix = '')
     {
-
         $check = false;
         $check_counter = 1;
 
         do {
-
             $number = $this->padCounter($counter, $padding);
 
             $number = $this->applyNumberPattern($entity, $number, $pattern);
@@ -413,24 +399,22 @@ trait GeneratesConvertedQuoteCounter
             $counter++;
             $check_counter++;
 
-            if($check_counter > 100)
-                return $number . "_" . Str::random(5);
-
+            if ($check_counter > 100) {
+                return $number.'_'.Str::random(5);
+            }
         } while ($check);
 
         return $number;
     }
 
-
     /*Check if a number is available for use. */
     public function checkNumberAvailable($class, $entity, $number) :bool
     {
-
-        if ($entity = $class::whereCompanyId($entity->company_id)->whereNumber($number)->withTrashed()->exists()) 
+        if ($entity = $class::whereCompanyId($entity->company_id)->whereNumber($number)->withTrashed()->exists()) {
             return false;
-        
-        return true;
+        }
 
+        return true;
     }
 
     /**
@@ -447,8 +431,9 @@ trait GeneratesConvertedQuoteCounter
             $settings->invoice_number_counter = 0;
         }
 
-        if(!property_exists($settings, $counter_name))
+        if (! property_exists($settings, $counter_name)) {
             $settings->{$counter_name} = 1;
+        }
 
         $settings->{$counter_name} = $settings->{$counter_name} + 1;
 
@@ -488,11 +473,12 @@ trait GeneratesConvertedQuoteCounter
      */
     private function resetCounters(Client $client)
     {
-        $reset_counter_frequency = (int)$client->getSetting('reset_counter_frequency_id');
+        $reset_counter_frequency = (int) $client->getSetting('reset_counter_frequency_id');
 
-        if($reset_counter_frequency == 0)
+        if ($reset_counter_frequency == 0) {
             return;
-        
+        }
+
         $timezone = Timezone::find($client->getSetting('timezone_id'));
 
         $reset_date = Carbon::parse($client->getSetting('reset_counter_date'), $timezone->name);
@@ -549,7 +535,6 @@ trait GeneratesConvertedQuoteCounter
 
         $client->company->settings = $settings;
         $client->company->save();
-
     }
 
     private function resetCompanyCounters($company)
@@ -609,7 +594,7 @@ trait GeneratesConvertedQuoteCounter
         $settings->project_number_counter = 1;
         $settings->task_number_counter = 1;
         $settings->expense_number_counter = 1;
-        $settings->recurring_expense_number_counter =1;
+        $settings->recurring_expense_number_counter = 1;
 
         $company->settings = $settings;
         $company->save();
@@ -647,7 +632,7 @@ trait GeneratesConvertedQuoteCounter
 
         $search[] = '{$year}';
         $replace[] = Carbon::now($entity->company->timezone()->name)->format('Y');
-                
+
         if (strstr($pattern, '{$user_id}') || strstr($pattern, '{$userId}')) {
             $user_id = $entity->user_id ? $entity->user_id : 0;
             $search[] = '{$user_id}';
@@ -671,7 +656,7 @@ trait GeneratesConvertedQuoteCounter
             $search[] = '{$vendor_id_number}';
             $replace[] = $entity->id_number;
         }
-        
+
         if ($entity instanceof Expense) {
             if ($entity->vendor) {
                 $search[] = '{$vendor_id_number}';
@@ -696,7 +681,7 @@ trait GeneratesConvertedQuoteCounter
             $search[] = '{$expense_id_number}';
             $replace[] = $entity->id_number;
         }
-        
+
         if ($entity->client || ($entity instanceof Client)) {
             $client = $entity->client ?: $entity;
 
@@ -733,9 +718,9 @@ trait GeneratesConvertedQuoteCounter
 
     private function replaceUserVars($entity, $pattern)
     {
-
-        if(!$entity)
+        if (! $entity) {
             return $pattern;
+        }
 
         $search = [];
         $replace = [];
@@ -753,6 +738,5 @@ trait GeneratesConvertedQuoteCounter
         $replace[] = $entity->user->custom_value4;
 
         return str_replace($search, $replace, $pattern);
-
     }
 }
diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php
index 939a90849480..4175acbe55e9 100644
--- a/app/Utils/Traits/GeneratesCounter.php
+++ b/app/Utils/Traits/GeneratesCounter.php
@@ -48,8 +48,7 @@ trait GeneratesCounter
         $counter_string = $this->getEntityCounter($entity, $client);
         $pattern = $this->getNumberPattern($entity, $client);
 
-        if ((strpos($pattern, 'clientCounter') !== false) || (strpos($pattern, 'client_counter') !==false) ) {
-
+        if ((strpos($pattern, 'clientCounter') !== false) || (strpos($pattern, 'client_counter') !== false)) {
             if (property_exists($client->settings, $counter_string)) {
                 $counter = $client->settings->{$counter_string};
             } else {
@@ -58,15 +57,13 @@ trait GeneratesCounter
 
             $counter_entity = $client;
         } elseif ((strpos($pattern, 'groupCounter') !== false) || (strpos($pattern, 'group_counter') !== false)) {
-
             if (property_exists($client->group_settings, $counter_string)) {
-            $counter = $client->group_settings->{$counter_string};
+                $counter = $client->group_settings->{$counter_string};
             } else {
                 $counter = 1;
             }
 
             $counter_entity = $client->group_settings;
-
         } else {
             $counter = $client->company->settings->{$counter_string};
             $counter_entity = $client->company;
@@ -75,21 +72,21 @@ trait GeneratesCounter
         //If it is a quote - we need to
         $pattern = $this->getNumberPattern($entity, $client);
 
-        if(strlen($pattern) > 1 && (stripos($pattern, 'counter') === false)){
+        if (strlen($pattern) > 1 && (stripos($pattern, 'counter') === false)) {
             $pattern = $pattern.'{$counter}';
         }
 
         $padding = $client->getSetting('counter_padding');
 
-        if($is_recurring)
+        if ($is_recurring) {
             $prefix = $client->getSetting('recurring_number_prefix');
+        }
 
         $entity_number = $this->checkEntityNumber($entity, $client, $counter, $padding, $pattern, $prefix);
 
         $this->incrementCounter($counter_entity, $counter_string);
 
         return $entity_number;
-
     }
 
     private function getNumberPattern($entity, Client $client)
@@ -125,46 +122,43 @@ trait GeneratesCounter
         switch ($entity) {
             case Invoice::class:
                 return 'invoice_number_counter';
-                break;
+                
             case Quote::class:
 
-                if ($this->hasSharedCounter($client, 'quote'))
+                if ($this->hasSharedCounter($client, 'quote')) {
                     return 'invoice_number_counter';
+                }
 
                 return 'quote_number_counter';
-                break;
+                
             case RecurringInvoice::class:
                 return 'recurring_invoice_number_counter';
-                break;
+                
             case RecurringQuote::class:
                 return 'recurring_quote_number_counter';
-                break;
+                
             case RecurringExpense::class:
                 return 'recurring_expense_number_counter';
-                break;
+                
             case Payment::class:
                 return 'payment_number_counter';
-                break;
+                
             case Credit::class:
-                if ($this->hasSharedCounter($client, 'credit'))
+                if ($this->hasSharedCounter($client, 'credit')) {
                     return 'invoice_number_counter';
+                }
 
                 return 'credit_number_counter';
-                break;
+                
             case Project::class:
                 return 'project_number_counter';
-                break;
+                
             case PurchaseOrder::class:
                 return 'purchase_order_number_counter';
-                break;
-
-            case PurchaseOrder::class:
-                return 'purchase_order_number_counter';
-                break;
 
             default:
                 return 'default_number_counter';
-                break;
+
         }
     }
 
@@ -195,7 +189,6 @@ trait GeneratesCounter
         $entity_number = $this->getNextEntityNumber(Credit::class, $client);
 
         return $this->replaceUserVars($credit, $entity_number);
-
     }
 
     /**
@@ -210,7 +203,6 @@ trait GeneratesCounter
         $entity_number = $this->getNextEntityNumber(Quote::class, $client);
 
         return $this->replaceUserVars($quote, $entity_number);
-
     }
 
     public function getNextRecurringInvoiceNumber(Client $client, $recurring_invoice)
@@ -218,7 +210,6 @@ trait GeneratesCounter
         $entity_number = $this->getNextEntityNumber(RecurringInvoice::class, $client);
 
         return $this->replaceUserVars($recurring_invoice, $entity_number);
-
     }
 
     public function getNextRecurringQuoteNumber(Client $client, $recurring_quote)
@@ -226,7 +217,6 @@ trait GeneratesCounter
         $entity_number = $this->getNextEntityNumber(RecurringQuote::class, $client);
 
         return $this->replaceUserVars($recurring_quote, $entity_number);
-
     }
 
     /**
@@ -241,7 +231,6 @@ trait GeneratesCounter
         $entity_number = $this->getNextEntityNumber(Payment::class, $client);
 
         return $this->replaceUserVars($payment, $entity_number);
-
     }
 
     /**
@@ -267,10 +256,8 @@ trait GeneratesCounter
         $entity_number = $client_number;
 
         return $this->replaceUserVars($client, $entity_number);
-
     }
 
-
     /**
      * Gets the next client number.
      *
@@ -291,7 +278,6 @@ trait GeneratesCounter
         $entity_number = $vendor_number;
 
         return $this->replaceUserVars($vendor, $entity_number);
-
     }
 
     /**
@@ -306,7 +292,6 @@ trait GeneratesCounter
         return $this->replaceUserVars($project, $entity_number);
     }
 
-
     /**
      * Gets the next task number.
      *
@@ -327,7 +312,6 @@ trait GeneratesCounter
         $entity_number = $task_number;
 
         return $this->replaceUserVars($task, $entity_number);
-
     }
 
     /**
@@ -350,7 +334,6 @@ trait GeneratesCounter
         $entity_number = $expense_number;
 
         return $this->replaceUserVars($expense, $entity_number);
-
     }
 
     public function getNextPurchaseOrderNumber(PurchaseOrder $purchase_order) :string
@@ -367,8 +350,7 @@ trait GeneratesCounter
         $entity_number = $purchase_order_number;
 
         return $this->replaceUserVars($purchase_order, $entity_number);
-
-    }   
+    }
 
     /**
      * Gets the next expense number.
@@ -381,7 +363,7 @@ trait GeneratesCounter
         $this->resetCompanyCounters($expense->company);
 
         // - 18/09/21 need to set this property if it doesn't exist. //todo refactor this for other properties
-        if(!property_exists($expense->company->settings, 'recurring_expense_number_counter')){
+        if (! property_exists($expense->company->settings, 'recurring_expense_number_counter')) {
             $settings = $expense->company->settings;
             $settings->recurring_expense_number_counter = 1;
             $settings->recurring_expense_number_pattern = '';
@@ -399,10 +381,8 @@ trait GeneratesCounter
         $entity_number = $expense_number;
 
         return $this->replaceUserVars($expense, $entity_number);
-
     }
 
-
     /**
      * Determines if it has shared counter.
      *
@@ -412,11 +392,12 @@ trait GeneratesCounter
      */
     public function hasSharedCounter(Client $client, string $type = 'quote') : bool
     {
-        if($type == 'quote')
+        if ($type == 'quote') {
             return (bool) $client->getSetting('shared_invoice_quote_counter');
+        }
 
-        if($type == 'credit')
-            return (bool) $client->getSetting('shared_invoice_credit_counter');
+        //credit
+        return (bool) $client->getSetting('shared_invoice_credit_counter');    
     }
 
     /**
@@ -433,12 +414,10 @@ trait GeneratesCounter
      */
     private function checkEntityNumber($class, $entity, $counter, $padding, $pattern, $prefix = '')
     {
-
         $check = false;
         $check_counter = 1;
 
         do {
-
             $number = $this->padCounter($counter, $padding);
 
             $number = $this->applyNumberPattern($entity, $number, $pattern);
@@ -450,24 +429,22 @@ trait GeneratesCounter
             $counter++;
             $check_counter++;
 
-            if($check_counter > 100)
-                return $number . "_" . Str::random(5);
-
+            if ($check_counter > 100) {
+                return $number.'_'.Str::random(5);
+            }
         } while ($check);
 
         return $number;
     }
 
-
     /*Check if a number is available for use. */
     public function checkNumberAvailable($class, $entity, $number) :bool
     {
-
-        if ($entity = $class::whereCompanyId($entity->company_id)->whereNumber($number)->withTrashed()->exists())
+        if ($entity = $class::whereCompanyId($entity->company_id)->whereNumber($number)->withTrashed()->exists()) {
             return false;
+        }
 
         return true;
-
     }
 
     /**
@@ -484,8 +461,9 @@ trait GeneratesCounter
             $settings->invoice_number_counter = 0;
         }
 
-        if(!property_exists($settings, $counter_name))
+        if (! property_exists($settings, $counter_name)) {
             $settings->{$counter_name} = 1;
+        }
 
         $settings->{$counter_name} = $settings->{$counter_name} + 1;
 
@@ -525,10 +503,11 @@ trait GeneratesCounter
      */
     private function resetCounters(Client $client)
     {
-        $reset_counter_frequency = (int)$client->getSetting('reset_counter_frequency_id');
+        $reset_counter_frequency = (int) $client->getSetting('reset_counter_frequency_id');
 
-        if($reset_counter_frequency == 0)
+        if ($reset_counter_frequency == 0) {
             return;
+        }
 
         $timezone = Timezone::find($client->getSetting('timezone_id'));
 
@@ -587,7 +566,6 @@ trait GeneratesCounter
 
         $client->company->settings = $settings;
         $client->company->save();
-
     }
 
     private function resetCompanyCounters($company)
@@ -647,7 +625,7 @@ trait GeneratesCounter
         $settings->project_number_counter = 1;
         $settings->task_number_counter = 1;
         $settings->expense_number_counter = 1;
-        $settings->recurring_expense_number_counter =1;
+        $settings->recurring_expense_number_counter = 1;
         $settings->purchase_order_number_counter = 1;
 
         $company->settings = $settings;
@@ -772,9 +750,9 @@ trait GeneratesCounter
 
     private function replaceUserVars($entity, $pattern)
     {
-
-        if(!$entity)
+        if (! $entity) {
             return $pattern;
+        }
 
         $search = [];
         $replace = [];
@@ -792,6 +770,5 @@ trait GeneratesCounter
         $replace[] = $entity->user->custom_value4;
 
         return str_replace($search, $replace, $pattern);
-
     }
 }
diff --git a/app/Utils/Traits/Inviteable.php b/app/Utils/Traits/Inviteable.php
index abff198d1ee9..7e2e6fae1455 100644
--- a/app/Utils/Traits/Inviteable.php
+++ b/app/Utils/Traits/Inviteable.php
@@ -45,38 +45,37 @@ trait Inviteable
 
     public function getPaymentLink()
     {
-        if(Ninja::isHosted()){
+        if (Ninja::isHosted()) {
             $domain = $this->company->domain();
-        }
-        else
+        } else {
             $domain = config('ninja.app_url');
+        }
 
         return $domain.'/client/pay/'.$this->key;
     }
 
     public function getUnsubscribeLink()
     {
-        if(Ninja::isHosted()){
+        if (Ninja::isHosted()) {
             $domain = $this->company->domain();
-        }
-        else
+        } else {
             $domain = config('ninja.app_url');
+        }
 
         $entity_type = Str::snake(class_basename($this->entityType()));
 
         return $domain.'/client/unsubscribe/'.$entity_type.'/'.$this->key;
-
     }
 
     public function getLink() :string
     {
         $entity_type = Str::snake(class_basename($this->entityType()));
 
-        if(Ninja::isHosted()){
+        if (Ninja::isHosted()) {
             $domain = $this->company->domain();
-        }
-        else
+        } else {
             $domain = config('ninja.app_url');
+        }
 
         switch ($this->company->portal_mode) {
             case 'subdomain':
@@ -98,11 +97,11 @@ trait Inviteable
 
     public function getPortalLink() :string
     {
-
-        if(Ninja::isHosted())
+        if (Ninja::isHosted()) {
             $domain = $this->company->domain();
-        else
+        } else {
             $domain = config('ninja.app_url');
+        }
 
         switch ($this->company->portal_mode) {
             case 'subdomain':
@@ -120,7 +119,6 @@ trait Inviteable
                 return '';
                 break;
         }
-
     }
 
     public function getAdminLink() :string
diff --git a/app/Utils/Traits/MakesDates.php b/app/Utils/Traits/MakesDates.php
index b4bbc8043728..797b545e9ffd 100644
--- a/app/Utils/Traits/MakesDates.php
+++ b/app/Utils/Traits/MakesDates.php
@@ -57,7 +57,7 @@ trait MakesDates
      */
     public function formatDate($date, string $format) :string
     {
-        if (!isset($date)) {
+        if (! isset($date)) {
             return '';
         }
 
@@ -70,13 +70,13 @@ trait MakesDates
 
     /**
      * Formats a datedate.
-     * @param  Carbon|string $date   Carbon object or date string
+     * @param  $date   Carbon object or date string
      * @param  string $format The date display format
      * @return string         The formatted date
      */
     public function formatDatetime($date, string $format) :string
     {
-        return Carbon::createFromTimestamp($date)->format($format . " g:i a");
+        return Carbon::createFromTimestamp($date)->format($format.' g:i a');
     }
 
     /**
@@ -94,21 +94,22 @@ trait MakesDates
     {
         $dt = new DateTime($date);
         $dt->setTimezone(new DateTimeZone('UTC'));
+
         return $dt;
     }
 
     public function translateDate($date, $format, $locale)
     {
-        if(empty($date))
+        if (empty($date)) {
             return '';
+        }
 
         Carbon::setLocale($locale);
 
         try {
             return Carbon::parse($date)->translatedFormat($format);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             return 'Invalid date!';
         }
     }
-
 }
diff --git a/app/Utils/Traits/MakesHash.php b/app/Utils/Traits/MakesHash.php
index 514181c87527..73ba58ab5438 100644
--- a/app/Utils/Traits/MakesHash.php
+++ b/app/Utils/Traits/MakesHash.php
@@ -37,8 +37,9 @@ trait MakesHash
      */
     public function createDbHash($db) : string
     {
-        if(config('ninja.db.multi_db_enabled'))
-            return  $this->getDbCode($db).'-'. Str::random(config('ninja.key_length'));
+        if (config('ninja.db.multi_db_enabled')) {
+            return  $this->getDbCode($db).'-'.Str::random(config('ninja.key_length'));
+        }
 
         return Str::random(config('ninja.key_length'));
     }
@@ -69,7 +70,7 @@ trait MakesHash
             $decoded_array = $hashids->decode($value);
 
             if (! is_array($decoded_array)) {
-                throw new \Exception("Invalid Primary Key");
+                throw new \Exception('Invalid Primary Key');
                 //response()->json(['error'=>'Invalid primary key'], 400);
             }
 
diff --git a/app/Utils/Traits/MakesInvoiceHtml.php b/app/Utils/Traits/MakesInvoiceHtml.php
index 7bf921d636bb..642d5f5dadf5 100644
--- a/app/Utils/Traits/MakesInvoiceHtml.php
+++ b/app/Utils/Traits/MakesInvoiceHtml.php
@@ -24,7 +24,6 @@ use Throwable;
  */
 trait MakesInvoiceHtml
 {
-
     private function parseLabelsAndValues($labels, $values, $section) :string
     {
         $section = strtr($section, $labels);
@@ -64,7 +63,7 @@ trait MakesInvoiceHtml
                 ob_end_clean();
             }
 
-            throw new \Exception($e);
+            throw new \Exception($e->getMessage());
         }
 
         return ob_get_clean();
diff --git a/app/Utils/Traits/MakesInvoiceValues.php b/app/Utils/Traits/MakesInvoiceValues.php
index 1b5c6985155a..735d436c296b 100644
--- a/app/Utils/Traits/MakesInvoiceValues.php
+++ b/app/Utils/Traits/MakesInvoiceValues.php
@@ -270,9 +270,8 @@ trait MakesInvoiceValues
         $data = [];
 
         if (! is_array($items)) {
-            $data;
         }
-       
+
         $locale_info = localeconv();
 
         foreach ($items as $key => $item) {
@@ -291,47 +290,42 @@ trait MakesInvoiceValues
             $helpers = new Helpers();
             $_table_type = ltrim($table_type, '$'); // From $product -> product.
 
-
             $data[$key][$table_type.'.product_key'] = is_null(optional($item)->product_key) ? $item->item : $item->product_key;
             $data[$key][$table_type.'.item'] = is_null(optional($item)->item) ? $item->product_key : $item->item;
             $data[$key][$table_type.'.service'] = is_null(optional($item)->service) ? $item->product_key : $item->service;
 
             $data[$key][$table_type.'.notes'] = Helpers::processReservedKeywords($item->notes, $entity);
             $data[$key][$table_type.'.description'] = Helpers::processReservedKeywords($item->notes, $entity);
-    
-            $data[$key][$table_type . ".{$_table_type}1"] = $helpers->formatCustomFieldValue($this->company->custom_fields, "{$_table_type}1", $item->custom_value1, $entity);
-            $data[$key][$table_type . ".{$_table_type}2"] = $helpers->formatCustomFieldValue($this->company->custom_fields, "{$_table_type}2", $item->custom_value2, $entity);
-            $data[$key][$table_type . ".{$_table_type}3"] = $helpers->formatCustomFieldValue($this->company->custom_fields, "{$_table_type}3", $item->custom_value3, $entity);
-            $data[$key][$table_type . ".{$_table_type}4"] = $helpers->formatCustomFieldValue($this->company->custom_fields, "{$_table_type}4", $item->custom_value4, $entity);
-            
-            if($item->quantity > 0 || $item->cost > 0){
 
+            $data[$key][$table_type.".{$_table_type}1"] = $helpers->formatCustomFieldValue($this->company->custom_fields, "{$_table_type}1", $item->custom_value1, $entity);
+            $data[$key][$table_type.".{$_table_type}2"] = $helpers->formatCustomFieldValue($this->company->custom_fields, "{$_table_type}2", $item->custom_value2, $entity);
+            $data[$key][$table_type.".{$_table_type}3"] = $helpers->formatCustomFieldValue($this->company->custom_fields, "{$_table_type}3", $item->custom_value3, $entity);
+            $data[$key][$table_type.".{$_table_type}4"] = $helpers->formatCustomFieldValue($this->company->custom_fields, "{$_table_type}4", $item->custom_value4, $entity);
+
+            if ($item->quantity > 0 || $item->cost > 0) {
                 $data[$key][$table_type.'.quantity'] = Number::formatValueNoTrailingZeroes($item->quantity, $entity->currency());
-                
+
                 $data[$key][$table_type.'.unit_cost'] = Number::formatMoneyNoRounding($item->cost, $entity);
 
                 $data[$key][$table_type.'.cost'] = Number::formatMoney($item->cost, $entity);
 
-                $data[$key][$table_type.'.line_total'] =  Number::formatMoney($item->line_total, $entity);
-
-            }
-            else {
-
+                $data[$key][$table_type.'.line_total'] = Number::formatMoney($item->line_total, $entity);
+            } else {
                 $data[$key][$table_type.'.quantity'] = '';
-                
+
                 $data[$key][$table_type.'.unit_cost'] = '';
 
                 $data[$key][$table_type.'.cost'] = '';
 
-                $data[$key][$table_type.'.line_total'] =  '';
-                
+                $data[$key][$table_type.'.line_total'] = '';
             }
 
-            if(property_exists($item, 'gross_line_total'))
-                $data[$key][$table_type.'.gross_line_total'] =  ($item->gross_line_total == 0) ? '' :Number::formatMoney($item->gross_line_total, $entity);
-            else
+            if (property_exists($item, 'gross_line_total')) {
+                $data[$key][$table_type.'.gross_line_total'] = ($item->gross_line_total == 0) ? '' : Number::formatMoney($item->gross_line_total, $entity);
+            } else {
                 $data[$key][$table_type.'.gross_line_total'] = '';
-        
+            }
+
             if (isset($item->discount) && $item->discount > 0) {
                 if ($item->is_amount_discount) {
                     $data[$key][$table_type.'.discount'] = Number::formatMoney($item->discount, $entity);
@@ -360,7 +354,7 @@ trait MakesInvoiceValues
                 $data[$key][$table_type.'.tax3'] = &$data[$key][$table_type.'.tax_rate3'];
             }
 
-            $data[$key]['task_id'] = optional($item)->task_id;
+            $data[$key]['task_id'] = property_exists($item, 'task_id') ? $item->task_id : '';
         }
 
         return $data;
@@ -487,8 +481,7 @@ trait MakesInvoiceValues
      */
     public function generateCustomCSS() :string
     {
-
-        $settings = $this->client ? $this->client->getMergedSettings() :  $this->company->settings;
+        $settings = $this->client ? $this->client->getMergedSettings() : $this->company->settings;
 
         $header_and_footer = '
 .header, .header-space {
diff --git a/app/Utils/Traits/MakesReminders.php b/app/Utils/Traits/MakesReminders.php
index 695fad747621..5cc0ceff4ca6 100644
--- a/app/Utils/Traits/MakesReminders.php
+++ b/app/Utils/Traits/MakesReminders.php
@@ -19,7 +19,6 @@ use Illuminate\Support\Carbon;
  */
 trait MakesReminders
 {
-    
     public function inReminderWindow($schedule_reminder, $num_days_reminder)
     {
         switch ($schedule_reminder) {
@@ -51,17 +50,17 @@ trait MakesReminders
         if ($this->inReminderWindow(
             $client->getSetting('schedule_reminder1'),
             $client->getSetting('num_days_reminder1')
-        ) && !$this->reminder1_sent) {
+        ) && ! $this->reminder1_sent) {
             return 'reminder1';
         } elseif ($this->inReminderWindow(
             $client->getSetting('schedule_reminder2'),
             $client->getSetting('num_days_reminder2')
-        ) && !$this->reminder2_sent) {
+        ) && ! $this->reminder2_sent) {
             return 'reminder2';
         } elseif ($this->inReminderWindow(
             $client->getSetting('schedule_reminder3'),
             $client->getSetting('num_days_reminder3')
-        )  && !$this->reminder3_sent) {
+        ) && ! $this->reminder3_sent) {
             return 'reminder3';
         } elseif ($this->checkEndlessReminder(
             $this->reminder_last_sent,
@@ -76,11 +75,11 @@ trait MakesReminders
     }
 
     private function checkEndlessReminder($last_sent_date, $endless_reminder_frequency_id) :bool
-    {   
+    {
         // nlog("endless date match = ".$this->addTimeInterval($last_sent_date, $endless_reminder_frequency_id));
         // nlog("Endless reminder bool = ");
         // nlog(Carbon::now()->startOfDay()->eq($this->addTimeInterval($last_sent_date, $endless_reminder_frequency_id)));
-        
+
         if (Carbon::now()->startOfDay()->eq($this->addTimeInterval($last_sent_date, $endless_reminder_frequency_id))) {
             return true;
         }
@@ -89,14 +88,14 @@ trait MakesReminders
     }
 
     private function addTimeInterval($date, $endless_reminder_frequency_id) :?Carbon
-    {   
-
-        if (!$date) 
+    {
+        if (! $date) {
             return null;
-        
+        }
+
         switch ($endless_reminder_frequency_id) {
             case RecurringInvoice::FREQUENCY_DAILY:
-                return Carbon::parse($date)->addDay()->startOfDay(); 
+                return Carbon::parse($date)->addDay()->startOfDay();
            case RecurringInvoice::FREQUENCY_WEEKLY:
                 return Carbon::parse($date)->addWeek()->startOfDay();
             case RecurringInvoice::FREQUENCY_TWO_WEEKS:
diff --git a/app/Utils/Traits/MakesTemplateData.php b/app/Utils/Traits/MakesTemplateData.php
index 9c019bb0f652..e9b35cab75ac 100644
--- a/app/Utils/Traits/MakesTemplateData.php
+++ b/app/Utils/Traits/MakesTemplateData.php
@@ -173,7 +173,7 @@ trait MakesTemplateData
         $data['$company.id_number'] = ['value' => 'ID-NO-#434', 'label' => ctrans('texts.id_number')];
         $data['$company.website'] = ['value' => 'https://invoiceninja.com', 'label' => ctrans('texts.website')];
         $data['$company.address'] = ['value' => '5 Kalamazoo Way\n Jimbuckeroo\n USA 90210', 'label' => ctrans('texts.address')];
-        $data['$company.logo'] = ['value' => "<img src='https://raw.githubusercontent.com/hillelcoren/invoice-ninja/master/public/images/round_logo.png' class='w-48' alt='logo'>" ?: '&nbsp;', 'label' => ctrans('texts.logo')];
+        $data['$company.logo'] = ['value' => "<img src='https://raw.githubusercontent.com/hillelcoren/invoice-ninja/master/public/images/round_logo.png' class='w-48' alt='logo'>", 'label' => ctrans('texts.logo')];
         $data['$company_logo'] = &$data['$company.logo'];
         $data['$company1'] = ['value' => 'Company Custom Value 1', 'label' => 'company label1'];
         $data['$company2'] = ['value' => 'Company Custom Value 2', 'label' => 'company label2'];
diff --git a/app/Utils/Traits/Notifications/UserNotifies.php b/app/Utils/Traits/Notifications/UserNotifies.php
index 3995a4f21517..1a4baabe7081 100644
--- a/app/Utils/Traits/Notifications/UserNotifies.php
+++ b/app/Utils/Traits/Notifications/UserNotifies.php
@@ -22,30 +22,28 @@ use App\Models\Quote;
  * Class UserNotifies.
  *
  * I think the term $required_permissions is confusing here, what
- * we are actually defining is the notifications available on the 
+ * we are actually defining is the notifications available on the
  * user itself.
  */
 trait UserNotifies
 {
     public function findUserNotificationTypes($invitation, $company_user, $entity_name, $required_permissions) :array
     {
-
         $notifiable_methods = [];
         $notifications = $company_user->notifications;
 
-        if ($invitation->company->is_disabled && 
-            is_array($notifications->email) || 
+        if ($invitation->company->is_disabled &&
+            is_array($notifications->email) ||
             $company_user->trashed() ||
-            !$company_user->user || 
+            ! $company_user->user ||
             $company_user->user->trashed()) {
             return [];
         }
-        
+
         //if a user owns this record or is assigned to it, they are attached the permission for notification.
         if ($invitation->{$entity_name}->user_id == $company_user->_user_id || $invitation->{$entity_name}->assigned_user_id == $company_user->user_id) {
             $required_permissions = $this->addSpecialUserPermissionForEntity($invitation->{$entity_name}, $required_permissions);
-        }
-        else{
+        } else {
             $required_permissions = $this->removeSpecialUserPermissionForEntity($invitation->{$entity_name}, $required_permissions);
         }
 
@@ -61,18 +59,17 @@ trait UserNotifies
         $notifiable_methods = [];
         $notifications = $company_user->notifications;
 
-        if ($entity->company->is_disabled || 
-            ! $notifications || 
+        if ($entity->company->is_disabled ||
+            ! $notifications ||
             $company_user->trashed() ||
-            ! $company_user->user || 
+            ! $company_user->user ||
             $company_user->user->trashed()) {
             return [];
         }
 
         if ($entity->user_id == $company_user->_user_id || $entity->assigned_user_id == $company_user->user_id) {
             $required_permissions = $this->addSpecialUserPermissionForEntity($entity, $required_permissions);
-        }
-        else{
+        } else {
             $required_permissions = $this->removeSpecialUserPermissionForEntity($entity, $required_permissions);
         }
 
@@ -85,25 +82,24 @@ trait UserNotifies
 
     private function addSpecialUserPermissionForEntity($entity, array $required_permissions) :array
     {
-
-        array_merge($required_permissions, ["all_notifications"]);
+        array_merge($required_permissions, ['all_notifications']);
 
         switch ($entity) {
-            case ($entity instanceof Payment || $entity instanceof Client): //we pass client also as this is the proxy for Payment Failures (ie, there is no payment)
-                return array_merge($required_permissions, ["all_notifications","all_user_notifications","payment_failure_user","payment_success_user"]);
+            case $entity instanceof Payment || $entity instanceof Client: //we pass client also as this is the proxy for Payment Failures (ie, there is no payment)
+                return array_merge($required_permissions, ['all_notifications', 'all_user_notifications', 'payment_failure_user', 'payment_success_user']);
                 break;
-            case ($entity instanceof Invoice):
-                return array_merge($required_permissions, ["all_notifications","all_user_notifications","invoice_created_user","invoice_sent_user","invoice_viewed_user","invoice_late_user"]);
+            case $entity instanceof Invoice:
+                return array_merge($required_permissions, ['all_notifications', 'all_user_notifications', 'invoice_created_user', 'invoice_sent_user', 'invoice_viewed_user', 'invoice_late_user']);
                 break;
-            case ($entity instanceof Quote):
-                return array_merge($required_permissions, ["all_notifications","all_user_notifications","quote_created_user","quote_sent_user","quote_viewed_user","quote_approved_user","quote_expired_user"]);
+            case $entity instanceof Quote:
+                return array_merge($required_permissions, ['all_notifications', 'all_user_notifications', 'quote_created_user', 'quote_sent_user', 'quote_viewed_user', 'quote_approved_user', 'quote_expired_user']);
                 break;
-            case ($entity instanceof Credit):
-                return array_merge($required_permissions, ["all_notifications","all_user_notifications","credit_created_user","credit_sent_user","credit_viewed_user"]);
+            case $entity instanceof Credit:
+                return array_merge($required_permissions, ['all_notifications', 'all_user_notifications', 'credit_created_user', 'credit_sent_user', 'credit_viewed_user']);
+                break;
+            case $entity instanceof PurchaseOrder:
+                return array_merge($required_permissions, ['all_notifications', 'all_user_notifications', 'purchase_order_created_user', 'purchase_order_sent_user', 'purchase_order_viewed_user']);
                 break;
-            case ($entity instanceof PurchaseOrder):
-                return array_merge($required_permissions, ["all_notifications","all_user_notifications","purchase_order_created_user","purchase_order_sent_user","purchase_order_viewed_user"]);
-                break;      
             default:
                 return [];
                 break;
@@ -112,37 +108,35 @@ trait UserNotifies
 
     private function removeSpecialUserPermissionForEntity($entity, $required_permissions)
     {
-        array_merge($required_permissions, ["all_notifications"]);
+        array_merge($required_permissions, ['all_notifications']);
 
         switch ($entity) {
-            case ($entity instanceof Payment || $entity instanceof Client): //we pass client also as this is the proxy for Payment Failures (ie, there is no payment)
-                return array_diff($required_permissions, ["all_user_notifications","payment_failure_user","payment_success_user"]);
+            case $entity instanceof Payment || $entity instanceof Client: //we pass client also as this is the proxy for Payment Failures (ie, there is no payment)
+                return array_diff($required_permissions, ['all_user_notifications', 'payment_failure_user', 'payment_success_user']);
                 break;
-            case ($entity instanceof Invoice):
-                return array_diff($required_permissions, ["all_user_notifications","invoice_created_user","invoice_sent_user","invoice_viewed_user","invoice_late_user"]);
+            case $entity instanceof Invoice:
+                return array_diff($required_permissions, ['all_user_notifications', 'invoice_created_user', 'invoice_sent_user', 'invoice_viewed_user', 'invoice_late_user']);
                 break;
-            case ($entity instanceof Quote):
-                return array_diff($required_permissions, ["all_user_notifications","quote_created_user","quote_sent_user","quote_viewed_user","quote_approved_user","quote_expired_user"]);
+            case $entity instanceof Quote:
+                return array_diff($required_permissions, ['all_user_notifications', 'quote_created_user', 'quote_sent_user', 'quote_viewed_user', 'quote_approved_user', 'quote_expired_user']);
                 break;
-            case ($entity instanceof Credit):
-                return array_diff($required_permissions, ["all_user_notifications","credit_created_user","credit_sent_user","credit_viewed_user"]);
+            case $entity instanceof Credit:
+                return array_diff($required_permissions, ['all_user_notifications', 'credit_created_user', 'credit_sent_user', 'credit_viewed_user']);
+                break;
+            case $entity instanceof PurchaseOrder:
+                return array_diff($required_permissions, ['all_user_notifications', 'purchase_order_created_user', 'purchase_order_sent_user', 'purchase_order_viewed_user']);
                 break;
-            case ($entity instanceof PurchaseOrder):
-                return array_diff($required_permissions, ["all_user_notifications","purchase_order_created_user","purchase_order_sent_user","purchase_order_viewed_user"]);
-                break;                
             default:
                 // code...
                 break;
         }
     }
 
-
     public function findCompanyUserNotificationType($company_user, $required_permissions) :array
     {
-
-        if ($company_user->company->is_disabled || 
-            $company_user->trashed() || 
-            !$company_user->user ||
+        if ($company_user->company->is_disabled ||
+            $company_user->trashed() ||
+            ! $company_user->user ||
             $company_user->user->trashed()) {
             return [];
         }
@@ -160,19 +154,15 @@ trait UserNotifies
 
     /*
      * Returns a filtered collection of users with the
-     * required notification - NOTE this is only implemented for 
+     * required notification - NOTE this is only implemented for
      * EMAIL notification types - we'll need to chain
      * additional types at a later stage.
      */
     public function filterUsersByPermissions($company_users, $entity, array $required_notification)
     {
-
-        return $company_users->filter(function($company_user) use($required_notification, $entity){
-
+        return $company_users->filter(function ($company_user) use ($required_notification, $entity) {
             return $this->checkNotificationExists($company_user, $entity, $required_notification);
-
         });
-
     }
 
     private function checkNotificationExists($company_user, $entity, $required_notification)
@@ -181,9 +171,9 @@ trait UserNotifies
         array_push($required_notification, 'all_notifications');
 
         /* Selectively add the all_user if the user is associated with the entity */
-        if ($entity->user_id == $company_user->_user_id || $entity->assigned_user_id == $company_user->user_id) 
+        if ($entity->user_id == $company_user->_user_id || $entity->assigned_user_id == $company_user->user_id) {
             array_push($required_notification, 'all_user_notifications');
-        
+        }
 
         return count(array_intersect($required_notification, $company_user->notifications->email)) >= 1;
     }
diff --git a/app/Utils/Traits/NumberFormatter.php b/app/Utils/Traits/NumberFormatter.php
index 87523e8a7e26..a83a85e51f73 100644
--- a/app/Utils/Traits/NumberFormatter.php
+++ b/app/Utils/Traits/NumberFormatter.php
@@ -19,8 +19,8 @@ trait NumberFormatter
     private function formatValue($value, $precision) : string
     {
         /* 08-01-2022 allow increased precision means we need to transform from scientific notation to a regular string */
-        
-        return number_format($this->parseFloat(rtrim(sprintf('%f', $value),"0")), $precision, '.', '');
+
+        return number_format($this->parseFloat(rtrim(sprintf('%f', $value), '0')), $precision, '.', '');
 
         // return number_format($this->parseFloat($value), $precision, '.', '');
     }
diff --git a/app/Utils/Traits/Pdf/PDF.php b/app/Utils/Traits/Pdf/PDF.php
index f0a87ae5c970..21f41daf8273 100644
--- a/app/Utils/Traits/Pdf/PDF.php
+++ b/app/Utils/Traits/Pdf/PDF.php
@@ -12,29 +12,27 @@
 namespace App\Utils\Traits\Pdf;
 
 use setasign\Fpdi\Fpdi;
- 
+
 class PDF extends FPDI
 {
- 
     public $text_alignment = 'L';
 
-    function Footer()
+    public function Footer()
     {
         $this->SetXY(0, -5);
-        $this->SetFont('Arial','I', 9);
-        $this->SetTextColor(135,135,135);
+        $this->SetFont('Arial', 'I', 9);
+        $this->SetTextColor(135, 135, 135);
 
         $trans = ctrans('texts.pdf_page_info', ['current' => $this->PageNo(), 'total' => '{nb}']);
-        $this->Cell(0,5, $trans ,0,0, $this->text_alignment);
-
+        $this->Cell(0, 5, $trans, 0, 0, $this->text_alignment);
     }
 
     public function setAlignment($alignment)
     {
-        if(in_array($alignment, ['C','L','R']))
+        if (in_array($alignment, ['C', 'L', 'R'])) {
             $this->text_alignment = $alignment;
+        }
 
         return $this;
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/Utils/Traits/Pdf/PageNumbering.php b/app/Utils/Traits/Pdf/PageNumbering.php
index 2adf2fa0690b..f1dce441aabe 100644
--- a/app/Utils/Traits/Pdf/PageNumbering.php
+++ b/app/Utils/Traits/Pdf/PageNumbering.php
@@ -10,6 +10,7 @@
  */
 
 namespace App\Utils\Traits\Pdf;
+
 use App\Utils\Traits\Pdf\PDF;
 use setasign\Fpdi\PdfParser\StreamReader;
 
@@ -17,12 +18,11 @@ trait PageNumbering
 {
     private function pageNumbering($pdf_data_object, $company)
     {
-
-        if(!property_exists($company->settings, 'page_numbering') || !$company->settings->page_numbering)
+        if (! property_exists($company->settings, 'page_numbering') || ! $company->settings->page_numbering) {
             return $pdf_data_object;
+        }
 
-        try
-        {
+        try {
             $pdf = new PDF();
 
             $pdf->setAlignment($company->getSetting('page_numbering_alignment'));
@@ -31,24 +31,21 @@ trait PageNumbering
 
             $pdf->AliasNbPages();
 
-            for ($i=1; $i <= $pageCount; $i++) { 
+            for ($i = 1; $i <= $pageCount; $i++) {
                 //import a page then get the id and will be used in the template
                 $tplId = $pdf->importPage($i);
 
-                //create a page        
+                //create a page
                 $templateSize = $pdf->getTemplateSize($tplId);
 
                 $pdf->AddPage($templateSize['orientation'], [$templateSize['width'], $templateSize['height']]);
 
                 $pdf->useTemplate($tplId);
             }
-             
-             return $pdf->Output('S');
 
-         }
-         catch(\Exception $e) {
+            return $pdf->Output('S');
+        } catch (\Exception $e) {
             nlog($e->getMessage());
-
-         }
+        }
     }
 }
diff --git a/app/Utils/Traits/Pdf/PdfMaker.php b/app/Utils/Traits/Pdf/PdfMaker.php
index f888e66b847f..65044dd5a39e 100644
--- a/app/Utils/Traits/Pdf/PdfMaker.php
+++ b/app/Utils/Traits/Pdf/PdfMaker.php
@@ -39,12 +39,13 @@ trait PdfMaker
             $pdf->addChromiumArguments(config('ninja.snappdf_chromium_arguments'));
         }
 
-        $generated  = $pdf
+        $generated = $pdf
                         ->setHtml($html)
                         ->generate();
 
-        if($generated)
+        if ($generated) {
             return $generated;
+        }
 
         throw new InternalPDFFailure('There was an issue generating the PDF locally');
     }
diff --git a/app/Utils/Traits/QuoteEmailBuilder.php b/app/Utils/Traits/QuoteEmailBuilder.php
index 2c1437074ec7..a87946413da3 100644
--- a/app/Utils/Traits/QuoteEmailBuilder.php
+++ b/app/Utils/Traits/QuoteEmailBuilder.php
@@ -85,7 +85,7 @@ trait QuoteEmailBuilder
             //$data = Parsedown::instance()->line($data);
 
             $converter = new CommonMarkConverter([
-                 'html_input' => 'allow',
+                'html_input' => 'allow',
                 'allow_unsafe_links' => true,
             ]);
 
diff --git a/app/Utils/Traits/Recurring/HasRecurrence.php b/app/Utils/Traits/Recurring/HasRecurrence.php
index 8c6376a706ac..faad8ae26005 100644
--- a/app/Utils/Traits/Recurring/HasRecurrence.php
+++ b/app/Utils/Traits/Recurring/HasRecurrence.php
@@ -15,7 +15,6 @@ use Illuminate\Support\Carbon;
 
 trait HasRecurrence
 {
-
     /**
      * Calculates the first day of the month, this will ALWAYS
      * be the first of NEXT month
@@ -49,12 +48,12 @@ trait HasRecurrence
      * Sets the day of the month, if in the past we ADD a month
      *
      * @param Carbon $date              The start date
-     * @param String|Int $day_of_month  The day of the month
+     * @param string|int $day_of_month  The day of the month
      */
     public function setDayOfMonth($date, $day_of_month)
     {
         $carbon_date = Carbon::parse($date);
-        
+
         $set_date = $carbon_date->copy()->setUnitNoOverflow('day', $day_of_month, 'month');
 
         //If the set date is less than the original date we need to add a month.
@@ -67,7 +66,6 @@ trait HasRecurrence
             $set_date->endOfMonth();
         }
 
-
         return $set_date;
     }
 }
diff --git a/app/Utils/Traits/SavesDocuments.php b/app/Utils/Traits/SavesDocuments.php
index 047787d10328..47b2e006870f 100644
--- a/app/Utils/Traits/SavesDocuments.php
+++ b/app/Utils/Traits/SavesDocuments.php
@@ -19,7 +19,6 @@ trait SavesDocuments
 {
     public function saveDocuments($document_array, $entity, $is_public = true)
     {
-
         if ($entity instanceof Company) {
             $account = $entity->account;
             $company = $entity;
@@ -35,7 +34,7 @@ trait SavesDocuments
         }
 
         foreach ($document_array as $document) {
-            $document = UploadFile::dispatchNow(
+            $document = (new UploadFile(
                 $document,
                 UploadFile::DOCUMENT,
                 $user,
@@ -43,9 +42,8 @@ trait SavesDocuments
                 $entity,
                 null,
                 $is_public
-            );
+            ))->handle();
         }
-
     }
 
     public function saveDocument($document, $entity, $is_public = true)
@@ -64,7 +62,7 @@ trait SavesDocuments
             return false;
         }
 
-        $document = UploadFile::dispatchNow(
+        $document = (new UploadFile(
             $document,
             UploadFile::DOCUMENT,
             $user,
@@ -72,6 +70,6 @@ trait SavesDocuments
             $entity,
             null,
             $is_public
-        );
+        ))->handle();
     }
 }
diff --git a/app/Utils/Traits/SubscriptionHooker.php b/app/Utils/Traits/SubscriptionHooker.php
index 69ab9f3c602f..dc13aa491aaa 100644
--- a/app/Utils/Traits/SubscriptionHooker.php
+++ b/app/Utils/Traits/SubscriptionHooker.php
@@ -16,46 +16,39 @@ use GuzzleHttp\RequestOptions;
 /**
  * Class SubscriptionHooker.
  */
-trait  SubscriptionHooker
+trait SubscriptionHooker
 {
-
-	public function sendLoad($subscription, $body)
-	{
-
+    public function sendLoad($subscription, $body)
+    {
         $headers = [
             'Content-Type' => 'application/json',
             'X-Requested-With' => 'XMLHttpRequest',
         ];
 
-        if(count($subscription->webhook_configuration['post_purchase_headers']) >= 1)
-        	$headers = array_merge($headers, $subscription->webhook_configuration['post_purchase_headers']);
+        if (count($subscription->webhook_configuration['post_purchase_headers']) >= 1) {
+            $headers = array_merge($headers, $subscription->webhook_configuration['post_purchase_headers']);
+        }
 
-        $client =  new \GuzzleHttp\Client(
+        $client = new \GuzzleHttp\Client(
         [
             'headers' => $headers,
         ]);
 
-        nlog("method name must be a string");
+        nlog('method name must be a string');
         nlog($subscription->webhook_configuration['post_purchase_rest_method']);
         nlog($subscription->webhook_configuration['post_purchase_url']);
-        
-        $post_purchase_rest_method = (string)$subscription->webhook_configuration['post_purchase_rest_method'];
-        $post_purchase_url = (string)$subscription->webhook_configuration['post_purchase_url'];
+
+        $post_purchase_rest_method = (string) $subscription->webhook_configuration['post_purchase_rest_method'];
+        $post_purchase_url = (string) $subscription->webhook_configuration['post_purchase_url'];
 
         try {
-            $response = $client->{$post_purchase_rest_method}($post_purchase_url,[
-                RequestOptions::JSON => ['body' => $body], RequestOptions::ALLOW_REDIRECTS => false
+            $response = $client->{$post_purchase_rest_method}($post_purchase_url, [
+                RequestOptions::JSON => ['body' => $body], RequestOptions::ALLOW_REDIRECTS => false,
             ]);
 
-            return array_merge($body, json_decode($response->getBody(),true));
-        }
-        catch(\Exception $e)
-        {
-
+            return array_merge($body, json_decode($response->getBody(), true));
+        } catch (\Exception $e) {
             return array_merge($body, ['message' => $e->getMessage(), 'status_code' => 500]);
-
         }
-
-	}
+    }
 }
-  
\ No newline at end of file
diff --git a/app/Utils/Traits/Uploadable.php b/app/Utils/Traits/Uploadable.php
index d83af6da2825..1f29bc84280f 100644
--- a/app/Utils/Traits/Uploadable.php
+++ b/app/Utils/Traits/Uploadable.php
@@ -22,17 +22,15 @@ trait Uploadable
 {
     public function removeLogo($company)
     {
-
-        if (Storage::exists($company->settings->company_logo)) {
-            UnlinkFile::dispatchNow(config('filesystems.default'), $company->settings->company_logo);
-        }
+        //if (Storage::disk(config('filesystems.default'))->exists($company->settings->company_logo)) {
+            (new UnlinkFile(config('filesystems.default'), $company->settings->company_logo))->handle();
+        //}
     }
 
     public function uploadLogo($file, $company, $entity)
     {
         if ($file) {
-            $path = UploadAvatar::dispatchNow($file, $company->company_key);
-
+            $path = (new UploadAvatar($file, $company->company_key))->handle();
             if ($path) {
                 $settings = $entity->settings;
                 $settings->company_logo = $path;
@@ -40,7 +38,5 @@ trait Uploadable
                 $entity->save();
             }
         }
-
     }
-
 }
diff --git a/app/Utils/Traits/User/LoginCache.php b/app/Utils/Traits/User/LoginCache.php
index 907613b2d08c..58a9b4b0c2bd 100644
--- a/app/Utils/Traits/User/LoginCache.php
+++ b/app/Utils/Traits/User/LoginCache.php
@@ -17,19 +17,16 @@ use Illuminate\Support\Str;
 
 trait LoginCache
 {
-
     public function setLoginCache($user)
     {
-
         $timeout = $user->company()->default_password_timeout;
 
-        if($timeout == 0)
-            $timeout = 30*60*1000*1000;
-        else
-            $timeout = $timeout/1000;
+        if ($timeout == 0) {
+            $timeout = 30 * 60 * 1000 * 1000;
+        } else {
+            $timeout = $timeout / 1000;
+        }
 
         Cache::put($user->hashed_id.'_'.$user->account_id.'_logged_in', Str::random(64), $timeout);
-
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/Utils/Traits/WithSorting.php b/app/Utils/Traits/WithSorting.php
index 70b99633d840..38304cbd6d8e 100644
--- a/app/Utils/Traits/WithSorting.php
+++ b/app/Utils/Traits/WithSorting.php
@@ -15,6 +15,7 @@ namespace App\Utils\Traits;
 trait WithSorting
 {
     public $sort_field = 'id'; // Default sortBy. Feel free to change or pull from client/company settings.
+
     public $sort_asc = true;
 
     public function sortBy($field)
diff --git a/app/Utils/TruthSource.php b/app/Utils/TruthSource.php
index 7100e92e3469..8b2deeaf91ec 100644
--- a/app/Utils/TruthSource.php
+++ b/app/Utils/TruthSource.php
@@ -11,10 +11,8 @@
 
 namespace App\Utils;
 
-
 class TruthSource
 {
-
     public $company;
 
     public $user;
@@ -26,27 +24,31 @@ class TruthSource
     public function setCompanyUser($company_user)
     {
         $this->company_user = $company_user;
+
         return $this;
     }
 
-    public function setUser($user){
+    public function setUser($user)
+    {
         $this->user = $user;
+
         return $this;
     }
 
     public function setCompany($company)
     {
         $this->company = $company;
+
         return $this;
     }
 
     public function setCompanyToken($company_token)
     {
         $this->company_token = $company_token;
+
         return $this;
     }
 
-
     public function getCompany()
     {
         return $this->company;
@@ -66,5 +68,4 @@ class TruthSource
     {
         return $this->company_token;
     }
-
 }
diff --git a/app/Utils/VendorHtmlEngine.php b/app/Utils/VendorHtmlEngine.php
index 29df35e2817a..eb7585bbd445 100644
--- a/app/Utils/VendorHtmlEngine.php
+++ b/app/Utils/VendorHtmlEngine.php
@@ -22,14 +22,17 @@ use App\Models\RecurringInvoiceInvitation;
 use App\Services\PdfMaker\Designs\Utilities\DesignHelpers;
 use App\Utils\Ninja;
 use App\Utils\Number;
+use App\Utils\Traits\AppSetup;
 use App\Utils\Traits\MakesDates;
 use App\Utils\transformTranslations;
 use Exception;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache;
 
 class VendorHtmlEngine
 {
     use MakesDates;
+    use AppSetup;
 
     public $entity;
 
@@ -137,7 +140,7 @@ class VendorHtmlEngine
         $data['$payment_due'] = ['value' => $this->translateDate($this->entity->due_date, $this->company->date_format(), $this->company->locale()) ?: '&nbsp;', 'label' => ctrans('texts.payment_due')];
         $data['$poNumber'] = ['value' => $this->entity->po_number, 'label' => ctrans('texts.po_number')];
 
-        $data['$entity.datetime'] = ['value' => $this->formatDatetime($this->entity->created_at, $this->company->date_format(), $this->company->locale()), 'label' => ctrans('texts.date')];
+        $data['$entity.datetime'] = ['value' => $this->formatDatetime($this->entity->created_at, $this->company->date_format()), 'label' => ctrans('texts.date')];
 
         $data['$entity'] = ['value' => '', 'label' => ctrans('texts.purchase_order')];
         $data['$number'] = ['value' => $this->entity->number ?: '&nbsp;', 'label' => ctrans('texts.purchase_order_number')];
@@ -483,7 +486,27 @@ class VendorHtmlEngine
 
     private function getCountryName() :string
     {
-        $country = Country::find($this->settings->country_id);
+
+        $countries = Cache::get('countries');
+
+        if (! $countries) {
+            $this->buildCache(true);
+
+            $countries = Cache::get('countries');
+
+        }
+
+        if($countries){
+
+         
+            $country = $countries->filter(function ($item) {
+                return $item->id == $this->settings->country_id;
+            })->first();
+
+   
+        }
+        else
+            $country = Country::find($this->settings->country_id);
 
         if ($country) {
             return ctrans('texts.country_' . $country->name);
diff --git a/composer.json b/composer.json
index afdfd8039dc6..4e8727c7b3f8 100644
--- a/composer.json
+++ b/composer.json
@@ -31,46 +31,42 @@
     ],
     "type": "project",
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^8.1",
         "ext-dom": "*",
         "ext-json": "*",
         "ext-libxml": "*",
         "afosto/yaac": "^1.4",
-        "asm/php-ansible": "^3",
+        "asm/php-ansible": "^4.0",
         "authorizenet/authorizenet": "^2.0",
         "awobaz/compoships": "^2.1",
         "bacon/bacon-qr-code": "^2.0",
-        "beganovich/snappdf": "^1.7",
+        "beganovich/snappdf": "^2",
         "braintree/braintree_php": "^6.0",
         "checkout/checkout-sdk-php": "^2.5",
         "cleverit/ubl_invoice": "^1.3",
-        "coconutcraig/laravel-postmark": "^2.10",
         "doctrine/dbal": "^3.0",
         "eway/eway-rapid-php": "^1.3",
         "fakerphp/faker": "^1.14",
-        "fideloper/proxy": "^4.2",
-        "fruitcake/laravel-cors": "^2.0",
         "gocardless/gocardless-pro": "^4.12",
         "google/apiclient": "^2.7",
-        "guzzlehttp/guzzle": "^7.0.1",
+        "guzzlehttp/guzzle": "^7.2",
         "halaxa/json-machine": "^0.7.0",
         "hashids/hashids": "^4.0",
-        "hedii/laravel-gelf-logger": "^6.0",
+        "hedii/laravel-gelf-logger": "^7.0",
         "imdhemy/laravel-purchases": "^0.10.3",
         "intervention/image": "^2.5",
-        "invoiceninja/inspector": "dev-main",
+        "invoiceninja/inspector": "^1.0",
         "laracasts/presenter": "^0.2.1",
-        "laravel/framework": "^8.0",
+        "laravel/framework": "^9.17",
         "laravel/slack-notification-channel": "^2.2",
         "laravel/socialite": "^5",
-        "laravel/tinker": "^2.0",
+        "laravel/tinker": "^2.7",
         "laravel/ui": "^3.0",
         "league/csv": "^9.6",
-        "league/flysystem-aws-s3-v3": "~1.0",
-        "league/flysystem-cached-adapter": "^1.1",
+        "league/flysystem-aws-s3-v3": "^3.0",
         "league/fractal": "^0.17.0",
         "league/omnipay": "^3.1",
-        "livewire/livewire": "^2.6",
+        "livewire/livewire": "^2.10",
         "microsoft/microsoft-graph": "^1.69",
         "mollie/mollie-api-php": "^2.36",
         "nelexa/zip": "^4.0",
@@ -88,28 +84,29 @@
         "sprain/swiss-qr-bill": "^3.2",
         "square/square": "13.0.0.20210721",
         "stripe/stripe-php": "^7.50",
-        "symfony/http-client": "^5.2",
+        "symfony/http-client": "^6.0",
+        "symfony/mailgun-mailer": "^6.1",
+        "symfony/postmark-mailer": "^6.1",
         "tijsverkoyen/css-to-inline-styles": "^2.2",
-        "turbo124/beacon": "^1.0",
-        "turbo124/laravel-gmail": "^5",
+        "turbo124/beacon": "^1.2",
+        "twilio/sdk": "^6.40",
         "webpatser/laravel-countries": "dev-master#75992ad",
-        "wepay/php-sdk": "^0.3",
-        "wildbit/swiftmailer-postmark": "^3.3"
+        "wepay/php-sdk": "^0.3"
     },
     "require-dev": {
         "php": "^7.4|^8.0",
-        "anahkiasen/former": "^4.2",
-        "barryvdh/laravel-debugbar": "^3.4",
+        "barryvdh/laravel-debugbar": "^3.6",
+        "beyondcode/laravel-query-detector": "^1.6",
         "brianium/paratest": "^6.1",
         "darkaonline/l5-swagger": "8.1.0",
-        "facade/ignition": "^2.3.6",
         "fakerphp/faker": "^1.14",
         "filp/whoops": "^2.7",
-        "friendsofphp/php-cs-fixer": "^2.16",
         "laravel/dusk": "^6.15",
-        "mockery/mockery": "^1.3.1",
-        "nunomaduro/collision": "^5.0",
-        "phpunit/phpunit": "^9.0"
+        "mockery/mockery": "^1.4.4",
+        "nunomaduro/collision": "^6.1",
+        "phpunit/phpunit": "^9.5.10",
+        "spatie/laravel-ignition": "^1.0",
+        "vimeo/psalm": "^4.24"
     },
     "autoload": {
         "psr-4": {
@@ -118,7 +115,11 @@
             "Database\\Seeders\\": "database/seeders/",
             "Modules\\": "Modules/"
         },
-        "files": []
+        "files": [
+            "app/Helpers/TranslationHelper.php",
+            "app/Helpers/Generic.php",
+            "app/Helpers/ClientPortal.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {
@@ -135,7 +136,8 @@
             "if [ \"${IS_DOCKER:-false}\" != \"true\" ]; then vendor/bin/snappdf download; fi"
         ],
         "post-update-cmd": [
-            "vendor/bin/snappdf download"
+            "vendor/bin/snappdf download",
+            "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
         ],
         "post-root-package-install": [
             "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
diff --git a/composer.lock b/composer.lock
index d28c6a4ced8b..50cb886bc828 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b2410c363539f962178bbe1f238fde01",
+    "content-hash": "dd251d0b8181fc819aded8d8d5c6bb07",
     "packages": [
         {
             "name": "afosto/yaac",
@@ -174,26 +174,26 @@
         },
         {
             "name": "asm/php-ansible",
-            "version": "v3.0.1",
+            "version": "v4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/maschmann/php-ansible.git",
-                "reference": "26809472cab66fb0175ae53f7281afd6b31d1296"
+                "reference": "654592557a8cae60169de6f2ba145ef7ebb38f37"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/maschmann/php-ansible/zipball/26809472cab66fb0175ae53f7281afd6b31d1296",
-                "reference": "26809472cab66fb0175ae53f7281afd6b31d1296",
+                "url": "https://api.github.com/repos/maschmann/php-ansible/zipball/654592557a8cae60169de6f2ba145ef7ebb38f37",
+                "reference": "654592557a8cae60169de6f2ba145ef7ebb38f37",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3.0|^8.0.0",
+                "php": "^8.0.0",
                 "psr/log": "^1.1",
-                "symfony/process": "^4.0|^5.0"
+                "symfony/process": "^5.3|^6.0"
             },
             "require-dev": {
                 "mikey179/vfsstream": "^1.6",
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.5"
             },
             "type": "library",
             "autoload": {
@@ -219,65 +219,9 @@
             ],
             "support": {
                 "issues": "https://github.com/maschmann/php-ansible/issues",
-                "source": "https://github.com/maschmann/php-ansible/tree/v3.0.1"
+                "source": "https://github.com/maschmann/php-ansible/tree/v4.0.0"
             },
-            "time": "2021-06-25T20:09:17+00:00"
-        },
-        {
-            "name": "asm89/stack-cors",
-            "version": "v2.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/asm89/stack-cors.git",
-                "reference": "73e5b88775c64ccc0b84fb60836b30dc9d92ac4a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/asm89/stack-cors/zipball/73e5b88775c64ccc0b84fb60836b30dc9d92ac4a",
-                "reference": "73e5b88775c64ccc0b84fb60836b30dc9d92ac4a",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2|^8.0",
-                "symfony/http-foundation": "^4|^5|^6",
-                "symfony/http-kernel": "^4|^5|^6"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7|^9",
-                "squizlabs/php_codesniffer": "^3.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Asm89\\Stack\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Alexander",
-                    "email": "iam.asm89@gmail.com"
-                }
-            ],
-            "description": "Cross-origin resource sharing library and stack middleware",
-            "homepage": "https://github.com/asm89/stack-cors",
-            "keywords": [
-                "cors",
-                "stack"
-            ],
-            "support": {
-                "issues": "https://github.com/asm89/stack-cors/issues",
-                "source": "https://github.com/asm89/stack-cors/tree/v2.1.1"
-            },
-            "time": "2022-01-18T09:12:03+00:00"
+            "time": "2022-02-20T18:59:30+00:00"
         },
         {
             "name": "authorizenet/authorizenet",
@@ -434,16 +378,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.231.10",
+            "version": "3.232.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "e46b7c5fcb70fadf38079755982cc1d3f0583c41"
+                "reference": "390ceb3372ffb9f834694e2bd76a36a78ed7d2ee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e46b7c5fcb70fadf38079755982cc1d3f0583c41",
-                "reference": "e46b7c5fcb70fadf38079755982cc1d3f0583c41",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/390ceb3372ffb9f834694e2bd76a36a78ed7d2ee",
+                "reference": "390ceb3372ffb9f834694e2bd76a36a78ed7d2ee",
                 "shasum": ""
             },
             "require": {
@@ -520,9 +464,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.231.10"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.232.2"
             },
-            "time": "2022-07-20T18:17:18+00:00"
+            "time": "2022-08-04T18:17:49+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -580,29 +524,28 @@
         },
         {
             "name": "beganovich/snappdf",
-            "version": "v1.10.0",
+            "version": "v2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/beganovich/snappdf.git",
-                "reference": "ab7f7ddcef5a5a6f96ce055ecb0dff4963caec29"
+                "reference": "7964d03c091f3a30513fb6c44ea353c575ba523a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/beganovich/snappdf/zipball/ab7f7ddcef5a5a6f96ce055ecb0dff4963caec29",
-                "reference": "ab7f7ddcef5a5a6f96ce055ecb0dff4963caec29",
+                "url": "https://api.github.com/repos/beganovich/snappdf/zipball/7964d03c091f3a30513fb6c44ea353c575ba523a",
+                "reference": "7964d03c091f3a30513fb6c44ea353c575ba523a",
                 "shasum": ""
             },
             "require": {
-                "ext-json": "*",
                 "ext-zip": "*",
-                "php": "^7.3|^7.4|^8.0|^8.1",
-                "symfony/console": "^5.2",
-                "symfony/filesystem": "^5.2",
-                "symfony/process": "^5.2"
+                "php": "^8.0|^8.1",
+                "symfony/console": "^6.0",
+                "symfony/filesystem": "^6.0",
+                "symfony/process": "^6.0"
             },
             "require-dev": {
                 "ext-fileinfo": "*",
-                "friendsofphp/php-cs-fixer": "^2.17",
+                "friendsofphp/php-cs-fixer": "^3.6",
                 "phpunit/phpunit": "^9.5"
             },
             "bin": [
@@ -627,22 +570,22 @@
             "description": "Convert webpages or HTML into the PDF file using Chromium or Google Chrome.",
             "support": {
                 "issues": "https://github.com/beganovich/snappdf/issues",
-                "source": "https://github.com/beganovich/snappdf/tree/v1.10.0"
+                "source": "https://github.com/beganovich/snappdf/tree/v2.2.0"
             },
-            "time": "2022-04-19T11:27:54+00:00"
+            "time": "2022-06-29T13:08:15+00:00"
         },
         {
             "name": "braintree/braintree_php",
-            "version": "6.8.0",
+            "version": "6.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/braintree/braintree_php.git",
-                "reference": "d5d92080d67ed247b72378e4f47e8c4d0048bddd"
+                "reference": "096984f01c03e47e053703fb159721cb77793587"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/braintree/braintree_php/zipball/d5d92080d67ed247b72378e4f47e8c4d0048bddd",
-                "reference": "d5d92080d67ed247b72378e4f47e8c4d0048bddd",
+                "url": "https://api.github.com/repos/braintree/braintree_php/zipball/096984f01c03e47e053703fb159721cb77793587",
+                "reference": "096984f01c03e47e053703fb159721cb77793587",
                 "shasum": ""
             },
             "require": {
@@ -676,32 +619,32 @@
             "description": "Braintree PHP Client Library",
             "support": {
                 "issues": "https://github.com/braintree/braintree_php/issues",
-                "source": "https://github.com/braintree/braintree_php/tree/6.8.0"
+                "source": "https://github.com/braintree/braintree_php/tree/6.9.0"
             },
-            "time": "2022-04-01T18:37:18+00:00"
+            "time": "2022-07-25T14:01:57+00:00"
         },
         {
             "name": "brick/math",
-            "version": "0.9.3",
+            "version": "0.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/brick/math.git",
-                "reference": "ca57d18f028f84f777b2168cd1911b0dee2343ae"
+                "reference": "de846578401f4e58f911b3afeb62ced56365ed87"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/ca57d18f028f84f777b2168cd1911b0dee2343ae",
-                "reference": "ca57d18f028f84f777b2168cd1911b0dee2343ae",
+                "url": "https://api.github.com/repos/brick/math/zipball/de846578401f4e58f911b3afeb62ced56365ed87",
+                "reference": "de846578401f4e58f911b3afeb62ced56365ed87",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "php": "^7.1 || ^8.0"
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.2",
-                "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.0",
-                "vimeo/psalm": "4.9.2"
+                "phpunit/phpunit": "^9.0",
+                "vimeo/psalm": "4.25.0"
             },
             "type": "library",
             "autoload": {
@@ -726,32 +669,28 @@
             ],
             "support": {
                 "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.9.3"
+                "source": "https://github.com/brick/math/tree/0.10.1"
             },
             "funding": [
                 {
                     "url": "https://github.com/BenMorel",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/brick/math",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2021-08-15T20:50:18+00:00"
+            "time": "2022-08-01T22:54:31+00:00"
         },
         {
             "name": "checkout/checkout-sdk-php",
-            "version": "2.5.2",
+            "version": "2.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/checkout/checkout-sdk-php.git",
-                "reference": "ab1e493ac9aa9c0350f58f069f6157b2a02a7e27"
+                "reference": "5210b664536db8637f09c1e63484c0a47769b8b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/checkout/checkout-sdk-php/zipball/ab1e493ac9aa9c0350f58f069f6157b2a02a7e27",
-                "reference": "ab1e493ac9aa9c0350f58f069f6157b2a02a7e27",
+                "url": "https://api.github.com/repos/checkout/checkout-sdk-php/zipball/5210b664536db8637f09c1e63484c0a47769b8b5",
+                "reference": "5210b664536db8637f09c1e63484c0a47769b8b5",
                 "shasum": ""
             },
             "require": {
@@ -804,9 +743,9 @@
             ],
             "support": {
                 "issues": "https://github.com/checkout/checkout-sdk-php/issues",
-                "source": "https://github.com/checkout/checkout-sdk-php/tree/2.5.2"
+                "source": "https://github.com/checkout/checkout-sdk-php/tree/2.5.4"
             },
-            "time": "2022-06-30T14:46:15+00:00"
+            "time": "2022-08-04T22:24:42+00:00"
         },
         {
             "name": "cleverit/ubl_invoice",
@@ -933,84 +872,6 @@
             ],
             "time": "2022-02-21T13:15:14+00:00"
         },
-        {
-            "name": "coconutcraig/laravel-postmark",
-            "version": "v2.11.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/craigpaul/laravel-postmark.git",
-                "reference": "2feeeb9f050600f301d7c451716f1029001e8ceb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/craigpaul/laravel-postmark/zipball/2feeeb9f050600f301d7c451716f1029001e8ceb",
-                "reference": "2feeeb9f050600f301d7c451716f1029001e8ceb",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "guzzlehttp/guzzle": "^6.3 || ^7.0",
-                "illuminate/mail": "^5.5 || ^6.0 || ^7.0 || ^8.0",
-                "illuminate/support": "^5.5 || ^6.0 || ^7.0 || ^8.0",
-                "php": "^7.1.3 || ^8.0"
-            },
-            "require-dev": {
-                "orchestra/testbench": "^3.5 || ^4.0 || ^5.0 || ^6.0",
-                "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0 || ^9.0"
-            },
-            "suggest": {
-                "mvdnbrk/postmark-inbound": "Allows you to process Postmark Inbound Webhooks."
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                },
-                "laravel": {
-                    "providers": [
-                        "Coconuts\\Mail\\PostmarkServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Coconuts\\Mail\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Craig Paul",
-                    "email": "craig.paul@coconutcalendar.com",
-                    "homepage": "https://coconutcalendar.com",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Laravel package for sending mail via the Postmark API",
-            "homepage": "https://github.com/craigpaul/laravel-postmark",
-            "keywords": [
-                "coconutcraig",
-                "email",
-                "laravel",
-                "mail",
-                "postmark",
-                "wildbit"
-            ],
-            "support": {
-                "issues": "https://github.com/craigpaul/laravel-postmark/issues",
-                "source": "https://github.com/craigpaul/laravel-postmark/tree/v2.11.2"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/mvdnbrk",
-                    "type": "github"
-                }
-            ],
-            "time": "2022-01-31T12:47:41+00:00"
-        },
         {
             "name": "composer/ca-bundle",
             "version": "1.3.3",
@@ -1458,34 +1319,31 @@
         },
         {
             "name": "doctrine/event-manager",
-            "version": "1.1.1",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/event-manager.git",
-                "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f"
+                "reference": "eb2ecf80e3093e8f3c2769ac838e27d8ede8e683"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f",
-                "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f",
+                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/eb2ecf80e3093e8f3c2769ac838e27d8ede8e683",
+                "reference": "eb2ecf80e3093e8f3c2769ac838e27d8ede8e683",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "conflict": {
-                "doctrine/common": "<2.9@dev"
+                "doctrine/common": "<2.9"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^6.0",
-                "phpunit/phpunit": "^7.0"
+                "doctrine/coding-standard": "^9",
+                "phpstan/phpstan": "~1.4.10 || ^1.5.4",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.22"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Doctrine\\Common\\": "lib/Doctrine/Common"
@@ -1532,7 +1390,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/event-manager/issues",
-                "source": "https://github.com/doctrine/event-manager/tree/1.1.x"
+                "source": "https://github.com/doctrine/event-manager/tree/1.1.2"
             },
             "funding": [
                 {
@@ -1548,7 +1406,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-29T18:28:51+00:00"
+            "time": "2022-07-27T22:18:11+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -1780,27 +1638,27 @@
         },
         {
             "name": "egulias/email-validator",
-            "version": "2.1.25",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4"
+                "reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4",
-                "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/f88dcf4b14af14a98ad96b14b2b317969eab6715",
+                "reference": "f88dcf4b14af14a98ad96b14b2b317969eab6715",
                 "shasum": ""
             },
             "require": {
-                "doctrine/lexer": "^1.0.1",
-                "php": ">=5.5",
-                "symfony/polyfill-intl-idn": "^1.10"
+                "doctrine/lexer": "^1.2",
+                "php": ">=7.2",
+                "symfony/polyfill-intl-idn": "^1.15"
             },
             "require-dev": {
-                "dominicsayers/isemail": "^3.0.7",
-                "phpunit/phpunit": "^4.8.36|^7.5.15",
-                "satooshi/php-coveralls": "^1.0.1"
+                "php-coveralls/php-coveralls": "^2.2",
+                "phpunit/phpunit": "^8.5.8|^9.3.3",
+                "vimeo/psalm": "^4"
             },
             "suggest": {
                 "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
@@ -1808,7 +1666,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1.x-dev"
+                    "dev-master": "3.0.x-dev"
                 }
             },
             "autoload": {
@@ -1836,7 +1694,7 @@
             ],
             "support": {
                 "issues": "https://github.com/egulias/EmailValidator/issues",
-                "source": "https://github.com/egulias/EmailValidator/tree/2.1.25"
+                "source": "https://github.com/egulias/EmailValidator/tree/3.2.1"
             },
             "funding": [
                 {
@@ -1844,7 +1702,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-12-29T14:50:06+00:00"
+            "time": "2022-06-18T20:57:19+00:00"
         },
         {
             "name": "endroid/qr-code",
@@ -1923,16 +1781,16 @@
         },
         {
             "name": "eway/eway-rapid-php",
-            "version": "1.4.0",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/eWAYPayment/eway-rapid-php.git",
-                "reference": "5581c8279774aabe58ea3aca9bfd7f62759ce7cd"
+                "reference": "3ccc17406101db7e6670b2e76b088124c6955c14"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/eWAYPayment/eway-rapid-php/zipball/5581c8279774aabe58ea3aca9bfd7f62759ce7cd",
-                "reference": "5581c8279774aabe58ea3aca9bfd7f62759ce7cd",
+                "url": "https://api.github.com/repos/eWAYPayment/eway-rapid-php/zipball/3ccc17406101db7e6670b2e76b088124c6955c14",
+                "reference": "3ccc17406101db7e6670b2e76b088124c6955c14",
                 "shasum": ""
             },
             "require": {
@@ -1973,9 +1831,9 @@
             ],
             "support": {
                 "issues": "https://github.com/eWAYPayment/eway-rapid-php/issues",
-                "source": "https://github.com/eWAYPayment/eway-rapid-php/tree/v1.4.0"
+                "source": "https://github.com/eWAYPayment/eway-rapid-php/tree/v1.4.1"
             },
-            "time": "2021-12-08T00:21:16+00:00"
+            "time": "2022-08-04T05:24:33+00:00"
         },
         {
             "name": "fakerphp/faker",
@@ -2044,64 +1902,6 @@
             },
             "time": "2022-07-20T13:12:54+00:00"
         },
-        {
-            "name": "fideloper/proxy",
-            "version": "4.4.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/fideloper/TrustedProxy.git",
-                "reference": "a751f2bc86dd8e6cfef12dc0cbdada82f5a18750"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/a751f2bc86dd8e6cfef12dc0cbdada82f5a18750",
-                "reference": "a751f2bc86dd8e6cfef12dc0cbdada82f5a18750",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/contracts": "^5.0|^6.0|^7.0|^8.0|^9.0",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "illuminate/http": "^5.0|^6.0|^7.0|^8.0|^9.0",
-                "mockery/mockery": "^1.0",
-                "phpunit/phpunit": "^8.5.8|^9.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "Fideloper\\Proxy\\TrustedProxyServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Fideloper\\Proxy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Chris Fidao",
-                    "email": "fideloper@gmail.com"
-                }
-            ],
-            "description": "Set trusted proxies for Laravel",
-            "keywords": [
-                "load balancing",
-                "proxy",
-                "trusted proxy"
-            ],
-            "support": {
-                "issues": "https://github.com/fideloper/TrustedProxy/issues",
-                "source": "https://github.com/fideloper/TrustedProxy/tree/4.4.2"
-            },
-            "time": "2022-02-09T13:33:34+00:00"
-        },
         {
             "name": "firebase/php-jwt",
             "version": "v6.3.0",
@@ -2165,40 +1965,32 @@
             "time": "2022-07-15T16:48:45+00:00"
         },
         {
-            "name": "fruitcake/laravel-cors",
-            "version": "v2.2.0",
+            "name": "fruitcake/php-cors",
+            "version": "v1.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/fruitcake/laravel-cors.git",
-                "reference": "783a74f5e3431d7b9805be8afb60fd0a8f743534"
+                "url": "https://github.com/fruitcake/php-cors.git",
+                "reference": "58571acbaa5f9f462c9c77e911700ac66f446d4e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fruitcake/laravel-cors/zipball/783a74f5e3431d7b9805be8afb60fd0a8f743534",
-                "reference": "783a74f5e3431d7b9805be8afb60fd0a8f743534",
+                "url": "https://api.github.com/repos/fruitcake/php-cors/zipball/58571acbaa5f9f462c9c77e911700ac66f446d4e",
+                "reference": "58571acbaa5f9f462c9c77e911700ac66f446d4e",
                 "shasum": ""
             },
             "require": {
-                "asm89/stack-cors": "^2.0.1",
-                "illuminate/contracts": "^6|^7|^8|^9",
-                "illuminate/support": "^6|^7|^8|^9",
-                "php": ">=7.2"
+                "php": "^7.4|^8.0",
+                "symfony/http-foundation": "^4.4|^5.4|^6"
             },
             "require-dev": {
-                "laravel/framework": "^6|^7.24|^8",
-                "orchestra/testbench-dusk": "^4|^5|^6|^7",
-                "phpunit/phpunit": "^6|^7|^8|^9",
+                "phpstan/phpstan": "^1.4",
+                "phpunit/phpunit": "^9",
                 "squizlabs/php_codesniffer": "^3.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
-                },
-                "laravel": {
-                    "providers": [
-                        "Fruitcake\\Cors\\CorsServiceProvider"
-                    ]
+                    "dev-main": "1.1-dev"
                 }
             },
             "autoload": {
@@ -2216,20 +2008,20 @@
                     "homepage": "https://fruitcake.nl"
                 },
                 {
-                    "name": "Barry vd. Heuvel",
+                    "name": "Barryvdh",
                     "email": "barryvdh@gmail.com"
                 }
             ],
-            "description": "Adds CORS (Cross-Origin Resource Sharing) headers support in your Laravel application",
+            "description": "Cross-origin resource sharing library for the Symfony HttpFoundation",
+            "homepage": "https://github.com/fruitcake/php-cors",
             "keywords": [
-                "api",
                 "cors",
-                "crossdomain",
-                "laravel"
+                "laravel",
+                "symfony"
             ],
             "support": {
-                "issues": "https://github.com/fruitcake/laravel-cors/issues",
-                "source": "https://github.com/fruitcake/laravel-cors/tree/v2.2.0"
+                "issues": "https://github.com/fruitcake/php-cors/issues",
+                "source": "https://github.com/fruitcake/php-cors/tree/v1.2.0"
             },
             "funding": [
                 {
@@ -2241,20 +2033,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-23T14:25:13+00:00"
+            "time": "2022-02-20T15:07:15+00:00"
         },
         {
             "name": "gocardless/gocardless-pro",
-            "version": "4.19.0",
+            "version": "4.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/gocardless/gocardless-pro-php.git",
-                "reference": "ed88cd22b6a790ee37758afa8bf7c9d43caa796c"
+                "reference": "3df49bbc748900fba6cb3de428c21e488b058940"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/gocardless/gocardless-pro-php/zipball/ed88cd22b6a790ee37758afa8bf7c9d43caa796c",
-                "reference": "ed88cd22b6a790ee37758afa8bf7c9d43caa796c",
+                "url": "https://api.github.com/repos/gocardless/gocardless-pro-php/zipball/3df49bbc748900fba6cb3de428c21e488b058940",
+                "reference": "3df49bbc748900fba6cb3de428c21e488b058940",
                 "shasum": ""
             },
             "require": {
@@ -2294,9 +2086,9 @@
             ],
             "support": {
                 "issues": "https://github.com/gocardless/gocardless-pro-php/issues",
-                "source": "https://github.com/gocardless/gocardless-pro-php/tree/v4.19.0"
+                "source": "https://github.com/gocardless/gocardless-pro-php/tree/v4.20.0"
             },
-            "time": "2022-07-13T14:44:43+00:00"
+            "time": "2022-07-25T09:57:58+00:00"
         },
         {
             "name": "google/apiclient",
@@ -2370,16 +2162,16 @@
         },
         {
             "name": "google/apiclient-services",
-            "version": "v0.258.0",
+            "version": "v0.260.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/googleapis/google-api-php-client-services.git",
-                "reference": "71eb32534aba05e373fe317c1373a9645065881c"
+                "reference": "8c519ddfd2458fda02dc10d10b142973e578516a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/71eb32534aba05e373fe317c1373a9645065881c",
-                "reference": "71eb32534aba05e373fe317c1373a9645065881c",
+                "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/8c519ddfd2458fda02dc10d10b142973e578516a",
+                "reference": "8c519ddfd2458fda02dc10d10b142973e578516a",
                 "shasum": ""
             },
             "require": {
@@ -2408,9 +2200,9 @@
             ],
             "support": {
                 "issues": "https://github.com/googleapis/google-api-php-client-services/issues",
-                "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.258.0"
+                "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.260.0"
             },
-            "time": "2022-07-18T01:10:11+00:00"
+            "time": "2022-07-31T00:58:12+00:00"
         },
         {
             "name": "google/auth",
@@ -2472,24 +2264,24 @@
         },
         {
             "name": "graham-campbell/result-type",
-            "version": "v1.0.4",
+            "version": "v1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrahamCampbell/Result-Type.git",
-                "reference": "0690bde05318336c7221785f2a932467f98b64ca"
+                "reference": "a878d45c1914464426dc94da61c9e1d36ae262a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca",
-                "reference": "0690bde05318336c7221785f2a932467f98b64ca",
+                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/a878d45c1914464426dc94da61c9e1d36ae262a8",
+                "reference": "a878d45c1914464426dc94da61c9e1d36ae262a8",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0 || ^8.0",
-                "phpoption/phpoption": "^1.8"
+                "php": "^7.2.5 || ^8.0",
+                "phpoption/phpoption": "^1.9"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8"
+                "phpunit/phpunit": "^8.5.28 || ^9.5.21"
             },
             "type": "library",
             "autoload": {
@@ -2518,7 +2310,7 @@
             ],
             "support": {
                 "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
-                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.0.4"
+                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.0"
             },
             "funding": [
                 {
@@ -2530,7 +2322,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-21T21:41:47+00:00"
+            "time": "2022-07-30T15:56:11+00:00"
         },
         {
             "name": "graylog2/gelf-php",
@@ -3037,25 +2829,25 @@
         },
         {
             "name": "hedii/laravel-gelf-logger",
-            "version": "6.2.0",
+            "version": "7.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hedii/laravel-gelf-logger.git",
-                "reference": "d4d4f44ce1155ff78ea90af0bc3f6f258785c90b"
+                "reference": "0554b5980d4d1d17606375af9fb76e9eaa31f10d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hedii/laravel-gelf-logger/zipball/d4d4f44ce1155ff78ea90af0bc3f6f258785c90b",
-                "reference": "d4d4f44ce1155ff78ea90af0bc3f6f258785c90b",
+                "url": "https://api.github.com/repos/hedii/laravel-gelf-logger/zipball/0554b5980d4d1d17606375af9fb76e9eaa31f10d",
+                "reference": "0554b5980d4d1d17606375af9fb76e9eaa31f10d",
                 "shasum": ""
             },
             "require": {
-                "graylog2/gelf-php": "^1.6",
-                "illuminate/log": "^8.12",
-                "php": "^7.3|^8.0"
+                "graylog2/gelf-php": "^1.7",
+                "illuminate/log": "^9.0",
+                "php": "^8.0"
             },
             "require-dev": {
-                "orchestra/testbench": "^6.0"
+                "orchestra/testbench": "^7.0"
             },
             "type": "library",
             "autoload": {
@@ -3090,7 +2882,7 @@
                 "issues": "https://github.com/hedii/laravel-gelf-logger/issues",
                 "source": "https://github.com/hedii/laravel-gelf-logger"
             },
-            "time": "2022-01-16T10:51:20+00:00"
+            "time": "2022-03-16T16:40:58+00:00"
         },
         {
             "name": "http-interop/http-factory-guzzle",
@@ -3404,7 +3196,7 @@
         },
         {
             "name": "invoiceninja/inspector",
-            "version": "dev-main",
+            "version": "v1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/invoiceninja/inspector.git",
@@ -3425,7 +3217,6 @@
                 "orchestra/testbench": "^6.0",
                 "phpunit/phpunit": "^9.0"
             },
-            "default-branch": true,
             "type": "library",
             "extra": {
                 "laravel": {
@@ -3526,23 +3317,25 @@
         },
         {
             "name": "khanamiryan/qrcode-detector-decoder",
-            "version": "1.0.5.2",
+            "version": "1.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/khanamiryan/php-qrcode-detector-decoder.git",
-                "reference": "04fdd58d86a387065f707dc6d3cc304c719910c1"
+                "reference": "45326fb83a2a375065dbb3a134b5b8a5872da569"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/khanamiryan/php-qrcode-detector-decoder/zipball/04fdd58d86a387065f707dc6d3cc304c719910c1",
-                "reference": "04fdd58d86a387065f707dc6d3cc304c719910c1",
+                "url": "https://api.github.com/repos/khanamiryan/php-qrcode-detector-decoder/zipball/45326fb83a2a375065dbb3a134b5b8a5872da569",
+                "reference": "45326fb83a2a375065dbb3a134b5b8a5872da569",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.6"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7 | ^7.5 | ^8.0 | ^9.0"
+                "phpunit/phpunit": "^5.7 | ^7.5 | ^8.0 | ^9.0",
+                "rector/rector": "^0.13.6",
+                "symplify/easy-coding-standard": "^11.0"
             },
             "type": "library",
             "autoload": {
@@ -3575,9 +3368,9 @@
             ],
             "support": {
                 "issues": "https://github.com/khanamiryan/php-qrcode-detector-decoder/issues",
-                "source": "https://github.com/khanamiryan/php-qrcode-detector-decoder/tree/1.0.5.2"
+                "source": "https://github.com/khanamiryan/php-qrcode-detector-decoder/tree/1.0.6"
             },
-            "time": "2021-07-13T18:46:38+00:00"
+            "time": "2022-06-29T09:25:13+00:00"
         },
         {
             "name": "kmukku/php-iso11649",
@@ -3680,56 +3473,56 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v8.83.20",
+            "version": "v9.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "aa5908e83fccb18b135ca31aa0342cf4bd6909a8"
+                "reference": "c4eea9060d847b5c93957b203caa8f57544a76ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/aa5908e83fccb18b135ca31aa0342cf4bd6909a8",
-                "reference": "aa5908e83fccb18b135ca31aa0342cf4bd6909a8",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/c4eea9060d847b5c93957b203caa8f57544a76ab",
+                "reference": "c4eea9060d847b5c93957b203caa8f57544a76ab",
                 "shasum": ""
             },
             "require": {
-                "doctrine/inflector": "^1.4|^2.0",
-                "dragonmantank/cron-expression": "^3.0.2",
-                "egulias/email-validator": "^2.1.10",
-                "ext-json": "*",
+                "doctrine/inflector": "^2.0",
+                "dragonmantank/cron-expression": "^3.1",
+                "egulias/email-validator": "^3.1",
                 "ext-mbstring": "*",
                 "ext-openssl": "*",
+                "fruitcake/php-cors": "^1.2",
                 "laravel/serializable-closure": "^1.0",
-                "league/commonmark": "^1.3|^2.0.2",
-                "league/flysystem": "^1.1",
+                "league/commonmark": "^2.2",
+                "league/flysystem": "^3.0.16",
                 "monolog/monolog": "^2.0",
                 "nesbot/carbon": "^2.53.1",
-                "opis/closure": "^3.6",
-                "php": "^7.3|^8.0",
-                "psr/container": "^1.0",
-                "psr/log": "^1.0|^2.0",
-                "psr/simple-cache": "^1.0",
+                "nunomaduro/termwind": "^1.13",
+                "php": "^8.0.2",
+                "psr/container": "^1.1.1|^2.0.1",
+                "psr/log": "^1.0|^2.0|^3.0",
+                "psr/simple-cache": "^1.0|^2.0|^3.0",
                 "ramsey/uuid": "^4.2.2",
-                "swiftmailer/swiftmailer": "^6.3",
-                "symfony/console": "^5.4",
-                "symfony/error-handler": "^5.4",
-                "symfony/finder": "^5.4",
-                "symfony/http-foundation": "^5.4",
-                "symfony/http-kernel": "^5.4",
-                "symfony/mime": "^5.4",
-                "symfony/process": "^5.4",
-                "symfony/routing": "^5.4",
-                "symfony/var-dumper": "^5.4",
+                "symfony/console": "^6.0.3",
+                "symfony/error-handler": "^6.0",
+                "symfony/finder": "^6.0",
+                "symfony/http-foundation": "^6.0",
+                "symfony/http-kernel": "^6.0",
+                "symfony/mailer": "^6.0",
+                "symfony/mime": "^6.0",
+                "symfony/process": "^6.0",
+                "symfony/routing": "^6.0",
+                "symfony/var-dumper": "^6.0",
                 "tijsverkoyen/css-to-inline-styles": "^2.2.2",
                 "vlucas/phpdotenv": "^5.4.1",
-                "voku/portable-ascii": "^1.6.1"
+                "voku/portable-ascii": "^2.0"
             },
             "conflict": {
                 "tightenco/collect": "<5.5.33"
             },
             "provide": {
-                "psr/container-implementation": "1.0",
-                "psr/simple-cache-implementation": "1.0"
+                "psr/container-implementation": "1.1|2.0",
+                "psr/simple-cache-implementation": "1.0|2.0|3.0"
             },
             "replace": {
                 "illuminate/auth": "self.version",
@@ -3737,6 +3530,7 @@
                 "illuminate/bus": "self.version",
                 "illuminate/cache": "self.version",
                 "illuminate/collections": "self.version",
+                "illuminate/conditionable": "self.version",
                 "illuminate/config": "self.version",
                 "illuminate/console": "self.version",
                 "illuminate/container": "self.version",
@@ -3767,19 +3561,22 @@
             "require-dev": {
                 "aws/aws-sdk-php": "^3.198.1",
                 "doctrine/dbal": "^2.13.3|^3.1.4",
-                "filp/whoops": "^2.14.3",
-                "guzzlehttp/guzzle": "^6.5.5|^7.0.1",
-                "league/flysystem-cached-adapter": "^1.0",
+                "fakerphp/faker": "^1.9.2",
+                "guzzlehttp/guzzle": "^7.2",
+                "league/flysystem-aws-s3-v3": "^3.0",
+                "league/flysystem-ftp": "^3.0",
+                "league/flysystem-sftp-v3": "^3.0",
                 "mockery/mockery": "^1.4.4",
-                "orchestra/testbench-core": "^6.27",
+                "orchestra/testbench-core": "^7.1",
                 "pda/pheanstalk": "^4.0",
-                "phpunit/phpunit": "^8.5.19|^9.5.8",
-                "predis/predis": "^1.1.9",
-                "symfony/cache": "^5.4"
+                "phpstan/phpstan": "^1.4.7",
+                "phpunit/phpunit": "^9.5.8",
+                "predis/predis": "^1.1.9|^2.0",
+                "symfony/cache": "^6.0"
             },
             "suggest": {
                 "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
-                "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.198.1).",
+                "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.198.1).",
                 "brianium/paratest": "Required to run tests in parallel (^6.0).",
                 "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.13.3|^3.1.4).",
                 "ext-bcmath": "Required to use the multiple_of validation rule.",
@@ -3791,27 +3588,29 @@
                 "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).",
                 "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
                 "filp/whoops": "Required for friendly error pages in development (^2.14.3).",
-                "guzzlehttp/guzzle": "Required to use the HTTP Client, Mailgun mail driver and the ping methods on schedules (^6.5.5|^7.0.1).",
+                "guzzlehttp/guzzle": "Required to use the HTTP Client and the ping methods on schedules (^7.2).",
                 "laravel/tinker": "Required to use the tinker console command (^2.0).",
-                "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
-                "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
-                "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
+                "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).",
+                "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).",
+                "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).",
                 "mockery/mockery": "Required to use mocking (^1.4.4).",
                 "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
                 "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
-                "phpunit/phpunit": "Required to use assertions and run tests (^8.5.19|^9.5.8).",
-                "predis/predis": "Required to use the predis connector (^1.1.9).",
+                "phpunit/phpunit": "Required to use assertions and run tests (^9.5.8).",
+                "predis/predis": "Required to use the predis connector (^1.1.9|^2.0).",
                 "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
-                "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0|^5.0|^6.0|^7.0).",
-                "symfony/cache": "Required to PSR-6 cache bridge (^5.4).",
-                "symfony/filesystem": "Required to enable support for relative symbolic links (^5.4).",
-                "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0).",
-                "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)."
+                "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
+                "symfony/cache": "Required to PSR-6 cache bridge (^6.0).",
+                "symfony/filesystem": "Required to enable support for relative symbolic links (^6.0).",
+                "symfony/http-client": "Required to enable support for the Symfony API mail transports (^6.0).",
+                "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^6.0).",
+                "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^6.0).",
+                "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0)."
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "8.x-dev"
+                    "dev-master": "9.x-dev"
                 }
             },
             "autoload": {
@@ -3825,7 +3624,8 @@
                     "Illuminate\\": "src/Illuminate/",
                     "Illuminate\\Support\\": [
                         "src/Illuminate/Macroable/",
-                        "src/Illuminate/Collections/"
+                        "src/Illuminate/Collections/",
+                        "src/Illuminate/Conditionable/"
                     ]
                 }
             },
@@ -3849,7 +3649,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2022-07-19T14:11:02+00:00"
+            "time": "2022-08-02T14:24:44+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -3973,28 +3773,28 @@
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.5.2",
+            "version": "v5.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "68afb03259b82d898c68196cbcacd48596a9dd72"
+                "reference": "9dfc76b31ee041c45a7cae86f23339784abde46d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/68afb03259b82d898c68196cbcacd48596a9dd72",
-                "reference": "68afb03259b82d898c68196cbcacd48596a9dd72",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/9dfc76b31ee041c45a7cae86f23339784abde46d",
+                "reference": "9dfc76b31ee041c45a7cae86f23339784abde46d",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "guzzlehttp/guzzle": "^6.0|^7.0",
+                "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0",
                 "illuminate/http": "^6.0|^7.0|^8.0|^9.0",
                 "illuminate/support": "^6.0|^7.0|^8.0|^9.0",
-                "league/oauth1-client": "^1.0",
+                "league/oauth1-client": "^1.10.1",
                 "php": "^7.2|^8.0"
             },
             "require-dev": {
-                "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0",
                 "mockery/mockery": "^1.0",
                 "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0",
                 "phpunit/phpunit": "^8.0|^9.3"
@@ -4038,7 +3838,7 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2022-03-10T15:26:19+00:00"
+            "time": "2022-07-18T13:51:19+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -4171,31 +3971,31 @@
         },
         {
             "name": "lcobucci/clock",
-            "version": "2.0.0",
+            "version": "2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lcobucci/clock.git",
-                "reference": "353d83fe2e6ae95745b16b3d911813df6a05bfb3"
+                "reference": "fb533e093fd61321bfcbac08b131ce805fe183d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lcobucci/clock/zipball/353d83fe2e6ae95745b16b3d911813df6a05bfb3",
-                "reference": "353d83fe2e6ae95745b16b3d911813df6a05bfb3",
+                "url": "https://api.github.com/repos/lcobucci/clock/zipball/fb533e093fd61321bfcbac08b131ce805fe183d3",
+                "reference": "fb533e093fd61321bfcbac08b131ce805fe183d3",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4 || ^8.0"
+                "php": "^8.0",
+                "stella-maris/clock": "^0.1.4"
             },
             "require-dev": {
-                "infection/infection": "^0.17",
-                "lcobucci/coding-standard": "^6.0",
-                "phpstan/extension-installer": "^1.0",
+                "infection/infection": "^0.26",
+                "lcobucci/coding-standard": "^8.0",
+                "phpstan/extension-installer": "^1.1",
                 "phpstan/phpstan": "^0.12",
                 "phpstan/phpstan-deprecation-rules": "^0.12",
                 "phpstan/phpstan-phpunit": "^0.12",
                 "phpstan/phpstan-strict-rules": "^0.12",
-                "phpunit/php-code-coverage": "9.1.4",
-                "phpunit/phpunit": "9.3.7"
+                "phpunit/phpunit": "^9.5"
             },
             "type": "library",
             "autoload": {
@@ -4216,7 +4016,7 @@
             "description": "Yet another clock abstraction",
             "support": {
                 "issues": "https://github.com/lcobucci/clock/issues",
-                "source": "https://github.com/lcobucci/clock/tree/2.0.x"
+                "source": "https://github.com/lcobucci/clock/tree/2.2.0"
             },
             "funding": [
                 {
@@ -4228,7 +4028,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2020-08-27T18:56:02+00:00"
+            "time": "2022-04-19T19:34:17+00:00"
         },
         {
             "name": "lcobucci/jwt",
@@ -4306,16 +4106,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.3.4",
+            "version": "2.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "155ec1c95626b16fda0889cf15904d24890a60d5"
+                "reference": "84d74485fdb7074f4f9dd6f02ab957b1de513257"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/155ec1c95626b16fda0889cf15904d24890a60d5",
-                "reference": "155ec1c95626b16fda0889cf15904d24890a60d5",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/84d74485fdb7074f4f9dd6f02ab957b1de513257",
+                "reference": "84d74485fdb7074f4f9dd6f02ab957b1de513257",
                 "shasum": ""
             },
             "require": {
@@ -4337,13 +4137,13 @@
                 "github/gfm": "0.29.0",
                 "michelf/php-markdown": "^1.4",
                 "nyholm/psr7": "^1.5",
-                "phpstan/phpstan": "^0.12.88 || ^1.0.0",
-                "phpunit/phpunit": "^9.5.5",
+                "phpstan/phpstan": "^1.8.2",
+                "phpunit/phpunit": "^9.5.21",
                 "scrutinizer/ocular": "^1.8.1",
-                "symfony/finder": "^5.3",
+                "symfony/finder": "^5.3 | ^6.0",
                 "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0",
-                "unleashedtech/php-coding-standard": "^3.1",
-                "vimeo/psalm": "^4.7.3"
+                "unleashedtech/php-coding-standard": "^3.1.1",
+                "vimeo/psalm": "^4.24.0"
             },
             "suggest": {
                 "symfony/yaml": "v2.3+ required if using the Front Matter extension"
@@ -4408,7 +4208,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-17T16:25:47+00:00"
+            "time": "2022-07-29T10:59:45+00:00"
         },
         {
             "name": "league/config",
@@ -4578,54 +4378,48 @@
         },
         {
             "name": "league/flysystem",
-            "version": "1.1.9",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "094defdb4a7001845300334e7c1ee2335925ef99"
+                "reference": "ed0ecc7f9b5c2f4a9872185846974a808a3b052a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/094defdb4a7001845300334e7c1ee2335925ef99",
-                "reference": "094defdb4a7001845300334e7c1ee2335925ef99",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/ed0ecc7f9b5c2f4a9872185846974a808a3b052a",
+                "reference": "ed0ecc7f9b5c2f4a9872185846974a808a3b052a",
                 "shasum": ""
             },
             "require": {
-                "ext-fileinfo": "*",
-                "league/mime-type-detection": "^1.3",
-                "php": "^7.2.5 || ^8.0"
+                "league/mime-type-detection": "^1.0.0",
+                "php": "^8.0.2"
             },
             "conflict": {
-                "league/flysystem-sftp": "<1.0.6"
+                "aws/aws-sdk-php": "3.209.31 || 3.210.0",
+                "guzzlehttp/guzzle": "<7.0",
+                "guzzlehttp/ringphp": "<1.1.1",
+                "symfony/http-client": "<5.2"
             },
             "require-dev": {
-                "phpspec/prophecy": "^1.11.1",
-                "phpunit/phpunit": "^8.5.8"
-            },
-            "suggest": {
-                "ext-ftp": "Allows you to use FTP server storage",
-                "ext-openssl": "Allows you to use FTPS server storage",
-                "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2",
-                "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3",
-                "league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
-                "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching",
-                "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem",
-                "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files",
-                "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib",
-                "league/flysystem-webdav": "Allows you to use WebDAV storage",
-                "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
-                "spatie/flysystem-dropbox": "Allows you to use Dropbox storage",
-                "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications"
+                "async-aws/s3": "^1.5",
+                "async-aws/simple-s3": "^1.0",
+                "aws/aws-sdk-php": "^3.198.1",
+                "composer/semver": "^3.0",
+                "ext-fileinfo": "*",
+                "ext-ftp": "*",
+                "ext-zip": "*",
+                "friendsofphp/php-cs-fixer": "^3.5",
+                "google/cloud-storage": "^1.23",
+                "microsoft/azure-storage-blob": "^1.1",
+                "phpseclib/phpseclib": "^2.0",
+                "phpstan/phpstan": "^0.12.26",
+                "phpunit/phpunit": "^9.5.11",
+                "sabre/dav": "^4.3.1"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "League\\Flysystem\\": "src/"
+                    "League\\Flysystem\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -4635,89 +4429,26 @@
             "authors": [
                 {
                     "name": "Frank de Jonge",
-                    "email": "info@frenky.net"
+                    "email": "info@frankdejonge.nl"
                 }
             ],
-            "description": "Filesystem abstraction: Many filesystems, one API.",
+            "description": "File storage abstraction for PHP",
             "keywords": [
-                "Cloud Files",
                 "WebDAV",
-                "abstraction",
                 "aws",
                 "cloud",
-                "copy.com",
-                "dropbox",
-                "file systems",
+                "file",
                 "files",
                 "filesystem",
                 "filesystems",
                 "ftp",
-                "rackspace",
-                "remote",
                 "s3",
                 "sftp",
                 "storage"
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/1.1.9"
-            },
-            "funding": [
-                {
-                    "url": "https://offset.earth/frankdejonge",
-                    "type": "other"
-                }
-            ],
-            "time": "2021-12-09T09:40:50+00:00"
-        },
-        {
-            "name": "league/flysystem-aws-s3-v3",
-            "version": "1.0.30",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
-                "reference": "af286f291ebab6877bac0c359c6c2cb017eb061d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/af286f291ebab6877bac0c359c6c2cb017eb061d",
-                "reference": "af286f291ebab6877bac0c359c6c2cb017eb061d",
-                "shasum": ""
-            },
-            "require": {
-                "aws/aws-sdk-php": "^3.20.0",
-                "league/flysystem": "^1.0.40",
-                "php": ">=5.5.0"
-            },
-            "require-dev": {
-                "henrikbjorn/phpspec-code-coverage": "~1.0.1",
-                "phpspec/phpspec": "^2.0.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "League\\Flysystem\\AwsS3v3\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Frank de Jonge",
-                    "email": "info@frenky.net"
-                }
-            ],
-            "description": "Flysystem adapter for the AWS S3 SDK v3.x",
-            "support": {
-                "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues",
-                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/1.0.30"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.2.0"
             },
             "funding": [
                 {
@@ -4733,40 +4464,36 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-02T13:51:38+00:00"
+            "time": "2022-07-26T07:26:36+00:00"
         },
         {
-            "name": "league/flysystem-cached-adapter",
-            "version": "1.1.0",
+            "name": "league/flysystem-aws-s3-v3",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/thephpleague/flysystem-cached-adapter.git",
-                "reference": "d1925efb2207ac4be3ad0c40b8277175f99ffaff"
+                "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
+                "reference": "257893ef7398b3c9255b26dff8b0118bb93fc5ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-cached-adapter/zipball/d1925efb2207ac4be3ad0c40b8277175f99ffaff",
-                "reference": "d1925efb2207ac4be3ad0c40b8277175f99ffaff",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/257893ef7398b3c9255b26dff8b0118bb93fc5ff",
+                "reference": "257893ef7398b3c9255b26dff8b0118bb93fc5ff",
                 "shasum": ""
             },
             "require": {
-                "league/flysystem": "~1.0",
-                "psr/cache": "^1.0.0"
+                "aws/aws-sdk-php": "^3.132.4",
+                "league/flysystem": "^3.0.0",
+                "league/mime-type-detection": "^1.0.0",
+                "php": "^8.0.2"
             },
-            "require-dev": {
-                "mockery/mockery": "~0.9",
-                "phpspec/phpspec": "^3.4",
-                "phpunit/phpunit": "^5.7",
-                "predis/predis": "~1.0",
-                "tedivm/stash": "~0.12"
-            },
-            "suggest": {
-                "ext-phpredis": "Pure C implemented extension for PHP"
+            "conflict": {
+                "guzzlehttp/guzzle": "<7.0",
+                "guzzlehttp/ringphp": "<1.1.1"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "League\\Flysystem\\Cached\\": "src/"
+                    "League\\Flysystem\\AwsS3V3\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -4775,16 +4502,39 @@
             ],
             "authors": [
                 {
-                    "name": "frankdejonge",
-                    "email": "info@frenky.net"
+                    "name": "Frank de Jonge",
+                    "email": "info@frankdejonge.nl"
                 }
             ],
-            "description": "An adapter decorator to enable meta-data caching.",
+            "description": "AWS S3 filesystem adapter for Flysystem.",
+            "keywords": [
+                "Flysystem",
+                "aws",
+                "file",
+                "files",
+                "filesystem",
+                "s3",
+                "storage"
+            ],
             "support": {
-                "issues": "https://github.com/thephpleague/flysystem-cached-adapter/issues",
-                "source": "https://github.com/thephpleague/flysystem-cached-adapter/tree/master"
+                "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues",
+                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.2.0"
             },
-            "time": "2020-07-25T15:56:04+00:00"
+            "funding": [
+                {
+                    "url": "https://offset.earth/frankdejonge",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/frankdejonge",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/league/flysystem",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-07-26T07:22:40+00:00"
         },
         {
             "name": "league/fractal",
@@ -5267,41 +5017,43 @@
         },
         {
             "name": "moneyphp/money",
-            "version": "v3.3.1",
+            "version": "v4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/moneyphp/money.git",
-                "reference": "122664c2621a95180a13c1ac81fea1d2ef20781e"
+                "reference": "efe904ab6109d87046eb624d5dff7d270fd0cca5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/moneyphp/money/zipball/122664c2621a95180a13c1ac81fea1d2ef20781e",
-                "reference": "122664c2621a95180a13c1ac81fea1d2ef20781e",
+                "url": "https://api.github.com/repos/moneyphp/money/zipball/efe904ab6109d87046eb624d5dff7d270fd0cca5",
+                "reference": "efe904ab6109d87046eb624d5dff7d270fd0cca5",
                 "shasum": ""
             },
             "require": {
+                "ext-bcmath": "*",
+                "ext-filter": "*",
                 "ext-json": "*",
-                "php": ">=5.6"
+                "php": "~8.0.0 || ~8.1.0"
             },
             "require-dev": {
-                "cache/taggable-cache": "^0.4.0",
-                "doctrine/instantiator": "^1.0.5",
-                "ext-bcmath": "*",
+                "cache/taggable-cache": "^1.1.0",
+                "doctrine/coding-standard": "^9.0",
+                "doctrine/instantiator": "^1.4.0",
                 "ext-gmp": "*",
                 "ext-intl": "*",
-                "florianv/exchanger": "^1.0",
-                "florianv/swap": "^3.0",
-                "friends-of-phpspec/phpspec-code-coverage": "^3.1.1 || ^4.3",
+                "florianv/exchanger": "^2.6.3",
+                "florianv/swap": "^4.3.0",
                 "moneyphp/iso-currencies": "^3.2.1",
-                "php-http/message": "^1.4",
-                "php-http/mock-client": "^1.0.0",
-                "phpspec/phpspec": "^3.4.3",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.18 || ^8.5",
-                "psr/cache": "^1.0",
-                "symfony/phpunit-bridge": "^4"
+                "php-http/message": "^1.11.0",
+                "php-http/mock-client": "^1.4.1",
+                "phpbench/phpbench": "^1.2.5",
+                "phpspec/phpspec": "^7.2",
+                "phpunit/phpunit": "^9.5.4",
+                "psalm/plugin-phpunit": "^0.15.1",
+                "psr/cache": "^1.0.1",
+                "vimeo/psalm": "~4.7.0 || ^4.8.2"
             },
             "suggest": {
-                "ext-bcmath": "Calculate without integer limits",
                 "ext-gmp": "Calculate without integer limits",
                 "ext-intl": "Format Money objects with intl",
                 "florianv/exchanger": "Exchange rates library for PHP",
@@ -5347,22 +5099,22 @@
             ],
             "support": {
                 "issues": "https://github.com/moneyphp/money/issues",
-                "source": "https://github.com/moneyphp/money/tree/master"
+                "source": "https://github.com/moneyphp/money/tree/v4.0.4"
             },
-            "time": "2020-03-18T17:49:59+00:00"
+            "time": "2022-05-18T19:32:15+00:00"
         },
         {
             "name": "monolog/monolog",
-            "version": "2.7.0",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524"
+                "reference": "720488632c590286b88b80e62aa3d3d551ad4a50"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5579edf28aee1190a798bfa5be8bc16c563bd524",
-                "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/720488632c590286b88b80e62aa3d3d551ad4a50",
+                "reference": "720488632c590286b88b80e62aa3d3d551ad4a50",
                 "shasum": ""
             },
             "require": {
@@ -5382,11 +5134,10 @@
                 "guzzlehttp/psr7": "^2.2",
                 "mongodb/mongodb": "^1.8",
                 "php-amqplib/php-amqplib": "~2.4 || ^3",
-                "php-console/php-console": "^3.1.3",
                 "phpspec/prophecy": "^1.15",
                 "phpstan/phpstan": "^0.12.91",
                 "phpunit/phpunit": "^8.5.14",
-                "predis/predis": "^1.1",
+                "predis/predis": "^1.1 || ^2.0",
                 "rollbar/rollbar": "^1.3 || ^2 || ^3",
                 "ruflin/elastica": "^7",
                 "swiftmailer/swiftmailer": "^5.3|^6.0",
@@ -5406,7 +5157,6 @@
                 "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
                 "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)",
                 "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
-                "php-console/php-console": "Allow sending log messages to Google Chrome",
                 "rollbar/rollbar": "Allow sending log messages to Rollbar",
                 "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
             },
@@ -5441,7 +5191,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/2.7.0"
+                "source": "https://github.com/Seldaek/monolog/tree/2.8.0"
             },
             "funding": [
                 {
@@ -5453,7 +5203,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-09T08:59:12+00:00"
+            "time": "2022-07-24T11:55:47+00:00"
         },
         {
             "name": "mtdowling/jmespath.php",
@@ -5518,16 +5268,16 @@
         },
         {
             "name": "myclabs/php-enum",
-            "version": "1.8.3",
+            "version": "1.8.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/php-enum.git",
-                "reference": "b942d263c641ddb5190929ff840c68f78713e937"
+                "reference": "a867478eae49c9f59ece437ae7f9506bfaa27483"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/php-enum/zipball/b942d263c641ddb5190929ff840c68f78713e937",
-                "reference": "b942d263c641ddb5190929ff840c68f78713e937",
+                "url": "https://api.github.com/repos/myclabs/php-enum/zipball/a867478eae49c9f59ece437ae7f9506bfaa27483",
+                "reference": "a867478eae49c9f59ece437ae7f9506bfaa27483",
                 "shasum": ""
             },
             "require": {
@@ -5543,7 +5293,10 @@
             "autoload": {
                 "psr-4": {
                     "MyCLabs\\Enum\\": "src/"
-                }
+                },
+                "classmap": [
+                    "stubs/Stringable.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -5562,7 +5315,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/php-enum/issues",
-                "source": "https://github.com/myclabs/php-enum/tree/1.8.3"
+                "source": "https://github.com/myclabs/php-enum/tree/1.8.4"
             },
             "funding": [
                 {
@@ -5574,7 +5327,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-05T08:18:36+00:00"
+            "time": "2022-08-04T09:53:51+00:00"
         },
         {
             "name": "nelexa/zip",
@@ -5651,16 +5404,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.59.1",
+            "version": "2.60.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "a9000603ea337c8df16cc41f8b6be95a65f4d0f5"
+                "reference": "00a259ae02b003c563158b54fb6743252b638ea6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/a9000603ea337c8df16cc41f8b6be95a65f4d0f5",
-                "reference": "a9000603ea337c8df16cc41f8b6be95a65f4d0f5",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/00a259ae02b003c563158b54fb6743252b638ea6",
+                "reference": "00a259ae02b003c563158b54fb6743252b638ea6",
                 "shasum": ""
             },
             "require": {
@@ -5749,7 +5502,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-29T21:43:55+00:00"
+            "time": "2022-07-27T15:57:48+00:00"
         },
         {
             "name": "nette/schema",
@@ -5954,6 +5707,92 @@
             },
             "time": "2022-05-31T20:59:12+00:00"
         },
+        {
+            "name": "nunomaduro/termwind",
+            "version": "v1.14.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nunomaduro/termwind.git",
+                "reference": "10065367baccf13b6e30f5e9246fa4f63a79eb1d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/10065367baccf13b6e30f5e9246fa4f63a79eb1d",
+                "reference": "10065367baccf13b6e30f5e9246fa4f63a79eb1d",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": "^8.0",
+                "symfony/console": "^5.3.0|^6.0.0"
+            },
+            "require-dev": {
+                "ergebnis/phpstan-rules": "^1.0.",
+                "illuminate/console": "^8.0|^9.0",
+                "illuminate/support": "^8.0|^9.0",
+                "laravel/pint": "^1.0.0",
+                "pestphp/pest": "^1.21.0",
+                "pestphp/pest-plugin-mock": "^1.0",
+                "phpstan/phpstan": "^1.4.6",
+                "phpstan/phpstan-strict-rules": "^1.1.0",
+                "symfony/var-dumper": "^5.2.7|^6.0.0",
+                "thecodingmachine/phpstan-strict-rules": "^1.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Termwind\\Laravel\\TermwindServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/Functions.php"
+                ],
+                "psr-4": {
+                    "Termwind\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nuno Maduro",
+                    "email": "enunomaduro@gmail.com"
+                }
+            ],
+            "description": "Its like Tailwind CSS, but for the console.",
+            "keywords": [
+                "cli",
+                "console",
+                "css",
+                "package",
+                "php",
+                "style"
+            ],
+            "support": {
+                "issues": "https://github.com/nunomaduro/termwind/issues",
+                "source": "https://github.com/nunomaduro/termwind/tree/v1.14.0"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.com/paypalme/enunomaduro",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/nunomaduro",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/xiCO2k",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-08-01T11:03:24+00:00"
+        },
         {
             "name": "nwidart/laravel-modules",
             "version": "v8.3.0",
@@ -6268,71 +6107,6 @@
             },
             "time": "2018-05-15T10:35:58+00:00"
         },
-        {
-            "name": "opis/closure",
-            "version": "3.6.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/opis/closure.git",
-                "reference": "3d81e4309d2a927abbe66df935f4bb60082805ad"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/opis/closure/zipball/3d81e4309d2a927abbe66df935f4bb60082805ad",
-                "reference": "3d81e4309d2a927abbe66df935f4bb60082805ad",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.4 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "jeremeamia/superclosure": "^2.0",
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.6.x-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "functions.php"
-                ],
-                "psr-4": {
-                    "Opis\\Closure\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marius Sarca",
-                    "email": "marius.sarca@gmail.com"
-                },
-                {
-                    "name": "Sorin Sarca",
-                    "email": "sarca_sorin@hotmail.com"
-                }
-            ],
-            "description": "A library that can be used to serialize closures (anonymous functions) and arbitrary objects.",
-            "homepage": "https://opis.io/closure",
-            "keywords": [
-                "anonymous functions",
-                "closure",
-                "function",
-                "serializable",
-                "serialization",
-                "serialize"
-            ],
-            "support": {
-                "issues": "https://github.com/opis/closure/issues",
-                "source": "https://github.com/opis/closure/tree/3.6.3"
-            },
-            "time": "2022-01-27T09:35:39+00:00"
-        },
         {
             "name": "paragonie/constant_time_encoding",
             "version": "v2.6.3",
@@ -6452,16 +6226,16 @@
         },
         {
             "name": "payfast/payfast-php-sdk",
-            "version": "v1.1.2",
+            "version": "v1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PayFast/payfast-php-sdk.git",
-                "reference": "1372980e38f381b84eed7eb46a40d5819a4fe58c"
+                "reference": "caedaf4ab87ad2593c1596df9ec37575e186598c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PayFast/payfast-php-sdk/zipball/1372980e38f381b84eed7eb46a40d5819a4fe58c",
-                "reference": "1372980e38f381b84eed7eb46a40d5819a4fe58c",
+                "url": "https://api.github.com/repos/PayFast/payfast-php-sdk/zipball/caedaf4ab87ad2593c1596df9ec37575e186598c",
+                "reference": "caedaf4ab87ad2593c1596df9ec37575e186598c",
                 "shasum": ""
             },
             "require": {
@@ -6497,9 +6271,9 @@
             ],
             "support": {
                 "issues": "https://github.com/PayFast/payfast-php-sdk/issues",
-                "source": "https://github.com/PayFast/payfast-php-sdk/tree/v1.1.2"
+                "source": "https://github.com/PayFast/payfast-php-sdk/tree/v1.1.3"
             },
-            "time": "2021-03-15T19:58:26+00:00"
+            "time": "2022-06-03T14:59:36+00:00"
         },
         {
             "name": "php-http/client-common",
@@ -6954,29 +6728,33 @@
         },
         {
             "name": "phpoption/phpoption",
-            "version": "1.8.1",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15"
+                "reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15",
-                "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/dc5ff11e274a90cc1c743f66c9ad700ce50db9ab",
+                "reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0 || ^8.0"
+                "php": "^7.2.5 || ^8.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
-                "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8"
+                "bamarni/composer-bin-plugin": "^1.8",
+                "phpunit/phpunit": "^8.5.28 || ^9.5.21"
             },
             "type": "library",
             "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": true
+                },
                 "branch-alias": {
-                    "dev-master": "1.8-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "autoload": {
@@ -7009,7 +6787,7 @@
             ],
             "support": {
                 "issues": "https://github.com/schmittjoh/php-option/issues",
-                "source": "https://github.com/schmittjoh/php-option/tree/1.8.1"
+                "source": "https://github.com/schmittjoh/php-option/tree/1.9.0"
             },
             "funding": [
                 {
@@ -7021,7 +6799,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-04T23:24:31+00:00"
+            "time": "2022-07-30T15:51:26+00:00"
         },
         {
             "name": "phpseclib/phpseclib",
@@ -7252,20 +7030,20 @@
         },
         {
             "name": "psr/cache",
-            "version": "1.0.1",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/cache.git",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
+                "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
+                "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf",
+                "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=8.0.0"
             },
             "type": "library",
             "extra": {
@@ -7285,7 +7063,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for caching libraries",
@@ -7295,28 +7073,33 @@
                 "psr-6"
             ],
             "support": {
-                "source": "https://github.com/php-fig/cache/tree/master"
+                "source": "https://github.com/php-fig/cache/tree/3.0.0"
             },
-            "time": "2016-08-06T20:24:11+00:00"
+            "time": "2021-02-03T23:26:27+00:00"
         },
         {
             "name": "psr/container",
-            "version": "1.1.2",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
-                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.4.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Psr\\Container\\": "src/"
@@ -7343,9 +7126,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/1.1.2"
+                "source": "https://github.com/php-fig/container/tree/2.0.2"
             },
-            "time": "2021-11-05T16:50:12+00:00"
+            "time": "2021-11-05T16:47:00+00:00"
         },
         {
             "name": "psr/event-dispatcher",
@@ -7609,25 +7392,25 @@
         },
         {
             "name": "psr/simple-cache",
-            "version": "1.0.1",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/simple-cache.git",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865",
+                "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=8.0.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "3.0.x-dev"
                 }
             },
             "autoload": {
@@ -7642,7 +7425,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interfaces for simple caching",
@@ -7654,22 +7437,22 @@
                 "simple-cache"
             ],
             "support": {
-                "source": "https://github.com/php-fig/simple-cache/tree/master"
+                "source": "https://github.com/php-fig/simple-cache/tree/3.0.0"
             },
-            "time": "2017-10-23T01:57:42+00:00"
+            "time": "2021-10-29T13:26:27+00:00"
         },
         {
             "name": "psy/psysh",
-            "version": "v0.11.7",
+            "version": "v0.11.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "77fc7270031fbc28f9a7bea31385da5c4855cb7a"
+                "reference": "f455acf3645262ae389b10e9beba0c358aa6994e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/77fc7270031fbc28f9a7bea31385da5c4855cb7a",
-                "reference": "77fc7270031fbc28f9a7bea31385da5c4855cb7a",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/f455acf3645262ae389b10e9beba0c358aa6994e",
+                "reference": "f455acf3645262ae389b10e9beba0c358aa6994e",
                 "shasum": ""
             },
             "require": {
@@ -7730,9 +7513,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.11.7"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.11.8"
             },
-            "time": "2022-07-07T13:49:11+00:00"
+            "time": "2022-07-28T14:25:11+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -7859,25 +7642,24 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.2.3",
+            "version": "4.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df"
+                "reference": "373f7bacfcf3de038778ff27dcce5672ddbf4c8a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df",
-                "reference": "fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/373f7bacfcf3de038778ff27dcce5672ddbf4c8a",
+                "reference": "373f7bacfcf3de038778ff27dcce5672ddbf4c8a",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.8 || ^0.9",
+                "brick/math": "^0.8 || ^0.9 || ^0.10",
+                "ext-ctype": "*",
                 "ext-json": "*",
-                "php": "^7.2 || ^8.0",
-                "ramsey/collection": "^1.0",
-                "symfony/polyfill-ctype": "^1.8",
-                "symfony/polyfill-php80": "^1.14"
+                "php": "^8.0",
+                "ramsey/collection": "^1.0"
             },
             "replace": {
                 "rhumsaa/uuid": "self.version"
@@ -7889,7 +7671,6 @@
                 "doctrine/annotations": "^1.8",
                 "ergebnis/composer-normalize": "^2.15",
                 "mockery/mockery": "^1.3",
-                "moontoast/math": "^1.1",
                 "paragonie/random-lib": "^2",
                 "php-mock/php-mock": "^2.2",
                 "php-mock/php-mock-mockery": "^1.3",
@@ -7914,9 +7695,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "4.x-dev"
-                },
                 "captainhook": {
                     "force-install": true
                 }
@@ -7941,7 +7719,7 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.2.3"
+                "source": "https://github.com/ramsey/uuid/tree/4.4.0"
             },
             "funding": [
                 {
@@ -7953,7 +7731,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-25T23:10:38+00:00"
+            "time": "2022-08-05T17:58:37+00:00"
         },
         {
             "name": "razorpay/razorpay",
@@ -8022,16 +7800,16 @@
         },
         {
             "name": "rmccue/requests",
-            "version": "v2.0.3",
+            "version": "v2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/WordPress/Requests.git",
-                "reference": "b290dd974051bf1ead51d1947a5a56357e5b80ff"
+                "reference": "62bf29e0f1080b4f0f499d30adb6a382e70e9686"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/WordPress/Requests/zipball/b290dd974051bf1ead51d1947a5a56357e5b80ff",
-                "reference": "b290dd974051bf1ead51d1947a5a56357e5b80ff",
+                "url": "https://api.github.com/repos/WordPress/Requests/zipball/62bf29e0f1080b4f0f499d30adb6a382e70e9686",
+                "reference": "62bf29e0f1080b4f0f499d30adb6a382e70e9686",
                 "shasum": ""
             },
             "require": {
@@ -8099,7 +7877,7 @@
                 "issues": "https://github.com/WordPress/Requests/issues",
                 "source": "https://github.com/WordPress/Requests"
             },
-            "time": "2022-05-10T08:42:27+00:00"
+            "time": "2022-07-25T09:01:09+00:00"
         },
         {
             "name": "sabre/uri",
@@ -8785,36 +8563,34 @@
         },
         {
             "name": "sprain/swiss-qr-bill",
-            "version": "v3.2",
+            "version": "v3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sprain/php-swiss-qr-bill.git",
-                "reference": "c76cd7e4010a3e7aa4f6426c6d6d6710ed7d6262"
+                "reference": "c6d09e331bf44e5350ed7f9c7c869e9aaae007c8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sprain/php-swiss-qr-bill/zipball/c76cd7e4010a3e7aa4f6426c6d6d6710ed7d6262",
-                "reference": "c76cd7e4010a3e7aa4f6426c6d6d6710ed7d6262",
+                "url": "https://api.github.com/repos/sprain/php-swiss-qr-bill/zipball/c6d09e331bf44e5350ed7f9c7c869e9aaae007c8",
+                "reference": "c6d09e331bf44e5350ed7f9c7c869e9aaae007c8",
                 "shasum": ""
             },
             "require": {
                 "endroid/qr-code": "^3.9.7",
                 "khanamiryan/qrcode-detector-decoder": "^1.0.3",
                 "kmukku/php-iso11649": "^1.5",
-                "php": "^7.4|^8.0",
-                "symfony/intl": "^3.4.47|^4.4|^5.0",
+                "php": "^8.0.0|^8.1.0",
+                "symfony/intl": "^4.4|^5.0|^6.0",
                 "symfony/polyfill-intl-icu": "^1.23",
-                "symfony/validator": "^3.4.47|^4.4|^5.0"
+                "symfony/validator": "^4.4|^5.0|^6.0"
             },
             "require-dev": {
                 "dg/bypass-finals": "^1.3",
-                "dms/phpunit-arraysubset-asserts": "^0.1|^0.2",
+                "dms/phpunit-arraysubset-asserts": "^0.2",
                 "fpdf/fpdf": "^1.82",
-                "friendsofphp/php-cs-fixer": "^2.19",
-                "phpstan/phpstan": "^0.12.53",
-                "phpunit/phpunit": "^8.0|^9.0",
-                "symfony/css-selector": "^4.2",
-                "symfony/var-dumper": "^5.1",
+                "friendsofphp/php-cs-fixer": "^3.4",
+                "phpstan/phpstan": "^1.2",
+                "phpunit/phpunit": "^9.0",
                 "tecnickcom/tcpdf": "^6.3.2"
             },
             "suggest": {
@@ -8835,7 +8611,7 @@
             "description": "A PHP library to create Swiss QR bills",
             "support": {
                 "issues": "https://github.com/sprain/php-swiss-qr-bill/issues",
-                "source": "https://github.com/sprain/php-swiss-qr-bill/tree/v3.2"
+                "source": "https://github.com/sprain/php-swiss-qr-bill/tree/v3.3"
             },
             "funding": [
                 {
@@ -8843,7 +8619,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-10-22T11:31:39+00:00"
+            "time": "2021-12-11T17:36:20+00:00"
         },
         {
             "name": "square/square",
@@ -8902,6 +8678,49 @@
             },
             "time": "2021-07-21T06:43:15+00:00"
         },
+        {
+            "name": "stella-maris/clock",
+            "version": "0.1.5",
+            "source": {
+                "type": "git",
+                "url": "git@gitlab.com:stella-maris/clock.git",
+                "reference": "447879c53ca0b2a762cdbfba5e76ccf4deca9158"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://gitlab.com/api/v4/projects/stella-maris%2Fclock/repository/archive.zip?sha=447879c53ca0b2a762cdbfba5e76ccf4deca9158",
+                "reference": "447879c53ca0b2a762cdbfba5e76ccf4deca9158",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0|^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "StellaMaris\\Clock\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Andreas Heigl",
+                    "role": "Maintainer"
+                }
+            ],
+            "description": "A pre-release of the proposed PSR-20 Clock-Interface",
+            "homepage": "https://gitlab.com/stella-maris/clock",
+            "keywords": [
+                "clock",
+                "datetime",
+                "point in time",
+                "psr20"
+            ],
+            "time": "2022-08-05T07:21:25+00:00"
+        },
         {
             "name": "stripe/stripe-php",
             "version": "v7.128.0",
@@ -8962,124 +8781,45 @@
             },
             "time": "2022-05-05T17:18:02+00:00"
         },
-        {
-            "name": "swiftmailer/swiftmailer",
-            "version": "v6.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c",
-                "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c",
-                "shasum": ""
-            },
-            "require": {
-                "egulias/email-validator": "^2.0|^3.1",
-                "php": ">=7.0.0",
-                "symfony/polyfill-iconv": "^1.0",
-                "symfony/polyfill-intl-idn": "^1.10",
-                "symfony/polyfill-mbstring": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^1.0",
-                "symfony/phpunit-bridge": "^4.4|^5.4"
-            },
-            "suggest": {
-                "ext-intl": "Needed to support internationalized email addresses"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "6.2-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "lib/swift_required.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Chris Corbyn"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Swiftmailer, free feature-rich PHP mailer",
-            "homepage": "https://swiftmailer.symfony.com",
-            "keywords": [
-                "email",
-                "mail",
-                "mailer"
-            ],
-            "support": {
-                "issues": "https://github.com/swiftmailer/swiftmailer/issues",
-                "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.3.0"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/swiftmailer/swiftmailer",
-                    "type": "tidelift"
-                }
-            ],
-            "abandoned": "symfony/mailer",
-            "time": "2021-10-18T15:26:12+00:00"
-        },
         {
             "name": "symfony/console",
-            "version": "v5.4.10",
+            "version": "v6.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "4d671ab4ddac94ee439ea73649c69d9d200b5000"
+                "reference": "43fcb5c5966b43c56bcfa481368d90d748936ab8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/4d671ab4ddac94ee439ea73649c69d9d200b5000",
-                "reference": "4d671ab4ddac94ee439ea73649c69d9d200b5000",
+                "url": "https://api.github.com/repos/symfony/console/zipball/43fcb5c5966b43c56bcfa481368d90d748936ab8",
+                "reference": "43fcb5c5966b43c56bcfa481368d90d748936ab8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.1",
                 "symfony/deprecation-contracts": "^2.1|^3",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php73": "^1.9",
-                "symfony/polyfill-php80": "^1.16",
                 "symfony/service-contracts": "^1.1|^2|^3",
-                "symfony/string": "^5.1|^6.0"
+                "symfony/string": "^5.4|^6.0"
             },
             "conflict": {
-                "psr/log": ">=3",
-                "symfony/dependency-injection": "<4.4",
-                "symfony/dotenv": "<5.1",
-                "symfony/event-dispatcher": "<4.4",
-                "symfony/lock": "<4.4",
-                "symfony/process": "<4.4"
+                "symfony/dependency-injection": "<5.4",
+                "symfony/dotenv": "<5.4",
+                "symfony/event-dispatcher": "<5.4",
+                "symfony/lock": "<5.4",
+                "symfony/process": "<5.4"
             },
             "provide": {
-                "psr/log-implementation": "1.0|2.0"
+                "psr/log-implementation": "1.0|2.0|3.0"
             },
             "require-dev": {
-                "psr/log": "^1|^2",
-                "symfony/config": "^4.4|^5.0|^6.0",
-                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
-                "symfony/event-dispatcher": "^4.4|^5.0|^6.0",
-                "symfony/lock": "^4.4|^5.0|^6.0",
-                "symfony/process": "^4.4|^5.0|^6.0",
-                "symfony/var-dumper": "^4.4|^5.0|^6.0"
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^5.4|^6.0",
+                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/event-dispatcher": "^5.4|^6.0",
+                "symfony/lock": "^5.4|^6.0",
+                "symfony/process": "^5.4|^6.0",
+                "symfony/var-dumper": "^5.4|^6.0"
             },
             "suggest": {
                 "psr/log": "For using the console logger",
@@ -9119,7 +8859,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.10"
+                "source": "https://github.com/symfony/console/tree/v6.1.3"
             },
             "funding": [
                 {
@@ -9135,25 +8875,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-26T13:00:04+00:00"
+            "time": "2022-07-22T14:17:57+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.4.3",
+            "version": "v6.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "b0a190285cd95cb019237851205b8140ef6e368e"
+                "reference": "0dd5e36b80e1de97f8f74ed7023ac2b837a36443"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/b0a190285cd95cb019237851205b8140ef6e368e",
-                "reference": "b0a190285cd95cb019237851205b8140ef6e368e",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/0dd5e36b80e1de97f8f74ed7023ac2b837a36443",
+                "reference": "0dd5e36b80e1de97f8f74ed7023ac2b837a36443",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=8.1"
             },
             "type": "library",
             "autoload": {
@@ -9185,7 +8924,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v5.4.3"
+                "source": "https://github.com/symfony/css-selector/tree/v6.1.3"
             },
             "funding": [
                 {
@@ -9201,29 +8940,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2022-06-27T17:24:16+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.5.2",
+            "version": "v3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
+                "reference": "07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
-                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918",
+                "reference": "07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=8.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "3.1-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -9252,7 +8991,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.1.1"
             },
             "funding": [
                 {
@@ -9268,31 +9007,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2022-02-25T11:15:52+00:00"
         },
         {
             "name": "symfony/error-handler",
-            "version": "v5.4.9",
+            "version": "v6.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "c116cda1f51c678782768dce89a45f13c949455d"
+                "reference": "736e42db3fd586d91820355988698e434e1d8419"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/c116cda1f51c678782768dce89a45f13c949455d",
-                "reference": "c116cda1f51c678782768dce89a45f13c949455d",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/736e42db3fd586d91820355988698e434e1d8419",
+                "reference": "736e42db3fd586d91820355988698e434e1d8419",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.1",
                 "psr/log": "^1|^2|^3",
-                "symfony/var-dumper": "^4.4|^5.0|^6.0"
+                "symfony/var-dumper": "^5.4|^6.0"
             },
             "require-dev": {
                 "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/http-kernel": "^4.4|^5.0|^6.0",
-                "symfony/serializer": "^4.4|^5.0|^6.0"
+                "symfony/http-kernel": "^5.4|^6.0",
+                "symfony/serializer": "^5.4|^6.0"
             },
             "bin": [
                 "Resources/bin/patch-type-declarations"
@@ -9323,7 +9062,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v5.4.9"
+                "source": "https://github.com/symfony/error-handler/tree/v6.1.3"
             },
             "funding": [
                 {
@@ -9339,44 +9078,42 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-21T13:57:48+00:00"
+            "time": "2022-07-29T07:42:06+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.4.9",
+            "version": "v6.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"
+                "reference": "a0449a7ad7daa0f7c0acd508259f80544ab5a347"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc",
-                "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a0449a7ad7daa0f7c0acd508259f80544ab5a347",
+                "reference": "a0449a7ad7daa0f7c0acd508259f80544ab5a347",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/event-dispatcher-contracts": "^2|^3",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=8.1",
+                "symfony/event-dispatcher-contracts": "^2|^3"
             },
             "conflict": {
-                "symfony/dependency-injection": "<4.4"
+                "symfony/dependency-injection": "<5.4"
             },
             "provide": {
                 "psr/event-dispatcher-implementation": "1.0",
-                "symfony/event-dispatcher-implementation": "2.0"
+                "symfony/event-dispatcher-implementation": "2.0|3.0"
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^4.4|^5.0|^6.0",
-                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
-                "symfony/error-handler": "^4.4|^5.0|^6.0",
-                "symfony/expression-language": "^4.4|^5.0|^6.0",
-                "symfony/http-foundation": "^4.4|^5.0|^6.0",
+                "symfony/config": "^5.4|^6.0",
+                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/error-handler": "^5.4|^6.0",
+                "symfony/expression-language": "^5.4|^6.0",
+                "symfony/http-foundation": "^5.4|^6.0",
                 "symfony/service-contracts": "^1.1|^2|^3",
-                "symfony/stopwatch": "^4.4|^5.0|^6.0"
+                "symfony/stopwatch": "^5.4|^6.0"
             },
             "suggest": {
                 "symfony/dependency-injection": "",
@@ -9408,7 +9145,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.9"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.1.0"
             },
             "funding": [
                 {
@@ -9424,24 +9161,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-05T16:45:39+00:00"
+            "time": "2022-05-05T16:51:07+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v2.5.2",
+            "version": "v3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1"
+                "reference": "02ff5eea2f453731cfbc6bc215e456b781480448"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1",
-                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/02ff5eea2f453731cfbc6bc215e456b781480448",
+                "reference": "02ff5eea2f453731cfbc6bc215e456b781480448",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.1",
                 "psr/event-dispatcher": "^1"
             },
             "suggest": {
@@ -9450,7 +9187,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "3.1-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -9487,7 +9224,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.1.1"
             },
             "funding": [
                 {
@@ -9503,27 +9240,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2022-02-25T11:15:52+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.4.9",
+            "version": "v6.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba"
+                "reference": "c780e677cddda78417fa5187a7c6cd2f21110db9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/36a017fa4cce1eff1b8e8129ff53513abcef05ba",
-                "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/c780e677cddda78417fa5187a7c6cd2f21110db9",
+                "reference": "c780e677cddda78417fa5187a7c6cd2f21110db9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.1",
                 "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-mbstring": "~1.8",
-                "symfony/polyfill-php80": "^1.16"
+                "symfony/polyfill-mbstring": "~1.8"
             },
             "type": "library",
             "autoload": {
@@ -9551,7 +9287,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v5.4.9"
+                "source": "https://github.com/symfony/filesystem/tree/v6.1.3"
             },
             "funding": [
                 {
@@ -9567,26 +9303,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-20T13:55:35+00:00"
+            "time": "2022-07-20T14:45:06+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.4.8",
+            "version": "v6.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9"
+                "reference": "39696bff2c2970b3779a5cac7bf9f0b88fc2b709"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9",
-                "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/39696bff2c2970b3779a5cac7bf9f0b88fc2b709",
+                "reference": "39696bff2c2970b3779a5cac7bf9f0b88fc2b709",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "symfony/filesystem": "^6.0"
             },
             "type": "library",
             "autoload": {
@@ -9614,7 +9351,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.4.8"
+                "source": "https://github.com/symfony/finder/tree/v6.1.3"
             },
             "funding": [
                 {
@@ -9630,36 +9367,33 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-15T08:07:45+00:00"
+            "time": "2022-07-29T07:42:06+00:00"
         },
         {
             "name": "symfony/http-client",
-            "version": "v5.4.9",
+            "version": "v6.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client.git",
-                "reference": "dc0b15e42b762c040761c1eb9ce86a55d47cf672"
+                "reference": "1ef59920a9cedf223e8564ae8ad7608cbe799b4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/dc0b15e42b762c040761c1eb9ce86a55d47cf672",
-                "reference": "dc0b15e42b762c040761c1eb9ce86a55d47cf672",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/1ef59920a9cedf223e8564ae8ad7608cbe799b4d",
+                "reference": "1ef59920a9cedf223e8564ae8ad7608cbe799b4d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.1",
                 "psr/log": "^1|^2|^3",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/http-client-contracts": "^2.4",
-                "symfony/polyfill-php73": "^1.11",
-                "symfony/polyfill-php80": "^1.16",
+                "symfony/http-client-contracts": "^3",
                 "symfony/service-contracts": "^1.0|^2|^3"
             },
             "provide": {
                 "php-http/async-client-implementation": "*",
                 "php-http/client-implementation": "*",
                 "psr/http-client-implementation": "1.0",
-                "symfony/http-client-implementation": "2.4"
+                "symfony/http-client-implementation": "3.0"
             },
             "require-dev": {
                 "amphp/amp": "^2.5",
@@ -9670,10 +9404,10 @@
                 "nyholm/psr7": "^1.0",
                 "php-http/httplug": "^1.0|^2.0",
                 "psr/http-client": "^1.0",
-                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
-                "symfony/http-kernel": "^4.4.13|^5.1.5|^6.0",
-                "symfony/process": "^4.4|^5.0|^6.0",
-                "symfony/stopwatch": "^4.4|^5.0|^6.0"
+                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/http-kernel": "^5.4|^6.0",
+                "symfony/process": "^5.4|^6.0",
+                "symfony/stopwatch": "^5.4|^6.0"
             },
             "type": "library",
             "autoload": {
@@ -9701,7 +9435,7 @@
             "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-client/tree/v5.4.9"
+                "source": "https://github.com/symfony/http-client/tree/v6.1.3"
             },
             "funding": [
                 {
@@ -9717,24 +9451,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-21T08:57:05+00:00"
+            "time": "2022-07-28T13:40:41+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
-            "version": "v2.5.2",
+            "version": "v3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client-contracts.git",
-                "reference": "ba6a9f0e8f3edd190520ee3b9a958596b6ca2e70"
+                "reference": "fd038f08c623ab5d22b26e9ba35afe8c79071800"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ba6a9f0e8f3edd190520ee3b9a958596b6ca2e70",
-                "reference": "ba6a9f0e8f3edd190520ee3b9a958596b6ca2e70",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/fd038f08c623ab5d22b26e9ba35afe8c79071800",
+                "reference": "fd038f08c623ab5d22b26e9ba35afe8c79071800",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5"
+                "php": ">=8.1"
             },
             "suggest": {
                 "symfony/http-client-implementation": ""
@@ -9742,7 +9476,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "3.1-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -9752,7 +9486,10 @@
             "autoload": {
                 "psr-4": {
                     "Symfony\\Contracts\\HttpClient\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Test/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -9779,7 +9516,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client-contracts/tree/v2.5.2"
+                "source": "https://github.com/symfony/http-client-contracts/tree/v3.1.1"
             },
             "funding": [
                 {
@@ -9795,33 +9532,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-12T15:48:08+00:00"
+            "time": "2022-04-22T07:30:54+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v5.4.10",
+            "version": "v6.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "e7793b7906f72a8cc51054fbca9dcff7a8af1c1e"
+                "reference": "b03712c93759a81fc243ecc18ec4637958afebdb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e7793b7906f72a8cc51054fbca9dcff7a8af1c1e",
-                "reference": "e7793b7906f72a8cc51054fbca9dcff7a8af1c1e",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b03712c93759a81fc243ecc18ec4637958afebdb",
+                "reference": "b03712c93759a81fc243ecc18ec4637958afebdb",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.1",
                 "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/polyfill-mbstring": "~1.1",
-                "symfony/polyfill-php80": "^1.16"
+                "symfony/polyfill-mbstring": "~1.1"
             },
             "require-dev": {
                 "predis/predis": "~1.0",
-                "symfony/cache": "^4.4|^5.0|^6.0",
-                "symfony/expression-language": "^4.4|^5.0|^6.0",
-                "symfony/mime": "^4.4|^5.0|^6.0"
+                "symfony/cache": "^5.4|^6.0",
+                "symfony/expression-language": "^5.4|^6.0",
+                "symfony/mime": "^5.4|^6.0"
             },
             "suggest": {
                 "symfony/mime": "To use the file extension guesser"
@@ -9852,7 +9588,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v5.4.10"
+                "source": "https://github.com/symfony/http-foundation/tree/v6.1.3"
             },
             "funding": [
                 {
@@ -9868,68 +9604,66 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-19T13:13:40+00:00"
+            "time": "2022-07-27T15:50:51+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v5.4.10",
+            "version": "v6.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "255ae3b0a488d78fbb34da23d3e0c059874b5948"
+                "reference": "0692bc185a1dbb54864686a1fc6785667279da70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/255ae3b0a488d78fbb34da23d3e0c059874b5948",
-                "reference": "255ae3b0a488d78fbb34da23d3e0c059874b5948",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/0692bc185a1dbb54864686a1fc6785667279da70",
+                "reference": "0692bc185a1dbb54864686a1fc6785667279da70",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "psr/log": "^1|^2",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/error-handler": "^4.4|^5.0|^6.0",
-                "symfony/event-dispatcher": "^5.0|^6.0",
-                "symfony/http-foundation": "^5.3.7|^6.0",
-                "symfony/polyfill-ctype": "^1.8",
-                "symfony/polyfill-php73": "^1.9",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=8.1",
+                "psr/log": "^1|^2|^3",
+                "symfony/error-handler": "^6.1",
+                "symfony/event-dispatcher": "^5.4|^6.0",
+                "symfony/http-foundation": "^5.4|^6.0",
+                "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
                 "symfony/browser-kit": "<5.4",
-                "symfony/cache": "<5.0",
-                "symfony/config": "<5.0",
-                "symfony/console": "<4.4",
-                "symfony/dependency-injection": "<5.3",
-                "symfony/doctrine-bridge": "<5.0",
-                "symfony/form": "<5.0",
-                "symfony/http-client": "<5.0",
-                "symfony/mailer": "<5.0",
-                "symfony/messenger": "<5.0",
-                "symfony/translation": "<5.0",
-                "symfony/twig-bridge": "<5.0",
-                "symfony/validator": "<5.0",
+                "symfony/cache": "<5.4",
+                "symfony/config": "<6.1",
+                "symfony/console": "<5.4",
+                "symfony/dependency-injection": "<6.1",
+                "symfony/doctrine-bridge": "<5.4",
+                "symfony/form": "<5.4",
+                "symfony/http-client": "<5.4",
+                "symfony/mailer": "<5.4",
+                "symfony/messenger": "<5.4",
+                "symfony/translation": "<5.4",
+                "symfony/twig-bridge": "<5.4",
+                "symfony/validator": "<5.4",
                 "twig/twig": "<2.13"
             },
             "provide": {
-                "psr/log-implementation": "1.0|2.0"
+                "psr/log-implementation": "1.0|2.0|3.0"
             },
             "require-dev": {
                 "psr/cache": "^1.0|^2.0|^3.0",
                 "symfony/browser-kit": "^5.4|^6.0",
-                "symfony/config": "^5.0|^6.0",
-                "symfony/console": "^4.4|^5.0|^6.0",
-                "symfony/css-selector": "^4.4|^5.0|^6.0",
-                "symfony/dependency-injection": "^5.3|^6.0",
-                "symfony/dom-crawler": "^4.4|^5.0|^6.0",
-                "symfony/expression-language": "^4.4|^5.0|^6.0",
-                "symfony/finder": "^4.4|^5.0|^6.0",
+                "symfony/config": "^6.1",
+                "symfony/console": "^5.4|^6.0",
+                "symfony/css-selector": "^5.4|^6.0",
+                "symfony/dependency-injection": "^6.1",
+                "symfony/dom-crawler": "^5.4|^6.0",
+                "symfony/expression-language": "^5.4|^6.0",
+                "symfony/finder": "^5.4|^6.0",
                 "symfony/http-client-contracts": "^1.1|^2|^3",
-                "symfony/process": "^4.4|^5.0|^6.0",
-                "symfony/routing": "^4.4|^5.0|^6.0",
-                "symfony/stopwatch": "^4.4|^5.0|^6.0",
-                "symfony/translation": "^4.4|^5.0|^6.0",
+                "symfony/process": "^5.4|^6.0",
+                "symfony/routing": "^5.4|^6.0",
+                "symfony/stopwatch": "^5.4|^6.0",
+                "symfony/translation": "^5.4|^6.0",
                 "symfony/translation-contracts": "^1.1|^2|^3",
+                "symfony/uid": "^5.4|^6.0",
                 "twig/twig": "^2.13|^3.0.4"
             },
             "suggest": {
@@ -9964,7 +9698,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v5.4.10"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.1.3"
             },
             "funding": [
                 {
@@ -9980,41 +9714,33 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-26T16:57:59+00:00"
+            "time": "2022-07-29T12:59:10+00:00"
         },
         {
             "name": "symfony/intl",
-            "version": "v5.4.10",
+            "version": "v6.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/intl.git",
-                "reference": "e62efe352693f0cfd5ea3878fc06760582eecc4c"
+                "reference": "9fc07ba57eb33d44c6b3b86b4e1ef927620d1a39"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/intl/zipball/e62efe352693f0cfd5ea3878fc06760582eecc4c",
-                "reference": "e62efe352693f0cfd5ea3878fc06760582eecc4c",
+                "url": "https://api.github.com/repos/symfony/intl/zipball/9fc07ba57eb33d44c6b3b86b4e1ef927620d1a39",
+                "reference": "9fc07ba57eb33d44c6b3b86b4e1ef927620d1a39",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "symfony/filesystem": "^4.4|^5.0|^6.0"
+                "symfony/filesystem": "^5.4|^6.0"
             },
             "type": "library",
             "autoload": {
-                "files": [
-                    "Resources/functions.php"
-                ],
                 "psr-4": {
                     "Symfony\\Component\\Intl\\": ""
                 },
-                "classmap": [
-                    "Resources/stubs"
-                ],
                 "exclude-from-classmap": [
                     "/Tests/"
                 ]
@@ -10052,7 +9778,7 @@
                 "localization"
             ],
             "support": {
-                "source": "https://github.com/symfony/intl/tree/v5.4.10"
+                "source": "https://github.com/symfony/intl/tree/v6.1.0"
             },
             "funding": [
                 {
@@ -10068,42 +9794,179 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-26T13:00:04+00:00"
+            "time": "2022-04-12T16:22:53+00:00"
         },
         {
-            "name": "symfony/mime",
-            "version": "v5.4.10",
+            "name": "symfony/mailer",
+            "version": "v6.1.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/mime.git",
-                "reference": "02265e1e5111c3cd7480387af25e82378b7ab9cc"
+                "url": "https://github.com/symfony/mailer.git",
+                "reference": "b2db228a93278863d1567f90d7caf26922dbfede"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/02265e1e5111c3cd7480387af25e82378b7ab9cc",
-                "reference": "02265e1e5111c3cd7480387af25e82378b7ab9cc",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/b2db228a93278863d1567f90d7caf26922dbfede",
+                "reference": "b2db228a93278863d1567f90d7caf26922dbfede",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
+                "egulias/email-validator": "^2.1.10|^3",
+                "php": ">=8.1",
+                "psr/event-dispatcher": "^1",
+                "psr/log": "^1|^2|^3",
+                "symfony/event-dispatcher": "^5.4|^6.0",
+                "symfony/mime": "^5.4|^6.0",
+                "symfony/service-contracts": "^1.1|^2|^3"
+            },
+            "conflict": {
+                "symfony/http-kernel": "<5.4"
+            },
+            "require-dev": {
+                "symfony/http-client-contracts": "^1.1|^2|^3",
+                "symfony/messenger": "^5.4|^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Mailer\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Helps sending emails",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/mailer/tree/v6.1.3"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-07-27T15:50:51+00:00"
+        },
+        {
+            "name": "symfony/mailgun-mailer",
+            "version": "v6.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/mailgun-mailer.git",
+                "reference": "44d3c15049d84f5165917a6190f06adbe64d71dd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/44d3c15049d84f5165917a6190f06adbe64d71dd",
+                "reference": "44d3c15049d84f5165917a6190f06adbe64d71dd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/mailer": "^5.4|^6.0"
+            },
+            "require-dev": {
+                "symfony/http-client": "^5.4|^6.0"
+            },
+            "type": "symfony-mailer-bridge",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Mailer\\Bridge\\Mailgun\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Mailgun Mailer Bridge",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/mailgun-mailer/tree/v6.1.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-04-01T07:15:35+00:00"
+        },
+        {
+            "name": "symfony/mime",
+            "version": "v6.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/mime.git",
+                "reference": "9c0247994fc6584da8591ba64b2bffaace9df87d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/9c0247994fc6584da8591ba64b2bffaace9df87d",
+                "reference": "9c0247994fc6584da8591ba64b2bffaace9df87d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
                 "symfony/polyfill-intl-idn": "^1.10",
-                "symfony/polyfill-mbstring": "^1.0",
-                "symfony/polyfill-php80": "^1.16"
+                "symfony/polyfill-mbstring": "^1.0"
             },
             "conflict": {
                 "egulias/email-validator": "~3.0.0",
                 "phpdocumentor/reflection-docblock": "<3.2.2",
                 "phpdocumentor/type-resolver": "<1.4.0",
-                "symfony/mailer": "<4.4"
+                "symfony/mailer": "<5.4"
             },
             "require-dev": {
                 "egulias/email-validator": "^2.1.10|^3.1",
                 "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
-                "symfony/property-access": "^4.4|^5.1|^6.0",
-                "symfony/property-info": "^4.4|^5.1|^6.0",
-                "symfony/serializer": "^5.2|^6.0"
+                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/property-access": "^5.4|^6.0",
+                "symfony/property-info": "^5.4|^6.0",
+                "symfony/serializer": "^5.4|^6.0"
             },
             "type": "library",
             "autoload": {
@@ -10135,7 +9998,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v5.4.10"
+                "source": "https://github.com/symfony/mime/tree/v6.1.3"
             },
             "funding": [
                 {
@@ -10151,20 +10014,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-09T12:22:40+00:00"
+            "time": "2022-07-20T13:46:29+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.4.3",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8"
+                "reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/cc1147cb11af1b43f503ac18f31aa3bec213aba8",
-                "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/54f14e36aa73cb8f7261d7686691fd4d75ea2690",
+                "reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690",
                 "shasum": ""
             },
             "require": {
@@ -10204,7 +10067,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v5.4.3"
+                "source": "https://github.com/symfony/options-resolver/tree/v5.4.11"
             },
             "funding": [
                 {
@@ -10220,7 +10083,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2022-07-20T13:00:38+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -10304,89 +10167,6 @@
             ],
             "time": "2022-05-24T11:49:31+00:00"
         },
-        {
-            "name": "symfony/polyfill-iconv",
-            "version": "v1.26.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-iconv.git",
-                "reference": "143f1881e655bebca1312722af8068de235ae5dc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/143f1881e655bebca1312722af8068de235ae5dc",
-                "reference": "143f1881e655bebca1312722af8068de235ae5dc",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "provide": {
-                "ext-iconv": "*"
-            },
-            "suggest": {
-                "ext-iconv": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.26-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Iconv\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Iconv extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "iconv",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.26.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-05-24T11:49:31+00:00"
-        },
         {
             "name": "symfony/polyfill-intl-grapheme",
             "version": "v1.26.0",
@@ -11209,22 +10989,86 @@
             "time": "2022-05-24T11:49:31+00:00"
         },
         {
-            "name": "symfony/process",
-            "version": "v5.4.8",
+            "name": "symfony/postmark-mailer",
+            "version": "v6.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3"
+                "url": "https://github.com/symfony/postmark-mailer.git",
+                "reference": "5f38d688df43bea507bf0dfe0d0ca6f99221b708"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3",
-                "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3",
+                "url": "https://api.github.com/repos/symfony/postmark-mailer/zipball/5f38d688df43bea507bf0dfe0d0ca6f99221b708",
+                "reference": "5f38d688df43bea507bf0dfe0d0ca6f99221b708",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=8.1",
+                "symfony/mailer": "^5.4|^6.0"
+            },
+            "require-dev": {
+                "symfony/http-client": "^5.4|^6.0"
+            },
+            "type": "symfony-mailer-bridge",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Mailer\\Bridge\\Postmark\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Postmark Mailer Bridge",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/postmark-mailer/tree/v6.1.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-04-01T07:15:35+00:00"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v6.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/process.git",
+                "reference": "a6506e99cfad7059b1ab5cab395854a0a0c21292"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/process/zipball/a6506e99cfad7059b1ab5cab395854a0a0c21292",
+                "reference": "a6506e99cfad7059b1ab5cab395854a0a0c21292",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
             },
             "type": "library",
             "autoload": {
@@ -11252,7 +11096,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v5.4.8"
+                "source": "https://github.com/symfony/process/tree/v6.1.3"
             },
             "funding": [
                 {
@@ -11268,20 +11112,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-08T05:07:18+00:00"
+            "time": "2022-06-27T17:24:16+00:00"
         },
         {
             "name": "symfony/property-access",
-            "version": "v5.4.8",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/property-access.git",
-                "reference": "fe501d498d6ec7e9efe928c90fabedf629116495"
+                "reference": "c641d63e943ed31981bad4b4dcf29fe7da2ffa8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/property-access/zipball/fe501d498d6ec7e9efe928c90fabedf629116495",
-                "reference": "fe501d498d6ec7e9efe928c90fabedf629116495",
+                "url": "https://api.github.com/repos/symfony/property-access/zipball/c641d63e943ed31981bad4b4dcf29fe7da2ffa8c",
+                "reference": "c641d63e943ed31981bad4b4dcf29fe7da2ffa8c",
                 "shasum": ""
             },
             "require": {
@@ -11333,7 +11177,7 @@
                 "reflection"
             ],
             "support": {
-                "source": "https://github.com/symfony/property-access/tree/v5.4.8"
+                "source": "https://github.com/symfony/property-access/tree/v5.4.11"
             },
             "funding": [
                 {
@@ -11349,40 +11193,38 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-12T15:48:08+00:00"
+            "time": "2022-06-27T16:58:25+00:00"
         },
         {
             "name": "symfony/property-info",
-            "version": "v5.4.10",
+            "version": "v6.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/property-info.git",
-                "reference": "924406e19365953870517eb7f63ac3f7bfb71875"
+                "reference": "2fc363ed2f2b5d3b231ed0824e066d140d3fd1d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/property-info/zipball/924406e19365953870517eb7f63ac3f7bfb71875",
-                "reference": "924406e19365953870517eb7f63ac3f7bfb71875",
+                "url": "https://api.github.com/repos/symfony/property-info/zipball/2fc363ed2f2b5d3b231ed0824e066d140d3fd1d8",
+                "reference": "2fc363ed2f2b5d3b231ed0824e066d140d3fd1d8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/polyfill-php80": "^1.16",
-                "symfony/string": "^5.1|^6.0"
+                "php": ">=8.1",
+                "symfony/string": "^5.4|^6.0"
             },
             "conflict": {
-                "phpdocumentor/reflection-docblock": "<3.2.2",
-                "phpdocumentor/type-resolver": "<1.4.0",
-                "symfony/dependency-injection": "<4.4"
+                "phpdocumentor/reflection-docblock": "<5.2",
+                "phpdocumentor/type-resolver": "<1.5.1",
+                "symfony/dependency-injection": "<5.4"
             },
             "require-dev": {
                 "doctrine/annotations": "^1.10.4",
-                "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
+                "phpdocumentor/reflection-docblock": "^5.2",
                 "phpstan/phpdoc-parser": "^1.0",
-                "symfony/cache": "^4.4|^5.0|^6.0",
-                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
-                "symfony/serializer": "^4.4|^5.0|^6.0"
+                "symfony/cache": "^5.4|^6.0",
+                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/serializer": "^5.4|^6.0"
             },
             "suggest": {
                 "phpdocumentor/reflection-docblock": "To use the PHPDoc",
@@ -11424,7 +11266,7 @@
                 "validator"
             ],
             "support": {
-                "source": "https://github.com/symfony/property-info/tree/v5.4.10"
+                "source": "https://github.com/symfony/property-info/tree/v6.1.3"
             },
             "funding": [
                 {
@@ -11440,7 +11282,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-31T05:14:08+00:00"
+            "time": "2022-07-19T08:34:05+00:00"
         },
         {
             "name": "symfony/psr-http-message-bridge",
@@ -11532,37 +11374,35 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v5.4.8",
+            "version": "v6.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "e07817bb6244ea33ef5ad31abc4a9288bef3f2f7"
+                "reference": "ef9108b3a88045b7546e808fb404ddb073dd35ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/e07817bb6244ea33ef5ad31abc4a9288bef3f2f7",
-                "reference": "e07817bb6244ea33ef5ad31abc4a9288bef3f2f7",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/ef9108b3a88045b7546e808fb404ddb073dd35ea",
+                "reference": "ef9108b3a88045b7546e808fb404ddb073dd35ea",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=8.1"
             },
             "conflict": {
                 "doctrine/annotations": "<1.12",
-                "symfony/config": "<5.3",
-                "symfony/dependency-injection": "<4.4",
-                "symfony/yaml": "<4.4"
+                "symfony/config": "<5.4",
+                "symfony/dependency-injection": "<5.4",
+                "symfony/yaml": "<5.4"
             },
             "require-dev": {
                 "doctrine/annotations": "^1.12",
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.3|^6.0",
-                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
-                "symfony/expression-language": "^4.4|^5.0|^6.0",
-                "symfony/http-foundation": "^4.4|^5.0|^6.0",
-                "symfony/yaml": "^4.4|^5.0|^6.0"
+                "symfony/config": "^5.4|^6.0",
+                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/expression-language": "^5.4|^6.0",
+                "symfony/http-foundation": "^5.4|^6.0",
+                "symfony/yaml": "^5.4|^6.0"
             },
             "suggest": {
                 "symfony/config": "For using the all-in-one router or any loader",
@@ -11602,7 +11442,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v5.4.8"
+                "source": "https://github.com/symfony/routing/tree/v6.1.3"
             },
             "funding": [
                 {
@@ -11618,26 +11458,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-18T21:45:37+00:00"
+            "time": "2022-07-20T15:00:40+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.5.2",
+            "version": "v3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
+                "reference": "925e713fe8fcacf6bc05e936edd8dd5441a21239"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
-                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/925e713fe8fcacf6bc05e936edd8dd5441a21239",
+                "reference": "925e713fe8fcacf6bc05e936edd8dd5441a21239",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "psr/container": "^1.1",
-                "symfony/deprecation-contracts": "^2.1|^3"
+                "php": ">=8.1",
+                "psr/container": "^2.0"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
@@ -11648,7 +11487,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "3.1-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -11658,7 +11497,10 @@
             "autoload": {
                 "psr-4": {
                     "Symfony\\Contracts\\Service\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Test/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -11685,7 +11527,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v2.5.2"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.1.1"
             },
             "funding": [
                 {
@@ -11701,38 +11543,37 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-30T19:17:29+00:00"
+            "time": "2022-05-30T19:18:58+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v5.4.10",
+            "version": "v6.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "4432bc7df82a554b3e413a8570ce2fea90e94097"
+                "reference": "f35241f45c30bcd9046af2bb200a7086f70e1d6b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/4432bc7df82a554b3e413a8570ce2fea90e94097",
-                "reference": "4432bc7df82a554b3e413a8570ce2fea90e94097",
+                "url": "https://api.github.com/repos/symfony/string/zipball/f35241f45c30bcd9046af2bb200a7086f70e1d6b",
+                "reference": "f35241f45c30bcd9046af2bb200a7086f70e1d6b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.1",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-intl-grapheme": "~1.0",
                 "symfony/polyfill-intl-normalizer": "~1.0",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php80": "~1.15"
+                "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/translation-contracts": ">=3.0"
+                "symfony/translation-contracts": "<2.0"
             },
             "require-dev": {
-                "symfony/error-handler": "^4.4|^5.0|^6.0",
-                "symfony/http-client": "^4.4|^5.0|^6.0",
-                "symfony/translation-contracts": "^1.1|^2",
-                "symfony/var-exporter": "^4.4|^5.0|^6.0"
+                "symfony/error-handler": "^5.4|^6.0",
+                "symfony/http-client": "^5.4|^6.0",
+                "symfony/translation-contracts": "^2.0|^3.0",
+                "symfony/var-exporter": "^5.4|^6.0"
             },
             "type": "library",
             "autoload": {
@@ -11771,7 +11612,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.10"
+                "source": "https://github.com/symfony/string/tree/v6.1.3"
             },
             "funding": [
                 {
@@ -11787,52 +11628,51 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-26T15:57:47+00:00"
+            "time": "2022-07-27T15:50:51+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v5.4.9",
+            "version": "v6.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "1639abc1177d26bcd4320e535e664cef067ab0ca"
+                "reference": "b042e16087d298d08c1f013ff505d16c12a3b1be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/1639abc1177d26bcd4320e535e664cef067ab0ca",
-                "reference": "1639abc1177d26bcd4320e535e664cef067ab0ca",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/b042e16087d298d08c1f013ff505d16c12a3b1be",
+                "reference": "b042e16087d298d08c1f013ff505d16c12a3b1be",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
+                "php": ">=8.1",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php80": "^1.16",
-                "symfony/translation-contracts": "^2.3"
+                "symfony/translation-contracts": "^2.3|^3.0"
             },
             "conflict": {
-                "symfony/config": "<4.4",
-                "symfony/console": "<5.3",
-                "symfony/dependency-injection": "<5.0",
-                "symfony/http-kernel": "<5.0",
-                "symfony/twig-bundle": "<5.0",
-                "symfony/yaml": "<4.4"
+                "symfony/config": "<5.4",
+                "symfony/console": "<5.4",
+                "symfony/dependency-injection": "<5.4",
+                "symfony/http-kernel": "<5.4",
+                "symfony/twig-bundle": "<5.4",
+                "symfony/yaml": "<5.4"
             },
             "provide": {
-                "symfony/translation-implementation": "2.3"
+                "symfony/translation-implementation": "2.3|3.0"
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^4.4|^5.0|^6.0",
+                "symfony/config": "^5.4|^6.0",
                 "symfony/console": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.0|^6.0",
-                "symfony/finder": "^4.4|^5.0|^6.0",
+                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/finder": "^5.4|^6.0",
                 "symfony/http-client-contracts": "^1.1|^2.0|^3.0",
-                "symfony/http-kernel": "^5.0|^6.0",
-                "symfony/intl": "^4.4|^5.0|^6.0",
+                "symfony/http-kernel": "^5.4|^6.0",
+                "symfony/intl": "^5.4|^6.0",
                 "symfony/polyfill-intl-icu": "^1.21",
+                "symfony/routing": "^5.4|^6.0",
                 "symfony/service-contracts": "^1.1.2|^2|^3",
-                "symfony/yaml": "^4.4|^5.0|^6.0"
+                "symfony/yaml": "^5.4|^6.0"
             },
             "suggest": {
                 "psr/log-implementation": "To use logging capability in translator",
@@ -11868,7 +11708,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v5.4.9"
+                "source": "https://github.com/symfony/translation/tree/v6.1.3"
             },
             "funding": [
                 {
@@ -11884,24 +11724,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-06T12:33:37+00:00"
+            "time": "2022-07-20T13:46:29+00:00"
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v2.5.2",
+            "version": "v3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe"
+                "reference": "606be0f48e05116baef052f7f3abdb345c8e02cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe",
-                "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/606be0f48e05116baef052f7f3abdb345c8e02cc",
+                "reference": "606be0f48e05116baef052f7f3abdb345c8e02cc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5"
+                "php": ">=8.1"
             },
             "suggest": {
                 "symfony/translation-implementation": ""
@@ -11909,7 +11749,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "3.1-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -11919,7 +11759,10 @@
             "autoload": {
                 "psr-4": {
                     "Symfony\\Contracts\\Translation\\": ""
-                }
+                },
+                "exclude-from-classmap": [
+                    "/Test/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -11946,7 +11789,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v2.5.2"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.1.1"
             },
             "funding": [
                 {
@@ -11962,64 +11805,59 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-27T16:58:25+00:00"
+            "time": "2022-06-27T17:24:16+00:00"
         },
         {
             "name": "symfony/validator",
-            "version": "v5.4.10",
+            "version": "v6.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/validator.git",
-                "reference": "303490582fee6ed46fa3bd9701ef0ff741ada648"
+                "reference": "14a14730609ad6c4f82153ddebf263800833b1cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/validator/zipball/303490582fee6ed46fa3bd9701ef0ff741ada648",
-                "reference": "303490582fee6ed46fa3bd9701ef0ff741ada648",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/14a14730609ad6c4f82153ddebf263800833b1cc",
+                "reference": "14a14730609ad6c4f82153ddebf263800833b1cc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.1",
                 "symfony/deprecation-contracts": "^2.1|^3",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php73": "~1.0",
-                "symfony/polyfill-php80": "^1.16",
-                "symfony/polyfill-php81": "^1.22",
                 "symfony/translation-contracts": "^1.1|^2|^3"
             },
             "conflict": {
                 "doctrine/annotations": "<1.13",
-                "doctrine/cache": "<1.11",
                 "doctrine/lexer": "<1.1",
                 "phpunit/phpunit": "<5.4.3",
-                "symfony/dependency-injection": "<4.4",
-                "symfony/expression-language": "<5.1",
-                "symfony/http-kernel": "<4.4",
-                "symfony/intl": "<4.4",
-                "symfony/property-info": "<5.3",
-                "symfony/translation": "<4.4",
-                "symfony/yaml": "<4.4"
+                "symfony/dependency-injection": "<5.4",
+                "symfony/expression-language": "<5.4",
+                "symfony/http-kernel": "<5.4",
+                "symfony/intl": "<5.4",
+                "symfony/property-info": "<5.4",
+                "symfony/translation": "<5.4",
+                "symfony/yaml": "<5.4"
             },
             "require-dev": {
                 "doctrine/annotations": "^1.13",
-                "doctrine/cache": "^1.11|^2.0",
                 "egulias/email-validator": "^2.1.10|^3",
-                "symfony/cache": "^4.4|^5.0|^6.0",
-                "symfony/config": "^4.4|^5.0|^6.0",
-                "symfony/console": "^4.4|^5.0|^6.0",
-                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
-                "symfony/expression-language": "^5.1|^6.0",
-                "symfony/finder": "^4.4|^5.0|^6.0",
-                "symfony/http-client": "^4.4|^5.0|^6.0",
-                "symfony/http-foundation": "^4.4|^5.0|^6.0",
-                "symfony/http-kernel": "^4.4|^5.0|^6.0",
-                "symfony/intl": "^4.4|^5.0|^6.0",
-                "symfony/mime": "^4.4|^5.0|^6.0",
-                "symfony/property-access": "^4.4|^5.0|^6.0",
-                "symfony/property-info": "^5.3|^6.0",
-                "symfony/translation": "^4.4|^5.0|^6.0",
-                "symfony/yaml": "^4.4|^5.0|^6.0"
+                "symfony/cache": "^5.4|^6.0",
+                "symfony/config": "^5.4|^6.0",
+                "symfony/console": "^5.4|^6.0",
+                "symfony/dependency-injection": "^5.4|^6.0",
+                "symfony/expression-language": "^5.4|^6.0",
+                "symfony/finder": "^5.4|^6.0",
+                "symfony/http-client": "^5.4|^6.0",
+                "symfony/http-foundation": "^5.4|^6.0",
+                "symfony/http-kernel": "^5.4|^6.0",
+                "symfony/intl": "^5.4|^6.0",
+                "symfony/mime": "^5.4|^6.0",
+                "symfony/property-access": "^5.4|^6.0",
+                "symfony/property-info": "^5.4|^6.0",
+                "symfony/translation": "^5.4|^6.0",
+                "symfony/yaml": "^5.4|^6.0"
             },
             "suggest": {
                 "egulias/email-validator": "Strict (RFC compliant) email validation",
@@ -12059,7 +11897,7 @@
             "description": "Provides tools to validate values",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/validator/tree/v5.4.10"
+                "source": "https://github.com/symfony/validator/tree/v6.1.3"
             },
             "funding": [
                 {
@@ -12075,36 +11913,35 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-09T12:24:18+00:00"
+            "time": "2022-07-20T13:46:29+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v5.4.9",
+            "version": "v6.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "af52239a330fafd192c773795520dc2dd62b5657"
+                "reference": "d5a5e44a2260c5eb5e746bf4f1fbd12ee6ceb427"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/af52239a330fafd192c773795520dc2dd62b5657",
-                "reference": "af52239a330fafd192c773795520dc2dd62b5657",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d5a5e44a2260c5eb5e746bf4f1fbd12ee6ceb427",
+                "reference": "d5a5e44a2260c5eb5e746bf4f1fbd12ee6ceb427",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=8.1",
+                "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
                 "phpunit/phpunit": "<5.4.3",
-                "symfony/console": "<4.4"
+                "symfony/console": "<5.4"
             },
             "require-dev": {
                 "ext-iconv": "*",
-                "symfony/console": "^4.4|^5.0|^6.0",
-                "symfony/process": "^4.4|^5.0|^6.0",
-                "symfony/uid": "^5.1|^6.0",
+                "symfony/console": "^5.4|^6.0",
+                "symfony/process": "^5.4|^6.0",
+                "symfony/uid": "^5.4|^6.0",
                 "twig/twig": "^2.13|^3.0.4"
             },
             "suggest": {
@@ -12148,7 +11985,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v5.4.9"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.1.3"
             },
             "funding": [
                 {
@@ -12164,7 +12001,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-21T10:24:18+00:00"
+            "time": "2022-07-20T13:46:29+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -12283,50 +12120,33 @@
             "time": "2022-06-22T11:22:46+00:00"
         },
         {
-            "name": "turbo124/laravel-gmail",
-            "version": "v5.0.2",
+            "name": "twilio/sdk",
+            "version": "6.40.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/turbo124/laravel-gmail.git",
-                "reference": "f8b8806d0b37ab5b2d4c3f402f8094d9021bd342"
+                "url": "git@github.com:twilio/twilio-php.git",
+                "reference": "86aa13d855f4624d07a5e6e8c0b7f2096d7d856c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/turbo124/laravel-gmail/zipball/f8b8806d0b37ab5b2d4c3f402f8094d9021bd342",
-                "reference": "f8b8806d0b37ab5b2d4c3f402f8094d9021bd342",
+                "url": "https://api.github.com/repos/twilio/twilio-php/zipball/86aa13d855f4624d07a5e6e8c0b7f2096d7d856c",
+                "reference": "86aa13d855f4624d07a5e6e8c0b7f2096d7d856c",
                 "shasum": ""
             },
             "require": {
-                "google/apiclient": "^2.5",
-                "illuminate/auth": "~5.8|^6.0|^7.0|^8.0",
-                "illuminate/config": "~5.8|^6.0|^7.0|^8.0",
-                "illuminate/database": "~5.8|^6.0|^7.0|^8.0",
-                "illuminate/routing": "~5.8|^6.0|^7.0|^8.0",
-                "illuminate/session": "~5.8|^6.0|^7.0|^8.0",
-                "illuminate/support": "~5.8|^6.0|^7.0|^8.0",
-                "php": "^7.3|^7.4|^8.0",
-                "swiftmailer/swiftmailer": "~5.8|^6.0"
+                "php": ">=7.1.0"
             },
             "require-dev": {
-                "mockery/mockery": "^1.0",
-                "orchestra/testbench": "^4.0",
-                "phpunit/phpunit": "^8.5",
-                "squizlabs/php_codesniffer": "~3.4"
+                "guzzlehttp/guzzle": "^6.3 || ^7.0",
+                "phpunit/phpunit": ">=7.0"
+            },
+            "suggest": {
+                "guzzlehttp/guzzle": "An HTTP client to execute the API requests"
             },
             "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "Dacastro4\\LaravelGmail\\LaravelGmailServiceProvider"
-                    ],
-                    "aliases": {
-                        "LaravelGmail": "Dacastro4\\LaravelGmail\\Facade\\LaravelGmail"
-                    }
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "Dacastro4\\LaravelGmail\\": "src/"
+                    "Twilio\\": "src/Twilio/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -12335,21 +12155,18 @@
             ],
             "authors": [
                 {
-                    "name": "Daniel Castro",
-                    "email": "danielcastro04@gmail.com",
-                    "homepage": "https://danielcastro.me"
+                    "name": "Twilio API Team",
+                    "email": "api@twilio.com"
                 }
             ],
-            "description": "Gmail API package for Laravel",
+            "description": "A PHP wrapper for Twilio's API",
+            "homepage": "https://github.com/twilio/twilio-php",
             "keywords": [
                 "api",
-                "gmail",
-                "laravel"
+                "sms",
+                "twilio"
             ],
-            "support": {
-                "source": "https://github.com/turbo124/laravel-gmail/tree/v5.0.2"
-            },
-            "time": "2021-05-08T00:17:52+00:00"
+            "time": "2022-07-21T19:54:34+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
@@ -12433,16 +12250,16 @@
         },
         {
             "name": "voku/portable-ascii",
-            "version": "1.6.1",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/voku/portable-ascii.git",
-                "reference": "87337c91b9dfacee02452244ee14ab3c43bc485a"
+                "reference": "b56450eed252f6801410d810c8e1727224ae0743"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/87337c91b9dfacee02452244ee14ab3c43bc485a",
-                "reference": "87337c91b9dfacee02452244ee14ab3c43bc485a",
+                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b56450eed252f6801410d810c8e1727224ae0743",
+                "reference": "b56450eed252f6801410d810c8e1727224ae0743",
                 "shasum": ""
             },
             "require": {
@@ -12479,7 +12296,7 @@
             ],
             "support": {
                 "issues": "https://github.com/voku/portable-ascii/issues",
-                "source": "https://github.com/voku/portable-ascii/tree/1.6.1"
+                "source": "https://github.com/voku/portable-ascii/tree/2.0.1"
             },
             "funding": [
                 {
@@ -12503,7 +12320,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-24T18:55:24+00:00"
+            "time": "2022-03-08T17:03:00+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -12680,105 +12497,48 @@
                 "source": "https://github.com/wepay/PHP-SDK/tree/master"
             },
             "time": "2017-01-21T07:03:26+00:00"
-        },
-        {
-            "name": "wildbit/swiftmailer-postmark",
-            "version": "3.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/wildbit/swiftmailer-postmark.git",
-                "reference": "44ccab7834de8b220d292647ecb2cb683f9962ee"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/wildbit/swiftmailer-postmark/zipball/44ccab7834de8b220d292647ecb2cb683f9962ee",
-                "reference": "44ccab7834de8b220d292647ecb2cb683f9962ee",
-                "shasum": ""
-            },
-            "require": {
-                "guzzlehttp/guzzle": "^6.0|^7.0",
-                "swiftmailer/swiftmailer": "^6.0.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Postmark\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Postmark",
-                    "email": "support@postmarkapp.com"
-                }
-            ],
-            "description": "A Swiftmailer Transport for Postmark.",
-            "support": {
-                "issues": "https://github.com/wildbit/swiftmailer-postmark/issues",
-                "source": "https://github.com/wildbit/swiftmailer-postmark/tree/3.3.0"
-            },
-            "time": "2020-09-10T10:54:20+00:00"
         }
     ],
     "packages-dev": [
         {
-            "name": "anahkiasen/former",
-            "version": "4.7.0",
+            "name": "amphp/amp",
+            "version": "v2.6.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/formers/former.git",
-                "reference": "9a88328390abc3add9fb01136688a19b215e6760"
+                "url": "https://github.com/amphp/amp.git",
+                "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/formers/former/zipball/9a88328390abc3add9fb01136688a19b215e6760",
-                "reference": "9a88328390abc3add9fb01136688a19b215e6760",
+                "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb",
+                "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb",
                 "shasum": ""
             },
             "require": {
-                "anahkiasen/html-object": "~1.4",
-                "illuminate/config": "^5.1.3|^6.0|^7.0|^8.0|^9.0",
-                "illuminate/container": "^5.1.3|^6.0|^7.0|^8.0|^9.0",
-                "illuminate/contracts": "^5.1.3|^6.0|^7.0|^8.0|^9.0",
-                "illuminate/http": "^5.1.3|^6.0|^7.0|^8.0|^9.0",
-                "illuminate/routing": "^5.1.3|^6.0|^7.0|^8.0|^9.0",
-                "illuminate/session": "^5.1.3|^6.0|^7.0|^8.0|^9.0",
-                "illuminate/support": "^5.1.3|^6.0|^7.0|^8.0|^9.0",
-                "illuminate/translation": "^5.1.3|^6.0|^7.0|^8.0|^9.0",
-                "php": "^7.2|^8.0"
+                "php": ">=7.1"
             },
             "require-dev": {
-                "illuminate/database": "^5.1.3|^6.0|^7.0|^8.0|^9.0",
-                "mockery/mockery": "^1.3",
-                "phpunit/phpunit": "^8.5"
+                "amphp/php-cs-fixer-config": "dev-master",
+                "amphp/phpunit-util": "^1",
+                "ext-json": "*",
+                "jetbrains/phpstorm-stubs": "^2019.3",
+                "phpunit/phpunit": "^7 | ^8 | ^9",
+                "psalm/phar": "^3.11@dev",
+                "react/promise": "^2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.1-dev"
-                },
-                "laravel": {
-                    "providers": [
-                        "Former\\FormerServiceProvider"
-                    ],
-                    "aliases": {
-                        "Former": "Former\\Facades\\Former"
-                    }
+                    "dev-master": "2.x-dev"
                 }
             },
             "autoload": {
+                "files": [
+                    "lib/functions.php",
+                    "lib/Internal/functions.php"
+                ],
                 "psr-4": {
-                    "Former\\": [
-                        "src/Former",
-                        "tests"
-                    ],
-                    "Laravel\\": "src/Laravel"
+                    "Amp\\": "lib"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -12787,51 +12547,86 @@
             ],
             "authors": [
                 {
-                    "name": "Maxime Fabre",
-                    "email": "ehtnam6@gmail.com"
+                    "name": "Daniel Lowrey",
+                    "email": "rdlowrey@php.net"
+                },
+                {
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Bob Weinand",
+                    "email": "bobwei9@hotmail.com"
+                },
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
                 }
             ],
-            "description": "A powerful form builder",
-            "homepage": "http://formers.github.io/former/",
+            "description": "A non-blocking concurrency framework for PHP applications.",
+            "homepage": "https://amphp.org/amp",
             "keywords": [
-                "bootstrap",
-                "form",
-                "foundation",
-                "laravel"
+                "async",
+                "asynchronous",
+                "awaitable",
+                "concurrency",
+                "event",
+                "event-loop",
+                "future",
+                "non-blocking",
+                "promise"
             ],
             "support": {
-                "issues": "https://github.com/formers/former/issues",
-                "source": "https://github.com/formers/former/tree/4.7.0"
+                "irc": "irc://irc.freenode.org/amphp",
+                "issues": "https://github.com/amphp/amp/issues",
+                "source": "https://github.com/amphp/amp/tree/v2.6.2"
             },
-            "time": "2022-02-17T11:50:58+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-02-20T17:52:18+00:00"
         },
         {
-            "name": "anahkiasen/html-object",
-            "version": "1.4.4",
+            "name": "amphp/byte-stream",
+            "version": "v1.8.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Anahkiasen/html-object.git",
-                "reference": "45bb54b91112c064d3906c207259d5c8dcba798f"
+                "url": "https://github.com/amphp/byte-stream.git",
+                "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Anahkiasen/html-object/zipball/45bb54b91112c064d3906c207259d5c8dcba798f",
-                "reference": "45bb54b91112c064d3906c207259d5c8dcba798f",
+                "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd",
+                "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "amphp/amp": "^2",
+                "php": ">=7.1"
             },
             "require-dev": {
-                "madewithlove/php-cs-fixer-config": "^1.3",
-                "phpunit/phpunit": "^4.8",
-                "phpunit/phpunit-dom-assertions": "^0.1.0",
-                "symfony/css-selector": "^2.6"
+                "amphp/php-cs-fixer-config": "dev-master",
+                "amphp/phpunit-util": "^1.4",
+                "friendsofphp/php-cs-fixer": "^2.3",
+                "jetbrains/phpstorm-stubs": "^2019.3",
+                "phpunit/phpunit": "^6 || ^7 || ^8",
+                "psalm/phar": "^3.11.4"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
             "autoload": {
+                "files": [
+                    "lib/functions.php"
+                ],
                 "psr-4": {
-                    "HtmlObject\\": "src"
+                    "Amp\\ByteStream\\": "lib"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -12840,16 +12635,36 @@
             ],
             "authors": [
                 {
-                    "name": "Anahkiasen",
-                    "email": "ehtnam6@gmail.com"
+                    "name": "Aaron Piotrowski",
+                    "email": "aaron@trowski.com"
+                },
+                {
+                    "name": "Niklas Keller",
+                    "email": "me@kelunik.com"
                 }
             ],
-            "description": "A set of classes to create and manipulate HTML objects abstractions",
+            "description": "A stream abstraction to make working with non-blocking I/O simple.",
+            "homepage": "http://amphp.org/byte-stream",
+            "keywords": [
+                "amp",
+                "amphp",
+                "async",
+                "io",
+                "non-blocking",
+                "stream"
+            ],
             "support": {
-                "issues": "https://github.com/Anahkiasen/html-object/issues",
-                "source": "https://github.com/Anahkiasen/html-object/tree/master"
+                "irc": "irc://irc.freenode.org/amphp",
+                "issues": "https://github.com/amphp/byte-stream/issues",
+                "source": "https://github.com/amphp/byte-stream/tree/v1.8.1"
             },
-            "time": "2017-05-31T07:52:45+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/amphp",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-03-30T17:13:30+00:00"
         },
         {
             "name": "barryvdh/laravel-debugbar",
@@ -12936,17 +12751,77 @@
             "time": "2022-07-11T09:26:42+00:00"
         },
         {
-            "name": "brianium/paratest",
-            "version": "v6.6.0",
+            "name": "beyondcode/laravel-query-detector",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/paratestphp/paratest.git",
-                "reference": "bce7b965a5fe5028a53c3151042ca12777600acd"
+                "url": "https://github.com/beyondcode/laravel-query-detector.git",
+                "reference": "8261d80c71c97e994c1021fe5c3bd2a1c27106fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paratestphp/paratest/zipball/bce7b965a5fe5028a53c3151042ca12777600acd",
-                "reference": "bce7b965a5fe5028a53c3151042ca12777600acd",
+                "url": "https://api.github.com/repos/beyondcode/laravel-query-detector/zipball/8261d80c71c97e994c1021fe5c3bd2a1c27106fc",
+                "reference": "8261d80c71c97e994c1021fe5c3bd2a1c27106fc",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/support": "^5.5 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "laravel/legacy-factories": "^1.0",
+                "orchestra/testbench": "^3.0 || ^4.0 || ^5.0 || ^6.0",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "BeyondCode\\QueryDetector\\QueryDetectorServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "BeyondCode\\QueryDetector\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marcel Pociot",
+                    "email": "marcel@beyondco.de",
+                    "homepage": "https://beyondcode.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Laravel N+1 Query Detector",
+            "homepage": "https://github.com/beyondcode/laravel-query-detector",
+            "keywords": [
+                "beyondcode",
+                "laravel-query-detector"
+            ],
+            "support": {
+                "issues": "https://github.com/beyondcode/laravel-query-detector/issues",
+                "source": "https://github.com/beyondcode/laravel-query-detector/tree/1.6.0"
+            },
+            "time": "2022-02-12T16:23:40+00:00"
+        },
+        {
+            "name": "brianium/paratest",
+            "version": "v6.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paratestphp/paratest.git",
+                "reference": "ae5803ce4558f855c7d955baa2d90b93ec40c4b7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paratestphp/paratest/zipball/ae5803ce4558f855c7d955baa2d90b93ec40c4b7",
+                "reference": "ae5803ce4558f855c7d955baa2d90b93ec40c4b7",
                 "shasum": ""
             },
             "require": {
@@ -13013,7 +12888,7 @@
             ],
             "support": {
                 "issues": "https://github.com/paratestphp/paratest/issues",
-                "source": "https://github.com/paratestphp/paratest/tree/v6.6.0"
+                "source": "https://github.com/paratestphp/paratest/tree/v6.6.1"
             },
             "funding": [
                 {
@@ -13025,34 +12900,107 @@
                     "type": "paypal"
                 }
             ],
-            "time": "2022-07-12T07:15:58+00:00"
+            "time": "2022-07-22T14:07:17+00:00"
         },
         {
-            "name": "composer/pcre",
-            "version": "1.0.1",
+            "name": "composer/package-versions-deprecated",
+            "version": "1.11.99.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/composer/pcre.git",
-                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560"
+                "url": "https://github.com/composer/package-versions-deprecated.git",
+                "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560",
-                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560",
+                "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b4f54f74ef3453349c24a845d22392cd31e65f1d",
+                "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
+                "composer-plugin-api": "^1.1.0 || ^2.0",
+                "php": "^7 || ^8"
+            },
+            "replace": {
+                "ocramius/package-versions": "1.11.99"
+            },
+            "require-dev": {
+                "composer/composer": "^1.9.3 || ^2.0@dev",
+                "ext-zip": "^1.13",
+                "phpunit/phpunit": "^6.5 || ^7"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "PackageVersions\\Installer",
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PackageVersions\\": "src/PackageVersions"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com"
+                },
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be"
+                }
+            ],
+            "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
+            "support": {
+                "issues": "https://github.com/composer/package-versions-deprecated/issues",
+                "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.5"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-01-17T14:14:24+00:00"
+        },
+        {
+            "name": "composer/pcre",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/pcre.git",
+                "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/e300eb6c535192decd27a85bc72a9290f0d6b3bd",
+                "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
                 "phpstan/phpstan": "^1.3",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "symfony/phpunit-bridge": "^5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.x-dev"
+                    "dev-main": "3.x-dev"
                 }
             },
             "autoload": {
@@ -13080,7 +13028,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/1.0.1"
+                "source": "https://github.com/composer/pcre/tree/3.0.0"
             },
             "funding": [
                 {
@@ -13096,7 +13044,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-21T20:24:37+00:00"
+            "time": "2022-02-25T20:21:48+00:00"
         },
         {
             "name": "composer/semver",
@@ -13181,27 +13129,27 @@
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "2.0.5",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a"
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/9e36aeed4616366d2b690bdce11f71e9178c579a",
-                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
                 "shasum": ""
             },
             "require": {
-                "composer/pcre": "^1",
-                "php": "^5.3.2 || ^7.0 || ^8.0",
+                "composer/pcre": "^1 || ^2 || ^3",
+                "php": "^7.2.5 || ^8.0",
                 "psr/log": "^1 || ^2 || ^3"
             },
             "require-dev": {
                 "phpstan/phpstan": "^1.0",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0"
+                "symfony/phpunit-bridge": "^6.0"
             },
             "type": "library",
             "autoload": {
@@ -13227,7 +13175,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/2.0.5"
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
             },
             "funding": [
                 {
@@ -13243,7 +13191,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-24T20:20:32+00:00"
+            "time": "2022-02-25T21:32:43+00:00"
         },
         {
             "name": "darkaonline/l5-swagger",
@@ -13324,6 +13272,43 @@
             ],
             "time": "2022-01-07T09:08:44+00:00"
         },
+        {
+            "name": "dnoegel/php-xdg-base-dir",
+            "version": "v0.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/dnoegel/php-xdg-base-dir.git",
+                "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/dnoegel/php-xdg-base-dir/zipball/8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
+                "reference": "8f8a6e48c5ecb0f991c2fdcf5f154a47d85f9ffd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~7.0|~6.0|~5.0|~4.8.35"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "XdgBaseDir\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "implementation of xdg base directory specification for php",
+            "support": {
+                "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues",
+                "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1"
+            },
+            "time": "2019-12-04T15:06:13+00:00"
+        },
         {
             "name": "doctrine/annotations",
             "version": "1.13.3",
@@ -13467,149 +13452,6 @@
             ],
             "time": "2022-03-03T08:28:38+00:00"
         },
-        {
-            "name": "facade/flare-client-php",
-            "version": "1.9.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/facade/flare-client-php.git",
-                "reference": "b2adf1512755637d0cef4f7d1b54301325ac78ed"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/facade/flare-client-php/zipball/b2adf1512755637d0cef4f7d1b54301325ac78ed",
-                "reference": "b2adf1512755637d0cef4f7d1b54301325ac78ed",
-                "shasum": ""
-            },
-            "require": {
-                "facade/ignition-contracts": "~1.0",
-                "illuminate/pipeline": "^5.5|^6.0|^7.0|^8.0",
-                "php": "^7.1|^8.0",
-                "symfony/http-foundation": "^3.3|^4.1|^5.0",
-                "symfony/mime": "^3.4|^4.0|^5.1",
-                "symfony/var-dumper": "^3.4|^4.0|^5.0"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.14",
-                "phpunit/phpunit": "^7.5.16",
-                "spatie/phpunit-snapshot-assertions": "^2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/helpers.php"
-                ],
-                "psr-4": {
-                    "Facade\\FlareClient\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Send PHP errors to Flare",
-            "homepage": "https://github.com/facade/flare-client-php",
-            "keywords": [
-                "exception",
-                "facade",
-                "flare",
-                "reporting"
-            ],
-            "support": {
-                "issues": "https://github.com/facade/flare-client-php/issues",
-                "source": "https://github.com/facade/flare-client-php/tree/1.9.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/spatie",
-                    "type": "github"
-                }
-            ],
-            "time": "2021-09-13T12:16:46+00:00"
-        },
-        {
-            "name": "facade/ignition",
-            "version": "2.17.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/facade/ignition.git",
-                "reference": "6acd82e986a2ecee89e2e68adfc30a1936d1ab7c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/facade/ignition/zipball/6acd82e986a2ecee89e2e68adfc30a1936d1ab7c",
-                "reference": "6acd82e986a2ecee89e2e68adfc30a1936d1ab7c",
-                "shasum": ""
-            },
-            "require": {
-                "ext-curl": "*",
-                "ext-json": "*",
-                "ext-mbstring": "*",
-                "facade/flare-client-php": "^1.9.1",
-                "facade/ignition-contracts": "^1.0.2",
-                "illuminate/support": "^7.0|^8.0",
-                "monolog/monolog": "^2.0",
-                "php": "^7.2.5|^8.0",
-                "symfony/console": "^5.0",
-                "symfony/var-dumper": "^5.0"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.14",
-                "livewire/livewire": "^2.4",
-                "mockery/mockery": "^1.3",
-                "orchestra/testbench": "^5.0|^6.0",
-                "psalm/plugin-laravel": "^1.2"
-            },
-            "suggest": {
-                "laravel/telescope": "^3.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                },
-                "laravel": {
-                    "providers": [
-                        "Facade\\Ignition\\IgnitionServiceProvider"
-                    ],
-                    "aliases": {
-                        "Flare": "Facade\\Ignition\\Facades\\Flare"
-                    }
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/helpers.php"
-                ],
-                "psr-4": {
-                    "Facade\\Ignition\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "A beautiful error page for Laravel applications.",
-            "homepage": "https://github.com/facade/ignition",
-            "keywords": [
-                "error",
-                "flare",
-                "laravel",
-                "page"
-            ],
-            "support": {
-                "docs": "https://flareapp.io/docs/ignition-for-laravel/introduction",
-                "forum": "https://twitter.com/flareappio",
-                "issues": "https://github.com/facade/ignition/issues",
-                "source": "https://github.com/facade/ignition"
-            },
-            "time": "2022-06-30T18:26:59+00:00"
-        },
         {
             "name": "facade/ignition-contracts",
             "version": "1.0.2",
@@ -13663,6 +13505,107 @@
             },
             "time": "2020-10-16T08:27:54+00:00"
         },
+        {
+            "name": "felixfbecker/advanced-json-rpc",
+            "version": "v3.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git",
+                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447",
+                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447",
+                "shasum": ""
+            },
+            "require": {
+                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
+                "php": "^7.1 || ^8.0",
+                "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.0 || ^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "AdvancedJsonRpc\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "ISC"
+            ],
+            "authors": [
+                {
+                    "name": "Felix Becker",
+                    "email": "felix.b@outlook.com"
+                }
+            ],
+            "description": "A more advanced JSONRPC implementation",
+            "support": {
+                "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues",
+                "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1"
+            },
+            "time": "2021-06-11T22:34:44+00:00"
+        },
+        {
+            "name": "felixfbecker/language-server-protocol",
+            "version": "v1.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/felixfbecker/php-language-server-protocol.git",
+                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842",
+                "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "*",
+                "squizlabs/php_codesniffer": "^3.1",
+                "vimeo/psalm": "^4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "LanguageServerProtocol\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "ISC"
+            ],
+            "authors": [
+                {
+                    "name": "Felix Becker",
+                    "email": "felix.b@outlook.com"
+                }
+            ],
+            "description": "PHP classes for the Language Server Protocol",
+            "keywords": [
+                "language",
+                "microsoft",
+                "php",
+                "server"
+            ],
+            "support": {
+                "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues",
+                "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.2"
+            },
+            "time": "2022-03-02T22:36:06+00:00"
+        },
         {
             "name": "filp/whoops",
             "version": "2.14.5",
@@ -13734,115 +13677,6 @@
             ],
             "time": "2022-01-07T12:00:00+00:00"
         },
-        {
-            "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.19.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/75ac86f33fab4714ea5a39a396784d83ae3b5ed8",
-                "reference": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8",
-                "shasum": ""
-            },
-            "require": {
-                "composer/semver": "^1.4 || ^2.0 || ^3.0",
-                "composer/xdebug-handler": "^1.2 || ^2.0",
-                "doctrine/annotations": "^1.2",
-                "ext-json": "*",
-                "ext-tokenizer": "*",
-                "php": "^5.6 || ^7.0 || ^8.0",
-                "php-cs-fixer/diff": "^1.3",
-                "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0",
-                "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0",
-                "symfony/filesystem": "^3.0 || ^4.0 || ^5.0",
-                "symfony/finder": "^3.0 || ^4.0 || ^5.0",
-                "symfony/options-resolver": "^3.0 || ^4.0 || ^5.0",
-                "symfony/polyfill-php70": "^1.0",
-                "symfony/polyfill-php72": "^1.4",
-                "symfony/process": "^3.0 || ^4.0 || ^5.0",
-                "symfony/stopwatch": "^3.0 || ^4.0 || ^5.0"
-            },
-            "require-dev": {
-                "justinrainbow/json-schema": "^5.0",
-                "keradus/cli-executor": "^1.4",
-                "mikey179/vfsstream": "^1.6",
-                "php-coveralls/php-coveralls": "^2.4.2",
-                "php-cs-fixer/accessible-object": "^1.0",
-                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
-                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
-                "phpspec/prophecy-phpunit": "^1.1 || ^2.0",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.13 || ^9.5",
-                "phpunitgoodpractices/polyfill": "^1.5",
-                "phpunitgoodpractices/traits": "^1.9.1",
-                "sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1",
-                "symfony/phpunit-bridge": "^5.2.1",
-                "symfony/yaml": "^3.0 || ^4.0 || ^5.0"
-            },
-            "suggest": {
-                "ext-dom": "For handling output formats in XML",
-                "ext-mbstring": "For handling non-UTF8 characters.",
-                "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
-                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
-                "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
-            },
-            "bin": [
-                "php-cs-fixer"
-            ],
-            "type": "application",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.19-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "PhpCsFixer\\": "src/"
-                },
-                "classmap": [
-                    "tests/Test/AbstractFixerTestCase.php",
-                    "tests/Test/AbstractIntegrationCaseFactory.php",
-                    "tests/Test/AbstractIntegrationTestCase.php",
-                    "tests/Test/Assert/AssertTokensTrait.php",
-                    "tests/Test/IntegrationCase.php",
-                    "tests/Test/IntegrationCaseFactory.php",
-                    "tests/Test/IntegrationCaseFactoryInterface.php",
-                    "tests/Test/InternalIntegrationCaseFactory.php",
-                    "tests/Test/IsIdenticalConstraint.php",
-                    "tests/Test/TokensWithObservedTransformers.php",
-                    "tests/TestCase.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Dariusz Rumiński",
-                    "email": "dariusz.ruminski@gmail.com"
-                }
-            ],
-            "description": "A tool to automatically fix PHP code style",
-            "support": {
-                "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
-                "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.19.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/keradus",
-                    "type": "github"
-                }
-            ],
-            "time": "2021-11-15T17:17:55+00:00"
-        },
         {
             "name": "hamcrest/hamcrest-php",
             "version": "v2.0.1",
@@ -13896,16 +13730,16 @@
         },
         {
             "name": "laravel/dusk",
-            "version": "v6.25.0",
+            "version": "v6.25.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/dusk.git",
-                "reference": "b4632b7493a187d31afc5c9ddec437c81b16421a"
+                "reference": "cd93e41d610965842e4b61f4691a0a0889737790"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/dusk/zipball/b4632b7493a187d31afc5c9ddec437c81b16421a",
-                "reference": "b4632b7493a187d31afc5c9ddec437c81b16421a",
+                "url": "https://api.github.com/repos/laravel/dusk/zipball/cd93e41d610965842e4b61f4691a0a0889737790",
+                "reference": "cd93e41d610965842e4b61f4691a0a0889737790",
                 "shasum": ""
             },
             "require": {
@@ -13963,9 +13797,9 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/dusk/issues",
-                "source": "https://github.com/laravel/dusk/tree/v6.25.0"
+                "source": "https://github.com/laravel/dusk/tree/v6.25.1"
             },
-            "time": "2022-07-11T11:38:43+00:00"
+            "time": "2022-07-25T13:51:51+00:00"
         },
         {
             "name": "maximebf/debugbar",
@@ -14165,38 +13999,90 @@
             "time": "2022-03-03T13:19:32+00:00"
         },
         {
-            "name": "nunomaduro/collision",
-            "version": "v5.11.0",
+            "name": "netresearch/jsonmapper",
+            "version": "v4.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "8b610eef8582ccdc05d8f2ab23305e2d37049461"
+                "url": "https://github.com/cweiske/jsonmapper.git",
+                "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/8b610eef8582ccdc05d8f2ab23305e2d37049461",
-                "reference": "8b610eef8582ccdc05d8f2ab23305e2d37049461",
+                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d",
+                "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d",
                 "shasum": ""
             },
             "require": {
-                "facade/ignition-contracts": "^1.0",
-                "filp/whoops": "^2.14.3",
-                "php": "^7.3 || ^8.0",
-                "symfony/console": "^5.0"
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=7.1"
             },
             "require-dev": {
-                "brianium/paratest": "^6.1",
-                "fideloper/proxy": "^4.4.1",
-                "fruitcake/laravel-cors": "^2.0.3",
-                "laravel/framework": "8.x-dev",
-                "nunomaduro/larastan": "^0.6.2",
-                "nunomaduro/mock-final-classes": "^1.0",
-                "orchestra/testbench": "^6.0",
-                "phpstan/phpstan": "^0.12.64",
-                "phpunit/phpunit": "^9.5.0"
+                "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0",
+                "squizlabs/php_codesniffer": "~3.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "JsonMapper": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "OSL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Weiske",
+                    "email": "cweiske@cweiske.de",
+                    "homepage": "http://github.com/cweiske/jsonmapper/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Map nested JSON structures onto PHP classes",
+            "support": {
+                "email": "cweiske@cweiske.de",
+                "issues": "https://github.com/cweiske/jsonmapper/issues",
+                "source": "https://github.com/cweiske/jsonmapper/tree/v4.0.0"
+            },
+            "time": "2020-12-01T19:48:11+00:00"
+        },
+        {
+            "name": "nunomaduro/collision",
+            "version": "v6.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nunomaduro/collision.git",
+                "reference": "5f058f7e39278b701e455b3c82ec5298cf001d89"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/5f058f7e39278b701e455b3c82ec5298cf001d89",
+                "reference": "5f058f7e39278b701e455b3c82ec5298cf001d89",
+                "shasum": ""
+            },
+            "require": {
+                "facade/ignition-contracts": "^1.0.2",
+                "filp/whoops": "^2.14.5",
+                "php": "^8.0.0",
+                "symfony/console": "^6.0.2"
+            },
+            "require-dev": {
+                "brianium/paratest": "^6.4.1",
+                "laravel/framework": "^9.7",
+                "laravel/pint": "^0.2.1",
+                "nunomaduro/larastan": "^1.0.2",
+                "nunomaduro/mock-final-classes": "^1.1.0",
+                "orchestra/testbench": "^7.3.0",
+                "phpunit/phpunit": "^9.5.11"
             },
             "type": "library",
             "extra": {
+                "branch-alias": {
+                    "dev-develop": "6.x-dev"
+                },
                 "laravel": {
                     "providers": [
                         "NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider"
@@ -14249,7 +14135,60 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2022-01-10T16:22:52+00:00"
+            "time": "2022-06-27T16:11:16+00:00"
+        },
+        {
+            "name": "openlss/lib-array2xml",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nullivex/lib-array2xml.git",
+                "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nullivex/lib-array2xml/zipball/a91f18a8dfc69ffabe5f9b068bc39bb202c81d90",
+                "reference": "a91f18a8dfc69ffabe5f9b068bc39bb202c81d90",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "LSS": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Bryan Tong",
+                    "email": "bryan@nullivex.com",
+                    "homepage": "https://www.nullivex.com"
+                },
+                {
+                    "name": "Tony Butler",
+                    "email": "spudz76@gmail.com",
+                    "homepage": "https://www.nullivex.com"
+                }
+            ],
+            "description": "Array2XML conversion library credit to lalit.org",
+            "homepage": "https://www.nullivex.com",
+            "keywords": [
+                "array",
+                "array conversion",
+                "xml",
+                "xml conversion"
+            ],
+            "support": {
+                "issues": "https://github.com/nullivex/lib-array2xml/issues",
+                "source": "https://github.com/nullivex/lib-array2xml/tree/master"
+            },
+            "time": "2019-03-29T20:06:56+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -14362,61 +14301,6 @@
             },
             "time": "2022-02-21T01:04:05+00:00"
         },
-        {
-            "name": "php-cs-fixer/diff",
-            "version": "v1.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHP-CS-Fixer/diff.git",
-                "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/dbd31aeb251639ac0b9e7e29405c1441907f5759",
-                "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0",
-                "symfony/process": "^3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "SpacePossum"
-                }
-            ],
-            "description": "sebastian/diff v2 backport support for PHP5.6",
-            "homepage": "https://github.com/PHP-CS-Fixer",
-            "keywords": [
-                "diff"
-            ],
-            "support": {
-                "issues": "https://github.com/PHP-CS-Fixer/diff/issues",
-                "source": "https://github.com/PHP-CS-Fixer/diff/tree/v1.3.1"
-            },
-            "time": "2020-10-14T08:39:05+00:00"
-        },
         {
             "name": "php-webdriver/webdriver",
             "version": "1.12.1",
@@ -16093,6 +15977,302 @@
             ],
             "time": "2020-09-28T06:39:44+00:00"
         },
+        {
+            "name": "spatie/backtrace",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/backtrace.git",
+                "reference": "4ee7d41aa5268107906ea8a4d9ceccde136dbd5b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/backtrace/zipball/4ee7d41aa5268107906ea8a4d9ceccde136dbd5b",
+                "reference": "4ee7d41aa5268107906ea8a4d9ceccde136dbd5b",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3|^8.0"
+            },
+            "require-dev": {
+                "ext-json": "*",
+                "phpunit/phpunit": "^9.3",
+                "symfony/var-dumper": "^5.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Spatie\\Backtrace\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Freek Van de Herten",
+                    "email": "freek@spatie.be",
+                    "homepage": "https://spatie.be",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A better backtrace",
+            "homepage": "https://github.com/spatie/backtrace",
+            "keywords": [
+                "Backtrace",
+                "spatie"
+            ],
+            "support": {
+                "issues": "https://github.com/spatie/backtrace/issues",
+                "source": "https://github.com/spatie/backtrace/tree/1.2.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/spatie",
+                    "type": "github"
+                },
+                {
+                    "url": "https://spatie.be/open-source/support-us",
+                    "type": "other"
+                }
+            ],
+            "time": "2021-11-09T10:57:15+00:00"
+        },
+        {
+            "name": "spatie/flare-client-php",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/flare-client-php.git",
+                "reference": "86a380f5b1ce839af04a08f1c8f2697184cdf23f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/86a380f5b1ce839af04a08f1c8f2697184cdf23f",
+                "reference": "86a380f5b1ce839af04a08f1c8f2697184cdf23f",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/pipeline": "^8.0|^9.0",
+                "php": "^8.0",
+                "spatie/backtrace": "^1.2",
+                "symfony/http-foundation": "^5.0|^6.0",
+                "symfony/mime": "^5.2|^6.0",
+                "symfony/process": "^5.2|^6.0",
+                "symfony/var-dumper": "^5.2|^6.0"
+            },
+            "require-dev": {
+                "dms/phpunit-arraysubset-asserts": "^0.3.0",
+                "pestphp/pest": "^1.20",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan-deprecation-rules": "^1.0",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "spatie/phpunit-snapshot-assertions": "^4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/helpers.php"
+                ],
+                "psr-4": {
+                    "Spatie\\FlareClient\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Send PHP errors to Flare",
+            "homepage": "https://github.com/spatie/flare-client-php",
+            "keywords": [
+                "exception",
+                "flare",
+                "reporting",
+                "spatie"
+            ],
+            "support": {
+                "issues": "https://github.com/spatie/flare-client-php/issues",
+                "source": "https://github.com/spatie/flare-client-php/tree/1.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/spatie",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-05-16T12:13:39+00:00"
+        },
+        {
+            "name": "spatie/ignition",
+            "version": "1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/ignition.git",
+                "reference": "997363fbcce809b1e55f571997d49017f9c623d9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/ignition/zipball/997363fbcce809b1e55f571997d49017f9c623d9",
+                "reference": "997363fbcce809b1e55f571997d49017f9c623d9",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "monolog/monolog": "^2.0",
+                "php": "^8.0",
+                "spatie/flare-client-php": "^1.1",
+                "symfony/console": "^5.4|^6.0",
+                "symfony/var-dumper": "^5.4|^6.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.4",
+                "pestphp/pest": "^1.20",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan-deprecation-rules": "^1.0",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "symfony/process": "^5.4|^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Spatie\\Ignition\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Spatie",
+                    "email": "info@spatie.be",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A beautiful error page for PHP applications.",
+            "homepage": "https://flareapp.io/ignition",
+            "keywords": [
+                "error",
+                "flare",
+                "laravel",
+                "page"
+            ],
+            "support": {
+                "docs": "https://flareapp.io/docs/ignition-for-laravel/introduction",
+                "forum": "https://twitter.com/flareappio",
+                "issues": "https://github.com/spatie/ignition/issues",
+                "source": "https://github.com/spatie/ignition"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/spatie",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-05-16T13:16:07+00:00"
+        },
+        {
+            "name": "spatie/laravel-ignition",
+            "version": "1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/laravel-ignition.git",
+                "reference": "fe37a0eafe6ea040804255c70e9808af13314f87"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/fe37a0eafe6ea040804255c70e9808af13314f87",
+                "reference": "fe37a0eafe6ea040804255c70e9808af13314f87",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "illuminate/support": "^8.77|^9.0",
+                "monolog/monolog": "^2.3",
+                "php": "^8.0",
+                "spatie/flare-client-php": "^1.0.1",
+                "spatie/ignition": "^1.2.4",
+                "symfony/console": "^5.0|^6.0",
+                "symfony/var-dumper": "^5.0|^6.0"
+            },
+            "require-dev": {
+                "filp/whoops": "^2.14",
+                "livewire/livewire": "^2.8|dev-develop",
+                "mockery/mockery": "^1.4",
+                "nunomaduro/larastan": "^1.0",
+                "orchestra/testbench": "^6.23|^7.0",
+                "pestphp/pest": "^1.20",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan-deprecation-rules": "^1.0",
+                "phpstan/phpstan-phpunit": "^1.0",
+                "spatie/laravel-ray": "^1.27"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Spatie\\LaravelIgnition\\IgnitionServiceProvider"
+                    ],
+                    "aliases": {
+                        "Flare": "Spatie\\LaravelIgnition\\Facades\\Flare"
+                    }
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/helpers.php"
+                ],
+                "psr-4": {
+                    "Spatie\\LaravelIgnition\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Spatie",
+                    "email": "info@spatie.be",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A beautiful error page for Laravel applications.",
+            "homepage": "https://flareapp.io/ignition",
+            "keywords": [
+                "error",
+                "flare",
+                "laravel",
+                "page"
+            ],
+            "support": {
+                "docs": "https://flareapp.io/docs/ignition-for-laravel/introduction",
+                "forum": "https://twitter.com/flareappio",
+                "issues": "https://github.com/spatie/laravel-ignition/issues",
+                "source": "https://github.com/spatie/laravel-ignition"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/spatie",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-06-17T06:28:57+00:00"
+        },
         {
             "name": "swagger-api/swagger-ui",
             "version": "v3.52.5",
@@ -16154,148 +16334,18 @@
             },
             "time": "2021-10-14T14:25:14+00:00"
         },
-        {
-            "name": "symfony/polyfill-php70",
-            "version": "v1.20.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644",
-                "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "metapackage",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.20-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php70/tree/v1.20.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-23T14:02:19+00:00"
-        },
-        {
-            "name": "symfony/stopwatch",
-            "version": "v5.4.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/4d04b5c24f3c9a1a168a131f6cbe297155bc0d30",
-                "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "symfony/service-contracts": "^1|^2|^3"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Stopwatch\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides a way to profile code",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v5.4.5"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-02-18T16:06:09+00:00"
-        },
         {
             "name": "symfony/yaml",
-            "version": "v5.4.10",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "04e42926429d9e8b39c174387ab990bf7817f7a2"
+                "reference": "05d4ea560f3402c6c116afd99fdc66e60eda227e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/04e42926429d9e8b39c174387ab990bf7817f7a2",
-                "reference": "04e42926429d9e8b39c174387ab990bf7817f7a2",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/05d4ea560f3402c6c116afd99fdc66e60eda227e",
+                "reference": "05d4ea560f3402c6c116afd99fdc66e60eda227e",
                 "shasum": ""
             },
             "require": {
@@ -16341,7 +16391,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v5.4.10"
+                "source": "https://github.com/symfony/yaml/tree/v5.4.11"
             },
             "funding": [
                 {
@@ -16357,7 +16407,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-20T11:50:59+00:00"
+            "time": "2022-06-27T16:58:25+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -16409,6 +16459,164 @@
             ],
             "time": "2021-07-28T10:34:58+00:00"
         },
+        {
+            "name": "vimeo/psalm",
+            "version": "4.26.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/vimeo/psalm.git",
+                "reference": "6998fabb2bf528b65777bf9941920888d23c03ac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/6998fabb2bf528b65777bf9941920888d23c03ac",
+                "reference": "6998fabb2bf528b65777bf9941920888d23c03ac",
+                "shasum": ""
+            },
+            "require": {
+                "amphp/amp": "^2.4.2",
+                "amphp/byte-stream": "^1.5",
+                "composer/package-versions-deprecated": "^1.8.0",
+                "composer/semver": "^1.4 || ^2.0 || ^3.0",
+                "composer/xdebug-handler": "^1.1 || ^2.0 || ^3.0",
+                "dnoegel/php-xdg-base-dir": "^0.1.1",
+                "ext-ctype": "*",
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "felixfbecker/advanced-json-rpc": "^3.0.3",
+                "felixfbecker/language-server-protocol": "^1.5",
+                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
+                "nikic/php-parser": "^4.13",
+                "openlss/lib-array2xml": "^1.0",
+                "php": "^7.1|^8",
+                "sebastian/diff": "^3.0 || ^4.0",
+                "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0 || ^6.0",
+                "symfony/polyfill-php80": "^1.25",
+                "webmozart/path-util": "^2.3"
+            },
+            "provide": {
+                "psalm/psalm": "self.version"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.2",
+                "brianium/paratest": "^4.0||^6.0",
+                "ext-curl": "*",
+                "php-parallel-lint/php-parallel-lint": "^1.2",
+                "phpdocumentor/reflection-docblock": "^5",
+                "phpmyadmin/sql-parser": "5.1.0||dev-master",
+                "phpspec/prophecy": ">=1.9.0",
+                "phpunit/phpunit": "^9.0",
+                "psalm/plugin-phpunit": "^0.16",
+                "slevomat/coding-standard": "^7.0",
+                "squizlabs/php_codesniffer": "^3.5",
+                "symfony/process": "^4.3 || ^5.0 || ^6.0",
+                "weirdan/prophecy-shim": "^1.0 || ^2.0"
+            },
+            "suggest": {
+                "ext-curl": "In order to send data to shepherd",
+                "ext-igbinary": "^2.0.5 is required, used to serialize caching data"
+            },
+            "bin": [
+                "psalm",
+                "psalm-language-server",
+                "psalm-plugin",
+                "psalm-refactor",
+                "psalter"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.x-dev",
+                    "dev-3.x": "3.x-dev",
+                    "dev-2.x": "2.x-dev",
+                    "dev-1.x": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions.php",
+                    "src/spl_object_id.php"
+                ],
+                "psr-4": {
+                    "Psalm\\": "src/Psalm/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Matthew Brown"
+                }
+            ],
+            "description": "A static analysis tool for finding errors in PHP applications",
+            "keywords": [
+                "code",
+                "inspection",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/vimeo/psalm/issues",
+                "source": "https://github.com/vimeo/psalm/tree/4.26.0"
+            },
+            "time": "2022-07-31T13:10:26+00:00"
+        },
+        {
+            "name": "webmozart/path-util",
+            "version": "2.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/path-util.git",
+                "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/path-util/zipball/d939f7edc24c9a1bb9c0dee5cb05d8e859490725",
+                "reference": "d939f7edc24c9a1bb9c0dee5cb05d8e859490725",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "webmozart/assert": "~1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6",
+                "sebastian/version": "^1.0.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\PathUtil\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.",
+            "support": {
+                "issues": "https://github.com/webmozart/path-util/issues",
+                "source": "https://github.com/webmozart/path-util/tree/2.3.0"
+            },
+            "abandoned": "symfony/filesystem",
+            "time": "2015-12-17T08:42:14+00:00"
+        },
         {
             "name": "zircote/swagger-php",
             "version": "3.3.6",
@@ -16486,13 +16694,12 @@
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
-        "invoiceninja/inspector": 20,
         "webpatser/laravel-countries": 20
     },
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": "^7.4|^8.0",
+        "php": "^8.1",
         "ext-dom": "*",
         "ext-json": "*",
         "ext-libxml": "*"
@@ -16500,5 +16707,5 @@
     "platform-dev": {
         "php": "^7.4|^8.0"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.1.0"
 }
diff --git a/config/app.php b/config/app.php
index 34a1ce6dc6fb..445a57e65d66 100644
--- a/config/app.php
+++ b/config/app.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Facades\Facade;
+
 return [
 
     /*
@@ -122,6 +124,24 @@ return [
 
     'cipher' => 'AES-256-CBC',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Maintenance Mode Driver
+    |--------------------------------------------------------------------------
+    |
+    | These configuration options determine the driver used to determine and
+    | manage Laravel's "maintenance mode" status. The "cache" driver will
+    | allow maintenance mode to be controlled across multiple machines.
+    |
+    | Supported drivers: "file", "cache"
+    |
+    */
+
+    'maintenance' => [
+        'driver' => 'file',
+        // 'store'  => 'redis',
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Autoloaded Service Providers
@@ -149,8 +169,7 @@ return [
         Illuminate\Filesystem\FilesystemServiceProvider::class,
         Illuminate\Foundation\Providers\FoundationServiceProvider::class,
         Illuminate\Hashing\HashServiceProvider::class,
-        App\Providers\MailServiceProvider::class,
-        //Illuminate\Mail\MailServiceProvider::class,
+        Illuminate\Mail\MailServiceProvider::class,
         Illuminate\Notifications\NotificationServiceProvider::class,
         Illuminate\Pagination\PaginationServiceProvider::class,
         Illuminate\Pipeline\PipelineServiceProvider::class,
@@ -196,49 +215,11 @@ return [
     |
     */
 
-    'aliases' => [
-
-        'App'          => Illuminate\Support\Facades\App::class,
-        'Artisan'      => Illuminate\Support\Facades\Artisan::class,
-        'Auth'         => Illuminate\Support\Facades\Auth::class,
-        'Blade'        => Illuminate\Support\Facades\Blade::class,
-        'Broadcast'    => Illuminate\Support\Facades\Broadcast::class,
-        'Bus'          => Illuminate\Support\Facades\Bus::class,
-        'Cache'        => Illuminate\Support\Facades\Cache::class,
-        'Config'       => Illuminate\Support\Facades\Config::class,
-        'Cookie'       => Illuminate\Support\Facades\Cookie::class,
-        'Crypt'        => Illuminate\Support\Facades\Crypt::class,
-        'DB'           => Illuminate\Support\Facades\DB::class,
-        'Eloquent'     => Illuminate\Database\Eloquent\Model::class,
-        'Event'        => Illuminate\Support\Facades\Event::class,
-        'File'         => Illuminate\Support\Facades\File::class,
-        'Gate'         => Illuminate\Support\Facades\Gate::class,
-        'Hash'         => Illuminate\Support\Facades\Hash::class,
-        'Lang'         => Illuminate\Support\Facades\Lang::class,
-        'Log'          => Illuminate\Support\Facades\Log::class,
-        'Mail'         => Illuminate\Support\Facades\Mail::class,
-        'Notification' => Illuminate\Support\Facades\Notification::class,
-        'Password'     => Illuminate\Support\Facades\Password::class,
-        'Queue'        => Illuminate\Support\Facades\Queue::class,
-        'Redirect'     => Illuminate\Support\Facades\Redirect::class,
-        'Redis'        => Illuminate\Support\Facades\Redis::class,
-        'Request'      => Illuminate\Support\Facades\Request::class,
-        'Response'     => Illuminate\Support\Facades\Response::class,
-        'Route'        => Illuminate\Support\Facades\Route::class,
-        'Schema'       => Illuminate\Support\Facades\Schema::class,
-        'Session'      => Illuminate\Support\Facades\Session::class,
-        'Storage'      => Illuminate\Support\Facades\Storage::class,
-        'URL'          => Illuminate\Support\Facades\URL::class,
-        'Validator'    => Illuminate\Support\Facades\Validator::class,
-        'View'         => Illuminate\Support\Facades\View::class,
-        /*
-         * Dependency Facades
-         */
-
+    'aliases' => Facade::defaultAliases()->merge([
+        'Collector' => Turbo124\Collector\CollectorFacade::class,
         'Countries' => 'Webpatser\Countries\CountriesFacade',
         'CustomMessage' => App\Utils\ClientPortal\CustomMessage\CustomMessageFacade::class,
-        'Collector' => Turbo124\Collector\CollectorFacade::class,
-
-    ],
+        'Redis'        => Illuminate\Support\Facades\Redis::class,
+    ])->toArray(),
 
 ];
diff --git a/config/auth.php b/config/auth.php
index 935bdbb1b52e..6fe6cf598f22 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -31,7 +31,7 @@ return [
     | users are actually retrieved out of your database or other storage
     | mechanisms used by this application to persist your user's data.
     |
-    | Supported: "session", "token"
+    | Supported: "session"
     |
     */
 
@@ -56,6 +56,7 @@ return [
             'driver' => 'session',
             'provider' => 'contacts',
         ],
+
         'vendor' => [
             'driver' => 'session',
             'provider' => 'vendors',
@@ -89,12 +90,12 @@ return [
             'driver' => 'eloquent',
             'model' => App\Models\ClientContact::class,
         ],
+
         'vendors' => [
             'driver' => 'eloquent',
             'model' => App\Models\VendorContact::class,
         ],
 
-
         // 'users' => [
         //     'driver' => 'database',
         //     'table' => 'users',
@@ -110,7 +111,7 @@ return [
     | than one user table or model in the application and you want to have
     | separate password reset settings based on the specific user types.
     |
-    | The expire time is the number of minutes that the reset token should be
+    | The expire time is the number of minutes that each reset token will be
     | considered valid. This security feature keeps tokens short-lived so
     | they have less time to be guessed. You may change this as needed.
     |
@@ -129,6 +130,7 @@ return [
             'table' => 'password_resets',
             'expire' => 60,
         ],
+
         'vendors' => [
             'provider' => 'vendors',
             'table' => 'password_resets',
diff --git a/config/broadcasting.php b/config/broadcasting.php
index d034dccb2178..3d0c7cae8053 100644
--- a/config/broadcasting.php
+++ b/config/broadcasting.php
@@ -11,7 +11,7 @@ return [
     | framework when an event needs to be broadcast. You may set this to
     | any of the connections defined in the "connections" array below.
     |
-    | Supported: "pusher", "redis", "log", "null"
+    | Supported: "pusher", "ably", "redis", "log", "null"
     |
     */
 
@@ -36,9 +36,20 @@ return [
             'secret' => env('PUSHER_APP_SECRET'),
             'app_id' => env('PUSHER_APP_ID'),
             'options' => [
-                'cluster' => env('PUSHER_APP_CLUSTER'),
+                'host' => env('PUSHER_HOST', 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com'),
+                'port' => env('PUSHER_PORT', 443),
+                'scheme' => env('PUSHER_SCHEME', 'https'),
                 'encrypted' => true,
+                'useTLS' => env('PUSHER_SCHEME', 'https') === 'https',
             ],
+            'client_options' => [
+                // Guzzle client options: https://docs.guzzlephp.org/en/stable/request-options.html
+            ],
+        ],
+
+        'ably' => [
+            'driver' => 'ably',
+            'key' => env('ABLY_KEY'),
         ],
 
         'redis' => [
diff --git a/config/cache.php b/config/cache.php
index 58ecd82e65ed..f631b3d4f693 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -13,9 +13,6 @@ return [
     | using this caching library. This connection is used when another is
     | not explicitly specified when executing a given caching function.
     |
-    | Supported: "apc", "array", "database", "file",
-    |            "memcached", "redis", "dynamodb"
-    |
     */
 
     'default' => env('CACHE_DRIVER', 'file'),
@@ -29,6 +26,9 @@ return [
     | well as their drivers. You may even define multiple stores for the
     | same cache driver to group types of items stored in your caches.
     |
+    | Supported drivers: "apc", "array", "database", "file",
+    |         "memcached", "redis", "dynamodb", "octane", "null"
+    |
     */
 
     'stores' => [
@@ -46,6 +46,7 @@ return [
             'driver' => 'database',
             'table' => 'cache',
             'connection' => null,
+            'lock_connection' => null,
         ],
 
         'file' => [
@@ -75,6 +76,7 @@ return [
         'redis' => [
             'driver' => 'redis',
             'connection' => env('REDIS_CACHE_CONNECTION', 'cache'),
+            'lock_connection' => 'default',
         ],
 
         'dynamodb' => [
@@ -86,6 +88,10 @@ return [
             'endpoint' => env('DYNAMODB_ENDPOINT'),
         ],
 
+        'octane' => [
+            'driver' => 'octane',
+        ],
+
     ],
 
     /*
@@ -93,12 +99,12 @@ return [
     | Cache Key Prefix
     |--------------------------------------------------------------------------
     |
-    | When utilizing a RAM based store such as APC or Memcached, there might
-    | be other applications utilizing the same cache. So, we'll specify a
-    | value to get prefixed to all our keys so we can avoid collisions.
+    | When utilizing the APC, database, memcached, Redis, or DynamoDB cache
+    | stores there might be other applications using the same cache. For
+    | that reason, you may prefix every cache key to avoid collisions.
     |
     */
 
-    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
+    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache_'),
 
-];
\ No newline at end of file
+];
diff --git a/config/database.php b/config/database.php
index ae4b3c91430c..9a5e95716ae4 100644
--- a/config/database.php
+++ b/config/database.php
@@ -65,7 +65,7 @@ return [
             'charset'        => 'utf8',
             'prefix'         => '',
             'prefix_indexes' => true,
-            'schema'         => 'public',
+            'search_path'         => 'public',
             'sslmode'        => 'prefer',
         ],
 
@@ -197,7 +197,7 @@ return [
         'sentinel-default' => array_merge(
             array_map(
                 function ($a, $b) {
-                    return ["host" => $a,"port" => $b];
+                    return ['host' => $a, 'port' => $b];
                 },
                 explode(',', env('REDIS_HOST', 'localhost')),
                 explode(',', env('REDIS_PORT', 26379))
@@ -216,7 +216,7 @@ return [
         'sentinel-cache' => array_merge(
             array_map(
                 function ($a, $b) {
-                    return ["host" => $a,"port" => $b];
+                    return ['host' => $a, 'port' => $b];
                 },
                 explode(',', env('REDIS_HOST', 'localhost')),
                 explode(',', env('REDIS_PORT', 26379))
diff --git a/config/datatables.php b/config/datatables.php
deleted file mode 100644
index fbb0e9293139..000000000000
--- a/config/datatables.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-return [
-    /*
-     * DataTables search options.
-     */
-    'search' => [
-        /*
-         * Smart search will enclose search keyword with wildcard string "%keyword%".
-         * SQL: column LIKE "%keyword%"
-         */
-        'smart' => true,
-
-        /*
-         * Multi-term search will explode search keyword using spaces resulting into multiple term search.
-         */
-        'multi_term' => true,
-
-        /*
-         * Case insensitive will search the keyword in lower case format.
-         * SQL: LOWER(column) LIKE LOWER(keyword)
-         */
-        'case_insensitive' => true,
-
-        /*
-         * Wild card will add "%" in between every characters of the keyword.
-         * SQL: column LIKE "%k%e%y%w%o%r%d%"
-         */
-        'use_wildcards' => false,
-    ],
-
-    /*
-     * DataTables internal index id response column name.
-     */
-    'index_column' => 'DT_RowIndex',
-
-    /*
-     * List of available builders for DataTables.
-     * This is where you can register your custom dataTables builder.
-     */
-    'engines' => [
-        'eloquent'                    => \Yajra\DataTables\EloquentDataTable::class,
-        'query'                       => \Yajra\DataTables\QueryDataTable::class,
-        'collection'                  => \Yajra\DataTables\CollectionDataTable::class,
-        'resource'                    => \Yajra\DataTables\ApiResourceDataTable::class,
-    ],
-
-    /*
-     * DataTables accepted builder to engine mapping.
-     * This is where you can override which engine a builder should use
-     * Note, only change this if you know what you are doing!
-     */
-    'builders' => [
-        //Illuminate\Database\Eloquent\Relations\Relation::class => 'eloquent',
-        //Illuminate\Database\Eloquent\Builder::class            => 'eloquent',
-        //Illuminate\Database\Query\Builder::class               => 'query',
-        //Illuminate\Support\Collection::class                   => 'collection',
-    ],
-
-    /*
-     * Nulls last sql pattern for Posgresql & Oracle.
-     * For MySQL, use '-%s %s'
-     */
-    'nulls_last_sql' => '%s %s NULLS LAST',
-
-    /*
-     * User friendly message to be displayed on user if error occurs.
-     * Possible values:
-     * null             - The exception message will be used on error response.
-     * 'throw'          - Throws a \Yajra\DataTables\Exceptions\Exception. Use your custom error handler if needed.
-     * 'custom message' - Any friendly message to be displayed to the user. You can also use translation key.
-     */
-    'error' => env('DATATABLES_ERROR', null),
-
-    /*
-     * Default columns definition of dataTable utility functions.
-     */
-    'columns' => [
-        /*
-         * List of columns hidden/removed on json response.
-         */
-        'excess' => ['rn', 'row_num'],
-
-        /*
-         * List of columns to be escaped. If set to *, all columns are escape.
-         * Note: You can set the value to empty array to disable XSS protection.
-         */
-        'escape' => '*',
-
-        /*
-         * List of columns that are allowed to display html content.
-         * Note: Adding columns to list will make us available to XSS attacks.
-         */
-        'raw' => ['action'],
-
-        /*
-         * List of columns are are forbidden from being searched/sorted.
-         */
-        'blacklist' => ['password', 'remember_token'],
-
-        /*
-         * List of columns that are only allowed fo search/sort.
-         * If set to *, all columns are allowed.
-         */
-        'whitelist' => '*',
-    ],
-
-    /*
-     * JsonResponse header and options config.
-     */
-    'json' => [
-        'header'  => [],
-        'options' => 0,
-    ],
-
-];
diff --git a/config/filesystems.php b/config/filesystems.php
index 26b1850eea9a..5966073f2cba 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -13,18 +13,7 @@ return [
     |
     */
 
-    'default' => env('FILESYSTEM_DRIVER', 'public'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default Cloud Filesystem Disk
-    |--------------------------------------------------------------------------
-    |
-    | Many applications store files both locally and in the cloud. For this
-    | reason, you may specify a default "cloud" driver here. This driver
-    | will be bound as the Cloud disk implementation in the container.
-    |
-    */
+    'default' => env('FILESYSTEM_DISK', 'public'),
 
     'cloud' => env('FILESYSTEM_CLOUD', 's3'),
 
@@ -35,7 +24,7 @@ return [
     |
     | Here you may configure as many filesystem "disks" as you wish, and you
     | may even configure multiple disks of the same driver. Defaults have
-    | been setup for each driver as an example of the required options.
+    | been set up for each driver as an example of the required values.
     |
     | Supported Drivers: "local", "ftp", "sftp", "s3"
     |
@@ -56,13 +45,12 @@ return [
                     'private' => 0700,
                 ],
             ],
+            'throw' => false,
         ],
 
         'public' => [
             'driver' => 'local',
             'root' => public_path('storage'),
-            //'root' => 'storage/',
-            // 'root' => storage_path('app/public'),
             'url' => env('APP_URL').'/storage',
             'visibility' => 'public',
             'permissions' => [
@@ -75,7 +63,9 @@ return [
                     'private' => 0700,
                 ],
             ],
+            'throw' => false,
         ],
+
         's3' => [
             'driver' => 's3',
             'key' => env('AWS_ACCESS_KEY_ID'),
@@ -85,17 +75,19 @@ return [
             'url' => env('AWS_URL'),
             'visibility' => 'public',
             'endpoint' => env('AWS_ENDPOINT'),
+            'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
+            'throw' => false,
         ],
 
         'gcs' => [
-                'driver' => 'gcs',
-                'project_id' => env('GOOGLE_CLOUD_PROJECT_ID', 'your-project-id'),
-                'key_file' => env('GOOGLE_CLOUD_KEY_FILE', null), // optional: /path/to/service-account.json
-                'bucket' => env('GOOGLE_CLOUD_STORAGE_BUCKET', 'your-bucket'),
-                'path_prefix' => env('GOOGLE_CLOUD_STORAGE_PATH_PREFIX', null), // optional: /default/path/to/apply/in/bucket
-                'storage_api_uri' => env('GOOGLE_CLOUD_STORAGE_API_URI', null), // see: Public URLs below
-                'visibility' => 'public', // optional: public|private
-            ],
+            'driver' => 'gcs',
+            'project_id' => env('GOOGLE_CLOUD_PROJECT_ID', 'your-project-id'),
+            'key_file' => env('GOOGLE_CLOUD_KEY_FILE', null), // optional: /path/to/service-account.json
+            'bucket' => env('GOOGLE_CLOUD_STORAGE_BUCKET', 'your-bucket'),
+            'path_prefix' => env('GOOGLE_CLOUD_STORAGE_PATH_PREFIX', null), // optional: /default/path/to/apply/in/bucket
+            'storage_api_uri' => env('GOOGLE_CLOUD_STORAGE_API_URI', null), // see: Public URLs below
+            'visibility' => 'public', // optional: public|private
+        ],
 
     ],
 
diff --git a/config/flare.php b/config/flare.php
new file mode 100644
index 000000000000..a4896f353761
--- /dev/null
+++ b/config/flare.php
@@ -0,0 +1,80 @@
+<?php
+
+use Spatie\FlareClient\FlareMiddleware\AddGitInformation;
+use Spatie\FlareClient\FlareMiddleware\RemoveRequestIp;
+use Spatie\FlareClient\FlareMiddleware\CensorRequestBodyFields;
+use Spatie\FlareClient\FlareMiddleware\CensorRequestHeaders;
+use Spatie\LaravelIgnition\FlareMiddleware\AddDumps;
+use Spatie\LaravelIgnition\FlareMiddleware\AddEnvironmentInformation;
+use Spatie\LaravelIgnition\FlareMiddleware\AddExceptionInformation;
+use Spatie\LaravelIgnition\FlareMiddleware\AddJobs;
+use Spatie\LaravelIgnition\FlareMiddleware\AddLogs;
+use Spatie\LaravelIgnition\FlareMiddleware\AddQueries;
+use Spatie\LaravelIgnition\FlareMiddleware\AddNotifierName;
+
+return [
+    /*
+    |
+    |--------------------------------------------------------------------------
+    | Flare API key
+    |--------------------------------------------------------------------------
+    |
+    | Specify Flare's API key below to enable error reporting to the service.
+    |
+    | More info: https://flareapp.io/docs/general/projects
+    |
+    */
+
+    'key' => env('FLARE_KEY'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Middleware
+    |--------------------------------------------------------------------------
+    |
+    | These middleware will modify the contents of the report sent to Flare.
+    |
+    */
+
+    'flare_middleware' => [
+        RemoveRequestIp::class,
+        AddGitInformation::class,
+        AddNotifierName::class,
+        AddEnvironmentInformation::class,
+        AddExceptionInformation::class,
+        AddDumps::class,
+        AddLogs::class => [
+            'maximum_number_of_collected_logs' => 200,
+        ],
+        AddQueries::class => [
+            'maximum_number_of_collected_queries' => 200,
+            'report_query_bindings' => true,
+        ],
+        AddJobs::class => [
+            'max_chained_job_reporting_depth' => 5,
+        ],
+        CensorRequestBodyFields::class => [
+            'censor_fields' => [
+                'password',
+                'password_confirmation',
+            ],
+        ],
+        CensorRequestHeaders::class => [
+            'headers' => [
+                'API-KEY',
+            ]
+        ]
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Reporting log statements
+    |--------------------------------------------------------------------------
+    |
+    | If this setting is `false` log statements won't be sent as events to Flare,
+    | no matter which error level you specified in the Flare log channel.
+    |
+    */
+
+    'send_logs_as_events' => true,
+];
diff --git a/config/gmail.php b/config/gmail.php
deleted file mode 100644
index 53f42725d8ee..000000000000
--- a/config/gmail.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-return [
-
-	/*
-	|--------------------------------------------------------------------------
-	| Gmail Configuration
-	|--------------------------------------------------------------------------
-	|
-	|
-	|
-	|  Scopes Available:
-	|
-	|   * all - Read, send, delete, and manage your email
-	|   * compose - Manage drafts and send emails
-	|   * insert - Insert mail into your mailbox
-	|   * labels - Manage mailbox labels
-	|   * metadata - View your email message metadata such as labels and headers, but not the email body
-	|   * modify - View and modify but not delete your email
-	|   * readonly - View your email messages and settings
-	|   * send - Send email on your behalf
-	|   * settings_basic - Manage your basic mail settings
-	|   * settings_sharing - Manage your sensitive mail settings, including who can manage your mail
-	|
-	|   Leaving the scopes empty fill use readonly
-	|
-	|  Credentials File Name
-	|
-	*/
-
-	'project_id' => env('GOOGLE_PROJECT_ID'),
-	'client_id' => env('GOOGLE_CLIENT_ID'),
-	'client_secret' => env('GOOGLE_CLIENT_SECRET'),
-	'redirect_url' => env('GOOGLE_REDIRECT_URI', '/'),
-
-	'state' => null,
-
-	'scopes' => [
-		'readonly',
-		'modify',
-	],
-
-	/*
-	|--------------------------------------------------------------------------
-	| Additional Scopes [URL Style]
-	|--------------------------------------------------------------------------
-	|
-	|   'additional_scopes' => [
-	|        'https://www.googleapis.com/auth/drive',
-	|        'https://www.googleapis.com/auth/documents'
-	|   ],
-	|
-	|
-	*/
-
-	'additional_scopes' => [
-
-	],
-
-	'access_type' => 'offline',
-
-	'approval_prompt' => 'force',
-
-	/*
-	|--------------------------------------------------------------------------
-	| Credentials File Name
-	|--------------------------------------------------------------------------
-	|
-	|   :email to use, clients email on the file
-	|
-	|
-	*/
-
-	'credentials_file_name' => env('GOOGLE_CREDENTIALS_NAME', 'gmail-json'),
-
-	/*
-	|--------------------------------------------------------------------------
-	| Allow Multiple Credentials
-	|--------------------------------------------------------------------------
-	|
-	|   Allow the application to store multiple credential json files.
-	|
-	|
-	*/
-
-	'allow_multiple_credentials' => env('GOOGLE_ALLOW_MULTIPLE_CREDENTIALS', false),
-
-	/*
-	|--------------------------------------------------------------------------
-	| Allow Encryption for json Files
-	|--------------------------------------------------------------------------
-	|
-	|   Use Laravel Encrypt in json Files
-	|
-	|
-	*/
-
-	'allow_json_encrypt' => env('GOOGLE_ALLOW_JSON_ENCRYPT', false),
-];
diff --git a/config/hashing.php b/config/hashing.php
index 842577087c0c..bcd3be4c28aa 100644
--- a/config/hashing.php
+++ b/config/hashing.php
@@ -44,9 +44,9 @@ return [
     */
 
     'argon' => [
-        'memory' => 1024,
-        'threads' => 2,
-        'time' => 2,
+        'memory' => 65536,
+        'threads' => 1,
+        'time' => 4,
     ],
 
 ];
diff --git a/config/ignition.php b/config/ignition.php
new file mode 100644
index 000000000000..b0975d4dbf49
--- /dev/null
+++ b/config/ignition.php
@@ -0,0 +1,209 @@
+<?php
+
+use Spatie\Ignition\Solutions\SolutionProviders\BadMethodCallSolutionProvider;
+use Spatie\Ignition\Solutions\SolutionProviders\MergeConflictSolutionProvider;
+use Spatie\Ignition\Solutions\SolutionProviders\UndefinedPropertySolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\DefaultDbNameSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\GenericLaravelExceptionSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\IncorrectValetDbCredentialsSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\InvalidRouteActionSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\MissingAppKeySolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\MissingColumnSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\MissingImportSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\MissingLivewireComponentSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\MissingMixManifestSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\MissingViteManifestSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\RunningLaravelDuskInProductionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\TableNotFoundSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\UndefinedViewVariableSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\UnknownValidationSolutionProvider;
+use Spatie\LaravelIgnition\Solutions\SolutionProviders\ViewNotFoundSolutionProvider;
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Editor
+    |--------------------------------------------------------------------------
+    |
+    | Choose your preferred editor to use when clicking any edit button.
+    |
+    | Supported: "phpstorm", "vscode", "vscode-insiders", "textmate", "emacs",
+    |            "sublime", "atom", "nova", "macvim", "idea", "netbeans",
+    |            "xdebug"
+    |
+    */
+
+    'editor' => env('IGNITION_EDITOR', 'phpstorm'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Theme
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify which theme Ignition should use.
+    |
+    | Supported: "light", "dark", "auto"
+    |
+    */
+
+    'theme' => env('IGNITION_THEME', 'auto'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Sharing
+    |--------------------------------------------------------------------------
+    |
+    | You can share local errors with colleagues or others around the world.
+    | Sharing is completely free and doesn't require an account on Flare.
+    |
+    | If necessary, you can completely disable sharing below.
+    |
+    */
+
+    'enable_share_button' => env('IGNITION_SHARING_ENABLED', true),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Register Ignition commands
+    |--------------------------------------------------------------------------
+    |
+    | Ignition comes with an additional make command that lets you create
+    | new solution classes more easily. To keep your default Laravel
+    | installation clean, this command is not registered by default.
+    |
+    | You can enable the command registration below.
+    |
+    */
+
+    'register_commands' => env('REGISTER_IGNITION_COMMANDS', false),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Solution Providers
+    |--------------------------------------------------------------------------
+    |
+    | You may specify a list of solution providers (as fully qualified class
+    | names) that shouldn't be loaded. Ignition will ignore these classes
+    | and possible solutions provided by them will never be displayed.
+    |
+    */
+
+    'solution_providers' => [
+        // from spatie/ignition
+        BadMethodCallSolutionProvider::class,
+        MergeConflictSolutionProvider::class,
+        UndefinedPropertySolutionProvider::class,
+
+        // from spatie/laravel-ignition
+        IncorrectValetDbCredentialsSolutionProvider::class,
+        MissingAppKeySolutionProvider::class,
+        DefaultDbNameSolutionProvider::class,
+        TableNotFoundSolutionProvider::class,
+        MissingImportSolutionProvider::class,
+        InvalidRouteActionSolutionProvider::class,
+        ViewNotFoundSolutionProvider::class,
+        RunningLaravelDuskInProductionProvider::class,
+        MissingColumnSolutionProvider::class,
+        UnknownValidationSolutionProvider::class,
+        MissingMixManifestSolutionProvider::class,
+        MissingViteManifestSolutionProvider::class,
+        MissingLivewireComponentSolutionProvider::class,
+        UndefinedViewVariableSolutionProvider::class,
+        GenericLaravelExceptionSolutionProvider::class,
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Ignored Solution Providers
+    |--------------------------------------------------------------------------
+    |
+    | You may specify a list of solution providers (as fully qualified class
+    | names) that shouldn't be loaded. Ignition will ignore these classes
+    | and possible solutions provided by them will never be displayed.
+    |
+    */
+
+    'ignored_solution_providers' => [
+
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Runnable Solutions
+    |--------------------------------------------------------------------------
+    |
+    | Some solutions that Ignition displays are runnable and can perform
+    | various tasks. By default, runnable solutions are enabled when your app
+    | has debug mode enabled. You may also fully disable this feature.
+    |
+    | Default: env('IGNITION_ENABLE_RUNNABLE_SOLUTIONS', env('APP_DEBUG', false))
+    |
+    */
+
+    'enable_runnable_solutions' => env('IGNITION_ENABLE_RUNNABLE_SOLUTIONS', env('APP_DEBUG', false)),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Remote Path Mapping
+    |--------------------------------------------------------------------------
+    |
+    | If you are using a remote dev server, like Laravel Homestead, Docker, or
+    | even a remote VPS, it will be necessary to specify your path mapping.
+    |
+    | Leaving one, or both of these, empty or null will not trigger the remote
+    | URL changes and Ignition will treat your editor links as local files.
+    |
+    | "remote_sites_path" is an absolute base path for your sites or projects
+    | in Homestead, Vagrant, Docker, or another remote development server.
+    |
+    | Example value: "/home/vagrant/Code"
+    |
+    | "local_sites_path" is an absolute base path for your sites or projects
+    | on your local computer where your IDE or code editor is running on.
+    |
+    | Example values: "/Users/<name>/Code", "C:\Users\<name>\Documents\Code"
+    |
+    */
+
+    'remote_sites_path' => env('IGNITION_REMOTE_SITES_PATH', base_path()),
+    'local_sites_path' => env('IGNITION_LOCAL_SITES_PATH', ''),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Housekeeping Endpoint Prefix
+    |--------------------------------------------------------------------------
+    |
+    | Ignition registers a couple of routes when it is enabled. Below you may
+    | specify a route prefix that will be used to host all internal links.
+    |
+    */
+
+    'housekeeping_endpoint_prefix' => '_ignition',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Settings File
+    |--------------------------------------------------------------------------
+    |
+    | Ignition allows you to save your settings to a specific global file.
+    |
+    | If no path is specified, a file with settings will be saved to the user's
+    | home directory. The directory depends on the OS and its settings but it's
+    | typically `~/.ignition.json`. In this case, the settings will be applied
+    | to all of your projects where Ignition is used and the path is not
+    | specified.
+    |
+    | However, if you want to store your settings on a project basis, or you
+    | want to keep them in another directory, you can specify a path where
+    | the settings file will be saved. The path should be an existing directory
+    | with correct write access.
+    | For example, create a new `ignition` folder in the storage directory and
+    | use `storage_path('ignition')` as the `settings_file_path`.
+    |
+    | Default value: '' (empty string)
+    */
+
+    'settings_file_path' => '',
+
+];
diff --git a/config/logging.php b/config/logging.php
index 808a7d604a5c..5be233cfdc7f 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -19,6 +19,22 @@ return [
 
     'default' => env('LOG_CHANNEL', 'stack'),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Deprecations Log Channel
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the log channel that should be used to log warnings
+    | regarding deprecated PHP and library features. This allows you to get
+    | your application ready for upcoming major versions of dependencies.
+    |
+    */
+
+    'deprecations' => [
+        'channel' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
+        'trace' => false,
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Log Channels
@@ -35,6 +51,13 @@ return [
     */
 
     'channels' => [
+
+        'invoiceninja' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/invoiceninja.log'),
+            'level' => env('LOG_LEVEL', 'debug'),
+        ],
+
         'stack' => [
             'driver' => 'stack',
             'channels' => ['single'],
@@ -44,13 +67,13 @@ return [
         'single' => [
             'driver' => 'single',
             'path' => storage_path('logs/laravel.log'),
-            'level' => 'debug',
+            'level' => env('LOG_LEVEL', 'debug'),
         ],
 
         'daily' => [
             'driver' => 'daily',
             'path' => storage_path('logs/laravel.log'),
-            'level' => 'debug',
+            'level' => env('LOG_LEVEL', 'debug'),
             'days' => 14,
         ],
 
@@ -59,21 +82,23 @@ return [
             'url' => env('LOG_SLACK_WEBHOOK_URL'),
             'username' => 'Laravel Log',
             'emoji' => ':boom:',
-            'level' => 'critical',
+            'level' => env('LOG_LEVEL', 'critical'),
         ],
 
         'papertrail' => [
             'driver' => 'monolog',
-            'level' => 'debug',
-            'handler' => SyslogUdpHandler::class,
+            'level' => env('LOG_LEVEL', 'debug'),
+            'handler' => env('LOG_PAPERTRAIL_HANDLER', SyslogUdpHandler::class),
             'handler_with' => [
                 'host' => env('PAPERTRAIL_URL'),
                 'port' => env('PAPERTRAIL_PORT'),
+                'connectionString' => 'tls://'.env('PAPERTRAIL_URL').':'.env('PAPERTRAIL_PORT'),
             ],
         ],
 
         'stderr' => [
             'driver' => 'monolog',
+            'level' => env('LOG_LEVEL', 'debug'),
             'handler' => StreamHandler::class,
             'formatter' => env('LOG_STDERR_FORMATTER'),
             'with' => [
@@ -83,12 +108,12 @@ return [
 
         'syslog' => [
             'driver' => 'syslog',
-            'level' => 'debug',
+            'level' => env('LOG_LEVEL', 'debug'),
         ],
 
         'errorlog' => [
             'driver' => 'errorlog',
-            'level' => 'debug',
+            'level' => env('LOG_LEVEL', 'debug'),
         ],
 
         'null' => [
@@ -100,73 +125,68 @@ return [
             'path' => storage_path('logs/laravel.log'),
         ],
 
-        'invoiceninja' => [
-            'driver' => 'single',
-            'level' => 'debug',
-            'path' => storage_path('logs/invoiceninja.log'),
+    'gelf' => [
+        'driver' => 'custom',
+
+        'via' => \Hedii\LaravelGelfLogger\GelfLoggerFactory::class,
+
+        // This optional option determines the processors that should be
+        // pushed to the handler. This option is useful to modify a field
+        // in the log context (see NullStringProcessor), or to add extra
+        // data. Each processor must be a callable or an object with an
+        // __invoke method: see monolog documentation about processors.
+        // Default is an empty array.
+        'processors' => [
+            \Hedii\LaravelGelfLogger\Processors\NullStringProcessor::class,
+            // another processor...
         ],
 
-        'gelf' => [
-            'driver' => 'custom',
-            
-            'via' => \Hedii\LaravelGelfLogger\GelfLoggerFactory::class,
+        // This optional option determines the minimum "level" a message
+        // must be in order to be logged by the channel. Default is 'debug'
+        'level' => 'debug',
 
-            // This optional option determines the processors that should be
-            // pushed to the handler. This option is useful to modify a field
-            // in the log context (see NullStringProcessor), or to add extra
-            // data. Each processor must be a callable or an object with an
-            // __invoke method: see monolog documentation about processors.
-            // Default is an empty array.
-            'processors' => [
-                \Hedii\LaravelGelfLogger\Processors\NullStringProcessor::class,
-                // another processor...
-            ],
+        // This optional option determines the channel name sent with the
+        // message in the 'facility' field. Default is equal to app.env
+        // configuration value
+        'name' => 'v5_app',
 
-            // This optional option determines the minimum "level" a message
-            // must be in order to be logged by the channel. Default is 'debug'
-            'level' => 'debug',
+        // This optional option determines the system name sent with the
+        // message in the 'source' field. When forgotten or set to null,
+        // the current hostname is used.
+        'system_name' => null,
 
-            // This optional option determines the channel name sent with the
-            // message in the 'facility' field. Default is equal to app.env
-            // configuration value
-            'name' => 'v5_app',
+        // This optional option determines if you want the UDP, TCP or HTTP
+        // transport for the gelf log messages. Default is UDP
+        'transport' => 'udp',
 
-            // This optional option determines the system name sent with the
-            // message in the 'source' field. When forgotten or set to null,
-            // the current hostname is used.
-            'system_name' => null,
+        // This optional option determines the host that will receive the
+        // gelf log messages. Default is 127.0.0.1
+        'host' => env('GRAYLOG_SERVER', '127.0.0.1'),
 
-            // This optional option determines if you want the UDP, TCP or HTTP
-            // transport for the gelf log messages. Default is UDP
-            'transport' => 'udp',
+        // This optional option determines the port on which the gelf
+        // receiver host is listening. Default is 12201
+        'port' => 12201,
 
-            // This optional option determines the host that will receive the
-            // gelf log messages. Default is 127.0.0.1
-            'host' => env('GRAYLOG_SERVER', '127.0.0.1'),
+        // This optional option determines the path used for the HTTP
+        // transport. When forgotten or set to null, default path '/gelf'
+        // is used.
+        'path' => null,
 
-            // This optional option determines the port on which the gelf
-            // receiver host is listening. Default is 12201
-            'port' => 12201,
+        // This optional option determines the maximum length per message
+        // field. When forgotten or set to null, the default value of
+        // \Monolog\Formatter\GelfMessageFormatter::DEFAULT_MAX_LENGTH is
+        // used (currently this value is 32766)
+        'max_length' => null,
 
-            // This optional option determines the path used for the HTTP
-            // transport. When forgotten or set to null, default path '/gelf'
-            // is used.
-            'path' => null,
+        // This optional option determines the prefix for 'context' fields
+        // from the Monolog record. Default is null (no context prefix)
+        'context_prefix' => null,
 
-            // This optional option determines the maximum length per message
-            // field. When forgotten or set to null, the default value of 
-            // \Monolog\Formatter\GelfMessageFormatter::DEFAULT_MAX_LENGTH is
-            // used (currently this value is 32766)
-            'max_length' => null,
-
-            // This optional option determines the prefix for 'context' fields
-            // from the Monolog record. Default is null (no context prefix)
-            'context_prefix' => null,
-
-            // This optional option determines the prefix for 'extra' fields
-            // from the Monolog record. Default is null (no extra prefix)
-            'extra_prefix' => null,
-        ],
+        // This optional option determines the prefix for 'extra' fields
+        // from the Monolog record. Default is null (no extra prefix)
+        'extra_prefix' => null,
     ],
 
+]
+
 ];
diff --git a/config/mail.php b/config/mail.php
index 97ab1b8c182e..2b778f378dfe 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -29,7 +29,7 @@ return [
     | mailers below. You are free to add additional mailers as required.
     |
     | Supported: "smtp", "sendmail", "mailgun", "ses",
-    |            "postmark", "log", "array"
+    |            "postmark", "log", "array", "failover"
     |
     */
 
@@ -42,7 +42,7 @@ return [
             'username' => env('MAIL_USERNAME'),
             'password' => env('MAIL_PASSWORD'),
             'timeout' => null,
-            'auth_mode' => null,
+            'local_domain' => env('MAIL_EHLO_DOMAIN'),
         ],
 
         'ses' => [
@@ -59,7 +59,7 @@ return [
 
         'sendmail' => [
             'transport' => 'sendmail',
-            'path' => '/usr/sbin/sendmail -bs',
+            'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -bs -i'),
         ],
 
         'log' => [
@@ -70,16 +70,21 @@ return [
         'array' => [
             'transport' => 'array',
         ],
+
         'gmail' => [
             'transport' => 'gmail',
         ],
+
         'office365' => [
             'transport' => 'office365',
         ],
-        'cocopostmark' => [
-            'transport' => 'cocopostmark',
+        'failover' => [
+            'transport' => 'failover',
+            'mailers' => [
+                'smtp',
+                'log',
+            ],
         ],
-
     ],
 
     /*
diff --git a/config/ninja.php b/config/ninja.php
index 8c058747fc98..c6663a6fbda5 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.4.12',
-    'app_tag' => '5.4.12',
+    'app_version' => '5.5.8',
+    'app_tag' => '5.5.8',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),
@@ -40,7 +40,7 @@ return [
     'local_download' => env('LOCAL_DOWNLOAD', false),
     'sentry_dsn' => env('SENTRY_LARAVEL_DSN', 'https://39389664f3f14969b4c43dadda00a40b@sentry2.invoicing.co/5'),
     'environment' => env('NINJA_ENVIRONMENT', 'selfhost'), // 'hosted', 'development', 'selfhost', 'reseller'
-	'preconfigured_install' => env('PRECONFIGURED_INSTALL',false),
+    'preconfigured_install' => env('PRECONFIGURED_INSTALL', false),
     'update_secret' => env('UPDATE_SECRET', ''),
     // Settings used by invoiceninja.com
 
@@ -88,11 +88,11 @@ return [
         'braintree' => env('BRAINTREE_KEYS', ''),
         'paytrace' => [
             'username' => env('PAYTRACE_U', ''),
-            'password' => env('PAYTRACE_P',''),
+            'password' => env('PAYTRACE_P', ''),
             'decrypted' => env('PAYTRACE_KEYS', ''),
         ],
         'mollie' => env('MOLLIE_KEYS', ''),
-        'square' => env('SQUARE_KEYS',''),
+        'square' => env('SQUARE_KEYS', ''),
     ],
     'contact' => [
         'email' => env('MAIL_FROM_ADDRESS'),
@@ -177,7 +177,7 @@ return [
     'wepay' => [
         'environment' => env('WEPAY_ENVIRONMENT', 'stage'),
         'client_id' => env('WEPAY_CLIENT_ID', ''),
-        'client_secret' => env('WEPAY_CLIENT_SECRET',''),
+        'client_secret' => env('WEPAY_CLIENT_SECRET', ''),
         'fee_payer' => env('WEPAY_FEE_PAYER'),
         'fee_cc_multiplier' => env('WEPAY_APP_FEE_CC_MULTIPLIER'),
         'fee_ach_multiplier' => env('WEPAY_APP_FEE_ACH_MULTIPLIER'),
@@ -197,5 +197,8 @@ return [
     'ninja_apple_client_id' => env('APPLE_CLIENT_ID', false),
     'ninja_apple_client_secret' => env('APPLE_CLIENT_SECRET',false),
     'ninja_apple_redirect_url' => env('APPLE_REDIRECT_URI',false),
-];
+    'twilio_account_sid' => env('TWILIO_ACCOUNT_SID',false),
+    'twilio_auth_token' => env('TWILIO_AUTH_TOKEN',false),
+    'twilio_verify_sid' => env('TWILIO_VERIFY_SID',false),
 
+];
diff --git a/config/querydetector.php b/config/querydetector.php
index 72b3fc33ada1..ee63e5ec3ab9 100644
--- a/config/querydetector.php
+++ b/config/querydetector.php
@@ -66,5 +66,5 @@ return [
         //\BeyondCode\QueryDetector\Outputs\Alert::class,
         \BeyondCode\QueryDetector\Outputs\Log::class,
         //\BeyondCode\QueryDetector\Outputs\Json::class,
-    ]
+    ],
 ];
diff --git a/config/queue.php b/config/queue.php
index 35ff52ffcaf2..412282299176 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -39,6 +39,7 @@ return [
             'table' => 'jobs',
             'queue' => 'default',
             'retry_after' => 90000000,
+            'after_commit' => false,
         ],
 
         'beanstalkd' => [
@@ -47,6 +48,7 @@ return [
             'queue' => 'default',
             'retry_after' => 90000000,
             'block_for' => 0,
+            'after_commit' => false,
         ],
 
         'sqs' => [
@@ -54,9 +56,10 @@ return [
             'key' => env('AWS_ACCESS_KEY_ID'),
             'secret' => env('AWS_SECRET_ACCESS_KEY'),
             'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
-            'queue' => env('SQS_QUEUE', 'your-queue-name'),
+            'queue' => env('SQS_QUEUE', 'default'),
             'suffix' => env('SQS_SUFFIX'),
             'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
+            'after_commit' => false,
         ],
 
         'redis' => [
@@ -65,6 +68,7 @@ return [
             'queue' => env('REDIS_QUEUE', 'default'),
             'retry_after' => 90000000,
             'block_for' => null,
+            'after_commit' => false,
         ],
 
     ],
@@ -81,9 +85,9 @@ return [
     */
 
     'failed' => [
-        'driver' => env('QUEUE_FAILED_DRIVER', 'database'),
+        'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'),
         'database' => env('DB_CONNECTION', 'mysql'),
         'table' => 'failed_jobs',
     ],
 
-];
\ No newline at end of file
+];
diff --git a/config/self-update.php b/config/self-update.php
deleted file mode 100644
index 7a61c05a4238..000000000000
--- a/config/self-update.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Default source repository type
-    |--------------------------------------------------------------------------
-    |
-    | The default source repository type you want to pull your updates from.
-    |
-    */
-
-    'default' => env('SELF_UPDATER_SOURCE', 'github'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Version installed
-    |--------------------------------------------------------------------------
-    |
-    | Set this to the version of your software installed on your system.
-    |
-    */
-
-    'version_installed' => env('SELF_UPDATER_VERSION_INSTALLED', config('ninja.app_tag')),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Repository types
-    |--------------------------------------------------------------------------
-    |
-    | A repository can be of different types, which can be specified here.
-    | Current options:
-    | - github
-    | - http
-    |
-    */
-
-    'repository_types' => [
-        'github' => [
-            'type' => 'github',
-            'repository_vendor' => env('SELF_UPDATER_REPO_VENDOR', 'invoiceninja'),
-            'repository_name' => env('SELF_UPDATER_REPO_NAME', 'invoiceninja'),
-            'repository_url' => 'https://github.com/',
-            'download_path' => env('SELF_UPDATER_DOWNLOAD_PATH', '/tmp'),
-            'private_access_token' => env('SELF_UPDATER_GITHUB_PRIVATE_ACCESS_TOKEN', ''),
-            'use_branch' => env('SELF_UPDATER_USE_BRANCH', ''),
-        ],
-        'http' => [
-            'type' => 'http',
-            'repository_url' => env('SELF_UPDATER_REPO_URL', ''),
-            'pkg_filename_format' => env('SELF_UPDATER_PKG_FILENAME_FORMAT', 'v_VERSION_'),
-            'download_path' => env('SELF_UPDATER_DOWNLOAD_PATH', '/tmp'),
-            'private_access_token' => env('SELF_UPDATER_HTTP_PRIVATE_ACCESS_TOKEN', ''),
-        ],
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Exclude folders from update
-    |--------------------------------------------------------------------------
-    |
-    | Specific folders which should not be updated and will be skipped during the
-    | update process.
-    |
-    | Here's already a list of good examples to skip. You may want to keep those.
-    |
-    */
-
-    'exclude_folders' => [
-        '__MACOSX',
-        'node_modules',
-        'bootstrap/cache',
-        'bower',
-        'storage/app',
-        'storage/framework',
-        'storage/logs',
-        'storage/self-update',
-        'public/storage',
-        'vendor',
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Event Logging
-    |--------------------------------------------------------------------------
-    |
-    | Configure if fired events should be logged
-    |
-    */
-
-    'log_events' => env('SELF_UPDATER_LOG_EVENTS', true),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Notifications
-    |--------------------------------------------------------------------------
-    |
-    | Specify for which events you want to get notifications. Out of the box you can use 'mail'.
-    |
-    */
-
-    'notifications' => [
-        'notifications' => [
-            \Codedge\Updater\Notifications\Notifications\UpdateSucceeded::class => ['mail'],
-            \Codedge\Updater\Notifications\Notifications\UpdateFailed::class => ['mail'],
-            \Codedge\Updater\Notifications\Notifications\UpdateAvailable::class => ['mail'],
-        ],
-
-        /*
-         * Here you can specify the notifiable to which the notifications should be sent. The default
-         * notifiable will use the variables specified in this config file.
-         */
-        'notifiable' => \Codedge\Updater\Notifications\Notifiable::class,
-
-        'mail' => [
-            'to' => [
-                'address' => env('SELF_UPDATER_MAILTO_ADDRESS', 'notifications@example.com'),
-                'name' => env('SELF_UPDATER_MAILTO_NAME', ''),
-            ],
-
-            'from' => [
-                'address' => env('SELF_UPDATER_MAIL_FROM_ADDRESS', 'updater@example.com'),
-                'name' => env('SELF_UPDATER_MAIL_FROM_NAME', 'Update'),
-            ],
-        ],
-    ],
-
-    /*
-    |---------------------------------------------------------------------------
-    | Register custom artisan commands
-    |---------------------------------------------------------------------------
-    */
-
-    'artisan_commands' => [
-        'pre_update' => [
-            //'command:signature' => [
-            //    'class' => Command class
-            //    'params' => []
-            //]
-        ],
-        'post_update' => [
-            'postupdate:cleanup' => [
-            'class' => \App\Console\Commands\PostUpdate::class,
-        ],
-    ]
-    ],
-
-];
diff --git a/config/services.php b/config/services.php
index 1656cdf10168..aec15f6fc8d7 100644
--- a/config/services.php
+++ b/config/services.php
@@ -2,40 +2,58 @@
 
 return [
 
+    'analytics' => [
+        'tracking_id' => env('TRACKING_ID'),
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Third Party Services
     |--------------------------------------------------------------------------
     |
     | This file is for storing the credentials for third party services such
-    | as Stripe, Mailgun, SparkPost and others. This file provides a sane
-    | default location for this type of information, allowing packages
-    | to have a conventional place to find your various credentials.
+    | as Mailgun, Postmark, AWS and more. This file provides the de facto
+    | location for this type of information, allowing packages to have
+    | a conventional file to locate the various service credentials.
     |
     */
 
-    'analytics' => [
-        'tracking_id' => env('TRACKING_ID'),
+    'mailgun' => [
+        'domain' => env('MAILGUN_DOMAIN'),
+        'secret' => env('MAILGUN_SECRET'),
+        'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
+        'scheme' => 'https',
     ],
 
-    'mailgun' => [
-        'domain'   => env('MAILGUN_DOMAIN'),
-        'secret'   => env('MAILGUN_SECRET'),
-        'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
+    'postmark' => [
+        'token' => env('POSTMARK_SECRET'),
+    ],
+
+    'microsoft' => [
+        'client_id' => env('MICROSOFT_CLIENT_ID'),
+        'client_secret' => env('MICROSOFT_CLIENT_SECRET'),
+        'redirect' => env('MICROSOFT_REDIRECT_URI'),
+    ],
+
+    'apple' => [
+        'client_id' => env('APPLE_CLIENT_ID'),
+        'client_secret' => env('APPLE_CLIENT_SECRET'),
+        'redirect' => env('APPLE_REDIRECT_URI'),
     ],
 
     'ses' => [
-        'key'    => env('SES_KEY'),
-        'secret' => env('SES_SECRET'),
+        'key' => env('AWS_ACCESS_KEY_ID'),
+        'secret' => env('AWS_SECRET_ACCESS_KEY'),
         'region' => env('SES_REGION', 'us-east-1'),
     ],
-
     'sparkpost' => [
         'secret' => env('SPARKPOST_SECRET'),
     ],
+
     'gmail' => [
         'token' => '',
     ],
+
     'stripe' => [
         'model'  => App\Models\User::class,
         'key'    => env('STRIPE_KEY'),
@@ -77,17 +95,5 @@ return [
         'client_secret' => env('BITBUCKET_CLIENT_SECRET'),
         'redirect' => env('BITBUCKET_OAUTH_REDIRECT'),
     ],
-    'postmark' => [
-        'token' => env('POSTMARK_SECRET'),
-    ],
-    'microsoft' => [
-        'client_id' => env('MICROSOFT_CLIENT_ID'),
-        'client_secret' => env('MICROSOFT_CLIENT_SECRET'),
-        'redirect' => env('MICROSOFT_REDIRECT_URI')
-    ],
-    'apple' => [
-        'client_id' => env('APPLE_CLIENT_ID'),
-        'client_secret' => env('APPLE_CLIENT_SECRET'),
-        'redirect' => env('APPLE_REDIRECT_URI')
-    ],
+
 ];
diff --git a/config/session.php b/config/session.php
index 1fba5eb342f5..f09f0650f7fd 100644
--- a/config/session.php
+++ b/config/session.php
@@ -72,7 +72,7 @@ return [
     |
     */
 
-    'connection' => env('SESSION_CONNECTION', null),
+    'connection' => env('SESSION_CONNECTION'),
 
     /*
     |--------------------------------------------------------------------------
@@ -100,7 +100,7 @@ return [
     |
     */
 
-    'store' => env('SESSION_STORE', null),
+    'store' => env('SESSION_STORE'),
 
     /*
     |--------------------------------------------------------------------------
@@ -155,7 +155,7 @@ return [
     |
     */
 
-    'domain' => env('SESSION_DOMAIN', null),
+    'domain' => env('SESSION_DOMAIN'),
 
     /*
     |--------------------------------------------------------------------------
@@ -164,7 +164,7 @@ return [
     |
     | By setting this option to true, session cookies will only be sent back
     | to the server if the browser has a HTTPS connection. This will keep
-    | the cookie from being sent to you if it can not be done securely.
+    | the cookie from being sent to you when it can't be done securely.
     |
     */
 
diff --git a/config/trustedproxy.php b/config/trustedproxy.php
index e618ae2475a1..dcc264296757 100644
--- a/config/trustedproxy.php
+++ b/config/trustedproxy.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Http\Request;
+
 return [
 
     /*
@@ -35,7 +37,7 @@ return [
      *
      * Options include:
      *
-     * - Illuminate\Http\Request::HEADER_X_FORWARDED_ALL (use all x-forwarded-* headers to establish trust)
+     * - Illuminate\Http\Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB (use all x-forwarded-* headers to establish trust)
      * - Illuminate\Http\Request::HEADER_FORWARDED (use the FORWARDED header to establish trust)
      * - Illuminate\Http\Request::HEADER_X_FORWARDED_AWS_ELB (If you are using AWS Elastic Load Balancer)
      *
@@ -45,6 +47,6 @@ return [
      *
      * @link https://symfony.com/doc/current/deployment/proxies.html
      */
-    'headers' => Illuminate\Http\Request::HEADER_X_FORWARDED_ALL,
+    'headers' => Illuminate\Http\Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB,
 
 ];
diff --git a/database/factories/AccountFactory.php b/database/factories/AccountFactory.php
index bad595bf6c4c..66220630d833 100644
--- a/database/factories/AccountFactory.php
+++ b/database/factories/AccountFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\Account;
@@ -16,13 +17,6 @@ use Illuminate\Support\Str;
 
 class AccountFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Account::class;
-
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/ClientContactFactory.php b/database/factories/ClientContactFactory.php
index a8e75ad8f997..473f919c30c3 100644
--- a/database/factories/ClientContactFactory.php
+++ b/database/factories/ClientContactFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\ClientContact;
@@ -15,13 +16,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class ClientContactFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = ClientContact::class;
-
     /**
      * Define the model's default state.
      *
@@ -30,11 +24,11 @@ class ClientContactFactory extends Factory
     public function definition()
     {
         return [
-            'first_name' => $this->faker->firstName,
-            'last_name' => $this->faker->lastName,
-            'phone' => $this->faker->phoneNumber,
+            'first_name' => $this->faker->firstName(),
+            'last_name' => $this->faker->lastName(),
+            'phone' => $this->faker->phoneNumber(),
             'email_verified_at' => now(),
-            'email' => $this->faker->unique()->safeEmail,
+            'email' => $this->faker->unique()->safeEmail(),
             'send_email' => true,
             'password' => bcrypt('password'),
             'remember_token' => \Illuminate\Support\Str::random(10),
diff --git a/database/factories/ClientFactory.php b/database/factories/ClientFactory.php
index 7e579ff5120a..045bdddf041f 100644
--- a/database/factories/ClientFactory.php
+++ b/database/factories/ClientFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\DataMapper\ClientSettings;
@@ -16,13 +17,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class ClientFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Client::class;
-
     /**
      * Define the model's default state.
      *
@@ -32,7 +26,7 @@ class ClientFactory extends Factory
     {
         return [
             'name' => $this->faker->company(),
-            'website' => $this->faker->url,
+            'website' => $this->faker->url(),
             'private_notes' => $this->faker->text(200),
             'balance' => 0,
             'paid_to_date' => 0,
@@ -42,17 +36,17 @@ class ClientFactory extends Factory
             'custom_value2' => '',
             'custom_value3' => '',
             'custom_value4' => '',
-            'address1' => $this->faker->buildingNumber,
-            'address2' => $this->faker->streetAddress,
-            'city' => $this->faker->city,
-            'state' => $this->faker->state,
-            'postal_code' => $this->faker->postcode,
+            'address1' => $this->faker->buildingNumber(),
+            'address2' => $this->faker->streetAddress(),
+            'city' => $this->faker->city(),
+            'state' => $this->faker->state(),
+            'postal_code' => $this->faker->postcode(),
             'country_id' => 4,
-            'shipping_address1' => $this->faker->buildingNumber,
-            'shipping_address2' => $this->faker->streetAddress,
-            'shipping_city' => $this->faker->city,
-            'shipping_state' => $this->faker->state,
-            'shipping_postal_code' => $this->faker->postcode,
+            'shipping_address1' => $this->faker->buildingNumber(),
+            'shipping_address2' => $this->faker->streetAddress(),
+            'shipping_city' => $this->faker->city(),
+            'shipping_state' => $this->faker->state(),
+            'shipping_postal_code' => $this->faker->postcode(),
             'shipping_country_id' => 4,
             'settings' => ClientSettings::defaults(),
             'client_hash' => \Illuminate\Support\Str::random(40),
diff --git a/database/factories/CompanyFactory.php b/database/factories/CompanyFactory.php
index 3072b3b57566..2b08b87101c4 100644
--- a/database/factories/CompanyFactory.php
+++ b/database/factories/CompanyFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\DataMapper\CompanySettings;
@@ -18,12 +19,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class CompanyFactory extends Factory
 {
     use MakesHash;
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Company::class;
 
     /**
      * Define the model's default state.
@@ -33,13 +28,13 @@ class CompanyFactory extends Factory
     public function definition()
     {
         return [
-            //'name' => $this->faker->name,
+            //'name' => $this->faker->name(),
             'company_key' => strtolower(\Illuminate\Support\Str::random(config('ninja.key_length'))),
-            'ip' => $this->faker->ipv4,
+            'ip' => $this->faker->ipv4(),
             'db' => config('database.default'),
             'settings' => CompanySettings::defaults(),
             'is_large' => false,
-            'default_password_timeout' => 30*60000,
+            'default_password_timeout' => 30 * 60000,
             'enabled_modules' => config('ninja.enabled_modules'),
             'custom_fields' => (object) [
             ],
diff --git a/database/factories/CreditFactory.php b/database/factories/CreditFactory.php
index 3836b27e5f86..852e43e14b58 100644
--- a/database/factories/CreditFactory.php
+++ b/database/factories/CreditFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Factory\InvoiceItemFactory;
@@ -16,13 +17,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class CreditFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Credit::class;
-
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/CreditInvitationFactory.php b/database/factories/CreditInvitationFactory.php
index da807def8454..950d6e84363a 100644
--- a/database/factories/CreditInvitationFactory.php
+++ b/database/factories/CreditInvitationFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\CreditInvitation;
@@ -16,13 +17,6 @@ use Illuminate\Support\Str;
 
 class CreditInvitationFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = CreditInvitation::class;
-
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/DocumentFactory.php b/database/factories/DocumentFactory.php
index f80cd4bebd45..0b2642a84e99 100644
--- a/database/factories/DocumentFactory.php
+++ b/database/factories/DocumentFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\Document;
@@ -16,13 +17,6 @@ use Illuminate\Support\Str;
 
 class DocumentFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Document::class;
-
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/ExpenseCategoryFactory.php b/database/factories/ExpenseCategoryFactory.php
index beb8488a1b58..b158299b826d 100644
--- a/database/factories/ExpenseCategoryFactory.php
+++ b/database/factories/ExpenseCategoryFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\ExpenseCategory;
@@ -15,13 +16,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class ExpenseCategoryFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = ExpenseCategory::class;
-
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/ExpenseFactory.php b/database/factories/ExpenseFactory.php
index fd340d5bba0f..8560fc2ceec2 100644
--- a/database/factories/ExpenseFactory.php
+++ b/database/factories/ExpenseFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\Expense;
@@ -15,13 +16,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class ExpenseFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Expense::class;
-
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/GatewayFactory.php b/database/factories/GatewayFactory.php
index ff294987ef85..d21f6ddcbc8c 100644
--- a/database/factories/GatewayFactory.php
+++ b/database/factories/GatewayFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\Gateway;
@@ -15,13 +16,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class GatewayFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Gateway::class;
-
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/InvoiceFactory.php b/database/factories/InvoiceFactory.php
index 4ba4c874a056..2236a0f104d2 100644
--- a/database/factories/InvoiceFactory.php
+++ b/database/factories/InvoiceFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Factory\InvoiceItemFactory;
@@ -16,13 +17,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class InvoiceFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Invoice::class;
-
     /**
      * Define the model's default state.
      *
@@ -41,7 +35,7 @@ class InvoiceFactory extends Factory
             'tax_rate2' => 17.5,
             //'tax_name3' => 'THIRDTAX',
             //'tax_rate3' => 5,
-            // 'custom_value1' => $this->faker->date,
+            // 'custom_value1' => $this->faker->date(),
             //'custom_value2' => rand(0, 1) ? 'yes' : 'no',
             // 'custom_value3' => $this->faker->numberBetween(1,4),
             // 'custom_value4' => $this->faker->numberBetween(1,4),
diff --git a/database/factories/InvoiceInvitationFactory.php b/database/factories/InvoiceInvitationFactory.php
index 1ce6f3d3253e..e5d6edc56a0e 100644
--- a/database/factories/InvoiceInvitationFactory.php
+++ b/database/factories/InvoiceInvitationFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\InvoiceInvitation;
@@ -16,13 +17,6 @@ use Illuminate\Support\Str;
 
 class InvoiceInvitationFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = InvoiceInvitation::class;
-
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/PaymentFactory.php b/database/factories/PaymentFactory.php
index eac54419c062..a0b528a9c843 100644
--- a/database/factories/PaymentFactory.php
+++ b/database/factories/PaymentFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\Payment;
@@ -15,13 +16,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class PaymentFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Payment::class;
-
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/ProductFactory.php b/database/factories/ProductFactory.php
index 59ada342dafa..ecba3066cd16 100644
--- a/database/factories/ProductFactory.php
+++ b/database/factories/ProductFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\Product;
@@ -15,13 +16,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class ProductFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Product::class;
-
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/ProjectFactory.php b/database/factories/ProjectFactory.php
index 4bc918eef471..46f0276dae62 100644
--- a/database/factories/ProjectFactory.php
+++ b/database/factories/ProjectFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\Project;
@@ -15,13 +16,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class ProjectFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Project::class;
-
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/PurchaseOrderInvitationFactory.php b/database/factories/PurchaseOrderInvitationFactory.php
index d2051c0c8d88..a775099731d6 100644
--- a/database/factories/PurchaseOrderInvitationFactory.php
+++ b/database/factories/PurchaseOrderInvitationFactory.php
@@ -1,22 +1,13 @@
 <?php
 
-
 namespace Database\Factories;
 
-
 use App\Models\PurchaseOrderInvitation;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Str;
 
 class PurchaseOrderInvitationFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = PurchaseOrderInvitation::class;
-
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/QuoteFactory.php b/database/factories/QuoteFactory.php
index 62d580c46f3d..c09da9d3e4bc 100644
--- a/database/factories/QuoteFactory.php
+++ b/database/factories/QuoteFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\Quote;
@@ -15,13 +16,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class QuoteFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Quote::class;
-
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/QuoteInvitationFactory.php b/database/factories/QuoteInvitationFactory.php
index 17310d17bed3..7fcaa1a3016c 100644
--- a/database/factories/QuoteInvitationFactory.php
+++ b/database/factories/QuoteInvitationFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\QuoteInvitation;
@@ -16,13 +17,6 @@ use Illuminate\Support\Str;
 
 class QuoteInvitationFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = QuoteInvitation::class;
-
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/RecurringExpenseFactory.php b/database/factories/RecurringExpenseFactory.php
index af85d7090fa9..fb58a0f3dd27 100644
--- a/database/factories/RecurringExpenseFactory.php
+++ b/database/factories/RecurringExpenseFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\RecurringExpense;
@@ -15,13 +16,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class RecurringExpenseFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = RecurringExpense::class;
-
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/RecurringInvoiceFactory.php b/database/factories/RecurringInvoiceFactory.php
index 28e218ab1fea..e7401970296a 100644
--- a/database/factories/RecurringInvoiceFactory.php
+++ b/database/factories/RecurringInvoiceFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\RecurringInvoice;
@@ -15,13 +16,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class RecurringInvoiceFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = RecurringInvoice::class;
-
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/RecurringQuoteFactory.php b/database/factories/RecurringQuoteFactory.php
index 4b76a128e954..42351f3275d7 100644
--- a/database/factories/RecurringQuoteFactory.php
+++ b/database/factories/RecurringQuoteFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\RecurringQuote;
@@ -15,13 +16,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class RecurringQuoteFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = RecurringQuote::class;
-
     /**
      * Define the model's default state.
      *
@@ -30,29 +24,29 @@ class RecurringQuoteFactory extends Factory
     public function definition()
     {
         return [
-                'status_id' => RecurringQuote::STATUS_DRAFT,
-                'number' => $this->faker->text(256),
-                'discount' => $this->faker->numberBetween(1, 10),
-                'is_amount_discount' => $this->faker->boolean(),
-                'tax_name1' => 'GST',
-                'tax_rate1' => 10,
-                'tax_name2' => 'VAT',
-                'tax_rate2' => 17.5,
-                'tax_name3' => 'THIRDTAX',
-                'tax_rate3' => 5,
-                'custom_value1' => $this->faker->numberBetween(1, 4),
-                'custom_value2' => $this->faker->numberBetween(1, 4),
-                'custom_value3' => $this->faker->numberBetween(1, 4),
-                'custom_value4' => $this->faker->numberBetween(1, 4),
-                'is_deleted' => false,
-                'po_number' => $this->faker->text(10),
-                'date' => $this->faker->date(),
-                'due_date' => $this->faker->date(),
-                'line_items' => false,
-                'frequency_id' => RecurringQuote::FREQUENCY_MONTHLY,
-                'last_sent_date' => $this->faker->date(),
-                'next_send_date' => $this->faker->date(),
-                'remaining_cycles' => $this->faker->numberBetween(1, 10),
-            ];
+            'status_id' => RecurringQuote::STATUS_DRAFT,
+            'number' => $this->faker->text(256),
+            'discount' => $this->faker->numberBetween(1, 10),
+            'is_amount_discount' => $this->faker->boolean(),
+            'tax_name1' => 'GST',
+            'tax_rate1' => 10,
+            'tax_name2' => 'VAT',
+            'tax_rate2' => 17.5,
+            'tax_name3' => 'THIRDTAX',
+            'tax_rate3' => 5,
+            'custom_value1' => $this->faker->numberBetween(1, 4),
+            'custom_value2' => $this->faker->numberBetween(1, 4),
+            'custom_value3' => $this->faker->numberBetween(1, 4),
+            'custom_value4' => $this->faker->numberBetween(1, 4),
+            'is_deleted' => false,
+            'po_number' => $this->faker->text(10),
+            'date' => $this->faker->date(),
+            'due_date' => $this->faker->date(),
+            'line_items' => false,
+            'frequency_id' => RecurringQuote::FREQUENCY_MONTHLY,
+            'last_sent_date' => $this->faker->date(),
+            'next_send_date' => $this->faker->date(),
+            'remaining_cycles' => $this->faker->numberBetween(1, 10),
+        ];
     }
 }
diff --git a/database/factories/SubscriptionFactory.php b/database/factories/SubscriptionFactory.php
index 9052dccc44a9..f8bbf991da5a 100644
--- a/database/factories/SubscriptionFactory.php
+++ b/database/factories/SubscriptionFactory.php
@@ -7,7 +7,7 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace Database\Factories;
@@ -18,13 +18,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class SubscriptionFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Subscription::class;
-
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/TaskFactory.php b/database/factories/TaskFactory.php
index 7f26e25073c6..b252652d0b69 100644
--- a/database/factories/TaskFactory.php
+++ b/database/factories/TaskFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\Task;
@@ -15,13 +16,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class TaskFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Task::class;
-
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/TaskStatusFactory.php b/database/factories/TaskStatusFactory.php
index 24dc5b8bd32f..0ac62f60bfa3 100644
--- a/database/factories/TaskStatusFactory.php
+++ b/database/factories/TaskStatusFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\TaskStatus;
@@ -15,13 +16,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class TaskStatusFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = TaskStatus::class;
-
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/TaxRateFactory.php b/database/factories/TaxRateFactory.php
index 6aa7a5f57468..ef1be4c3a7be 100644
--- a/database/factories/TaxRateFactory.php
+++ b/database/factories/TaxRateFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\TaxRate;
@@ -16,13 +17,6 @@ use Illuminate\Support\Str;
 
 class TaxRateFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = TaxRate::class;
-
     /**
      * Define the model's default state.
      *
@@ -32,7 +26,7 @@ class TaxRateFactory extends Factory
     {
         return [
             'name' => $this->faker->word(3),
-            'rate' => rand(1,20)
+            'rate' => rand(1, 20),
         ];
     }
 }
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 5f7b5f7e6350..8e8edc2f2192 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\User;
@@ -15,13 +16,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class UserFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = User::class;
-
     /**
      * Define the model's default state.
      *
@@ -30,9 +24,9 @@ class UserFactory extends Factory
     public function definition()
     {
         return [
-            'first_name'        => $this->faker->name,
-            'last_name'         => $this->faker->name,
-            'phone'             => $this->faker->phoneNumber,
+            'first_name'        => $this->faker->name(),
+            'last_name'         => $this->faker->name(),
+            'phone'             => $this->faker->phoneNumber(),
             'email'             => config('ninja.testvars.username'),
             'email_verified_at' => now(),
             'password'          => bcrypt(config('ninja.testvars.password')), // secret
diff --git a/database/factories/VendorContactFactory.php b/database/factories/VendorContactFactory.php
index ab39860b83bf..f0bede1531c3 100644
--- a/database/factories/VendorContactFactory.php
+++ b/database/factories/VendorContactFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\VendorContact;
@@ -15,13 +16,6 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 
 class VendorContactFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = VendorContact::class;
-
     /**
      * Define the model's default state.
      *
@@ -30,10 +24,10 @@ class VendorContactFactory extends Factory
     public function definition()
     {
         return [
-            'first_name' => $this->faker->firstName,
-            'last_name' => $this->faker->lastName,
-            'phone' => $this->faker->phoneNumber,
-            'email' => $this->faker->unique()->safeEmail,
+            'first_name' => $this->faker->firstName(),
+            'last_name' => $this->faker->lastName(),
+            'phone' => $this->faker->phoneNumber(),
+            'email' => $this->faker->unique()->safeEmail(),
         ];
     }
 }
diff --git a/database/factories/VendorFactory.php b/database/factories/VendorFactory.php
index 9be8f88d2b5b..7fd4b0668857 100644
--- a/database/factories/VendorFactory.php
+++ b/database/factories/VendorFactory.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Factories;
 
 use App\Models\Vendor;
@@ -16,13 +17,6 @@ use Illuminate\Support\Str;
 
 class VendorFactory extends Factory
 {
-    /**
-     * The name of the factory's corresponding model.
-     *
-     * @var string
-     */
-    protected $model = Vendor::class;
-
     /**
      * Define the model's default state.
      *
@@ -32,7 +26,7 @@ class VendorFactory extends Factory
     {
         return [
             'name' => $this->faker->name(),
-            'website' => $this->faker->url,
+            'website' => $this->faker->url(),
             'private_notes' => $this->faker->text(200),
             'vat_number' => $this->faker->text(25),
             'id_number' => $this->faker->text(20),
@@ -40,11 +34,11 @@ class VendorFactory extends Factory
             'custom_value2' => $this->faker->text(20),
             'custom_value3' => $this->faker->text(20),
             'custom_value4' => $this->faker->text(20),
-            'address1' => $this->faker->buildingNumber,
-            'address2' => $this->faker->streetAddress,
-            'city' => $this->faker->city,
-            'state' => $this->faker->state,
-            'postal_code' => $this->faker->postcode,
+            'address1' => $this->faker->buildingNumber(),
+            'address2' => $this->faker->streetAddress(),
+            'city' => $this->faker->city(),
+            'state' => $this->faker->state(),
+            'postal_code' => $this->faker->postcode(),
             'country_id' => 4,
             'vendor_hash' => Str::random(40),
 
diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php
index bbdfbb7b8580..ec3bcc5af9ec 100644
--- a/database/migrations/2014_10_12_100000_create_password_resets_table.php
+++ b/database/migrations/2014_10_12_100000_create_password_resets_table.php
@@ -6,16 +6,14 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreatePasswordResetsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -39,4 +37,4 @@ class CreatePasswordResetsTable extends Migration
     {
         Schema::dropIfExists('password_resets');
     }
-}
+};
diff --git a/database/migrations/2014_10_13_000000_create_users_table.php b/database/migrations/2014_10_13_000000_create_users_table.php
index ec1a40d22054..59de4b5047b4 100644
--- a/database/migrations/2014_10_13_000000_create_users_table.php
+++ b/database/migrations/2014_10_13_000000_create_users_table.php
@@ -6,17 +6,15 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
-class CreateUsersTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -1250,7 +1248,6 @@ class CreateUsersTable extends Migration
             $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade')->onUpdate('cascade');
         });
 
-
         Schema::create('expense_categories', function ($table) {
             $table->increments('id');
             $table->unsignedInteger('user_id');
@@ -1397,4 +1394,4 @@ class CreateUsersTable extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2019_11_10_115926_create_failed_jobs_table.php b/database/migrations/2019_11_10_115926_create_failed_jobs_table.php
index 4f54c1e7707e..541961e8c57e 100644
--- a/database/migrations/2019_11_10_115926_create_failed_jobs_table.php
+++ b/database/migrations/2019_11_10_115926_create_failed_jobs_table.php
@@ -6,16 +6,14 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateFailedJobsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -42,4 +40,4 @@ class CreateFailedJobsTable extends Migration
     {
         Schema::dropIfExists('failed_jobs');
     }
-}
+};
diff --git a/database/migrations/2020_03_05_123315_create_jobs_table.php b/database/migrations/2020_03_05_123315_create_jobs_table.php
index f8667c0d1580..fce0a7ea5ad3 100644
--- a/database/migrations/2020_03_05_123315_create_jobs_table.php
+++ b/database/migrations/2020_03_05_123315_create_jobs_table.php
@@ -6,16 +6,14 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateJobsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -43,4 +41,4 @@ class CreateJobsTable extends Migration
     {
         Schema::dropIfExists('jobs');
     }
-}
+};
diff --git a/database/migrations/2020_04_08_234530_add_is_deleted_column_to_company_tokens_table.php b/database/migrations/2020_04_08_234530_add_is_deleted_column_to_company_tokens_table.php
index ca996d2e4082..db13ec91da2f 100644
--- a/database/migrations/2020_04_08_234530_add_is_deleted_column_to_company_tokens_table.php
+++ b/database/migrations/2020_04_08_234530_add_is_deleted_column_to_company_tokens_table.php
@@ -6,16 +6,14 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddIsDeletedColumnToCompanyTokensTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -58,4 +56,4 @@ class AddIsDeletedColumnToCompanyTokensTable extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2020_05_13_035355_add_google_refresh_token_to_users_table.php b/database/migrations/2020_05_13_035355_add_google_refresh_token_to_users_table.php
index d1f912e7e67c..8baafed8e752 100644
--- a/database/migrations/2020_05_13_035355_add_google_refresh_token_to_users_table.php
+++ b/database/migrations/2020_05_13_035355_add_google_refresh_token_to_users_table.php
@@ -6,17 +6,15 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
-class AddGoogleRefreshTokenToUsersTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -43,4 +41,4 @@ class AddGoogleRefreshTokenToUsersTable extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2020_07_05_084934_company_too_large_attribute.php b/database/migrations/2020_07_05_084934_company_too_large_attribute.php
index 98c49efc798c..48f6bd06daad 100644
--- a/database/migrations/2020_07_05_084934_company_too_large_attribute.php
+++ b/database/migrations/2020_07_05_084934_company_too_large_attribute.php
@@ -6,16 +6,14 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CompanyTooLargeAttribute extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -43,4 +41,4 @@ class CompanyTooLargeAttribute extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_07_08_065301_add_token_id_to_activity_table.php b/database/migrations/2020_07_08_065301_add_token_id_to_activity_table.php
index 14d96c2eaacb..75e5a66e9326 100644
--- a/database/migrations/2020_07_08_065301_add_token_id_to_activity_table.php
+++ b/database/migrations/2020_07_08_065301_add_token_id_to_activity_table.php
@@ -6,16 +6,14 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddTokenIdToActivityTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -40,4 +38,4 @@ class AddTokenIdToActivityTable extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2020_07_21_112424_update_enabled_modules_value.php b/database/migrations/2020_07_21_112424_update_enabled_modules_value.php
index 4158a742342f..04512481f96f 100644
--- a/database/migrations/2020_07_21_112424_update_enabled_modules_value.php
+++ b/database/migrations/2020_07_21_112424_update_enabled_modules_value.php
@@ -6,15 +6,13 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use App\Models\Company;
 use Illuminate\Database\Migrations\Migration;
 
-class UpdateEnabledModulesValue extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -37,4 +35,4 @@ class UpdateEnabledModulesValue extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_07_28_104218_shop_token.php b/database/migrations/2020_07_28_104218_shop_token.php
index 685578c53449..2c04a0880bba 100644
--- a/database/migrations/2020_07_28_104218_shop_token.php
+++ b/database/migrations/2020_07_28_104218_shop_token.php
@@ -6,16 +6,14 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ShopToken extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -37,4 +35,4 @@ class ShopToken extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_08_04_080851_add_is_deleted_to_group_settings.php b/database/migrations/2020_08_04_080851_add_is_deleted_to_group_settings.php
index 8f2a30b6b0a1..bb9f67f6e911 100644
--- a/database/migrations/2020_08_04_080851_add_is_deleted_to_group_settings.php
+++ b/database/migrations/2020_08_04_080851_add_is_deleted_to_group_settings.php
@@ -6,16 +6,14 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddIsDeletedToGroupSettings extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -36,4 +34,4 @@ class AddIsDeletedToGroupSettings extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2020_08_11_221627_add_is_deleted_flag_to_client_gateway_token_table.php b/database/migrations/2020_08_11_221627_add_is_deleted_flag_to_client_gateway_token_table.php
index d0e267864ff1..b7d39f23f3d7 100644
--- a/database/migrations/2020_08_11_221627_add_is_deleted_flag_to_client_gateway_token_table.php
+++ b/database/migrations/2020_08_11_221627_add_is_deleted_flag_to_client_gateway_token_table.php
@@ -6,16 +6,14 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddIsDeletedFlagToClientGatewayTokenTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -36,4 +34,4 @@ class AddIsDeletedFlagToClientGatewayTokenTable extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2020_08_13_095946_remove_photo_design.php b/database/migrations/2020_08_13_095946_remove_photo_design.php
index 1898f1929bc4..ab06c1ec05bf 100644
--- a/database/migrations/2020_08_13_095946_remove_photo_design.php
+++ b/database/migrations/2020_08_13_095946_remove_photo_design.php
@@ -6,15 +6,13 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use App\Models\Design;
 use Illuminate\Database\Migrations\Migration;
 
-class RemovePhotoDesign extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -38,4 +36,4 @@ class RemovePhotoDesign extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_08_13_212702_add_reminder_sent_fields_to_entity_tables.php b/database/migrations/2020_08_13_212702_add_reminder_sent_fields_to_entity_tables.php
index 2f6a47375dd1..a80e9b6e6704 100644
--- a/database/migrations/2020_08_13_212702_add_reminder_sent_fields_to_entity_tables.php
+++ b/database/migrations/2020_08_13_212702_add_reminder_sent_fields_to_entity_tables.php
@@ -6,16 +6,14 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddReminderSentFieldsToEntityTables extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -57,4 +55,4 @@ class AddReminderSentFieldsToEntityTables extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php b/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
index 12c921c27f0f..8628c31217b3 100644
--- a/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
+++ b/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
@@ -6,16 +6,14 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddIsPublicToDocumentsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -84,7 +82,7 @@ class AddIsPublicToDocumentsTable extends Migration
         Schema::table('companies', function ($table) {
             $table->enum('default_auto_bill', ['off', 'always', 'optin', 'optout'])->default('off');
         });
-    
+
         Schema::create('recurring_invoice_invitations', function ($t) {
             $t->increments('id');
             $t->unsignedInteger('company_id');
@@ -114,4 +112,4 @@ class AddIsPublicToDocumentsTable extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php b/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php
index 5d48e75e7560..79391c9631ff 100644
--- a/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php
+++ b/database/migrations/2020_09_22_205113_id_number_fields_for_missing_entities.php
@@ -6,16 +6,14 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class IdNumberFieldsForMissingEntities extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -27,7 +25,7 @@ class IdNumberFieldsForMissingEntities extends Migration
             $table->string('number')->nullable();
             $table->unique(['company_id', 'number']);
         });
-    
+
         Schema::table('tasks', function (Blueprint $table) {
             $table->string('number')->nullable();
             $table->unique(['company_id', 'number']);
@@ -53,4 +51,4 @@ class IdNumberFieldsForMissingEntities extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_09_27_215800_update_gateway_table_visible_column.php b/database/migrations/2020_09_27_215800_update_gateway_table_visible_column.php
index 433d85c22f58..a92881cca488 100644
--- a/database/migrations/2020_09_27_215800_update_gateway_table_visible_column.php
+++ b/database/migrations/2020_09_27_215800_update_gateway_table_visible_column.php
@@ -6,16 +6,14 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use App\Models\Gateway;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\Schema;
 
-class UpdateGatewayTableVisibleColumn extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -25,7 +23,7 @@ class UpdateGatewayTableVisibleColumn extends Migration
     {
         Gateway::query()->update(['visible' => 0]);
 
-        Gateway::whereIn('id', [1,15,20,39])->update(['visible' => 1]);
+        Gateway::whereIn('id', [1, 15, 20, 39])->update(['visible' => 1]);
 
         Schema::table('recurring_invoice_invitations', function ($t) {
             $t->string('transaction_reference')->nullable();
@@ -51,8 +49,6 @@ class UpdateGatewayTableVisibleColumn extends Migration
         });
     }
 
-
-
     /**
      * Reverse the migrations.
      *
@@ -62,4 +58,4 @@ class UpdateGatewayTableVisibleColumn extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_10_11_211122_vendor_schema_update.php b/database/migrations/2020_10_11_211122_vendor_schema_update.php
index 9eeb53026110..f7166f7c23a6 100644
--- a/database/migrations/2020_10_11_211122_vendor_schema_update.php
+++ b/database/migrations/2020_10_11_211122_vendor_schema_update.php
@@ -6,16 +6,14 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class VendorSchemaUpdate extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -23,7 +21,7 @@ class VendorSchemaUpdate extends Migration
      */
     public function up()
     {
-        Schema::table('vendor_contacts', function ($table){
+        Schema::table('vendor_contacts', function ($table) {
             $table->timestamp('email_verified_at')->nullable();
             $table->string('confirmation_code')->nullable();
             $table->boolean('confirmed')->default(false);
@@ -54,4 +52,4 @@ class VendorSchemaUpdate extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_10_12_204517_project_number_column.php b/database/migrations/2020_10_12_204517_project_number_column.php
index 8eb2f2ce9e91..bb0c6be1b4f8 100644
--- a/database/migrations/2020_10_12_204517_project_number_column.php
+++ b/database/migrations/2020_10_12_204517_project_number_column.php
@@ -6,15 +6,13 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\Schema;
 
-class ProjectNumberColumn extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -45,4 +43,4 @@ class ProjectNumberColumn extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_10_14_201320_project_ids_to_entities.php b/database/migrations/2020_10_14_201320_project_ids_to_entities.php
index 10f562691c5f..f9b308fff27a 100644
--- a/database/migrations/2020_10_14_201320_project_ids_to_entities.php
+++ b/database/migrations/2020_10_14_201320_project_ids_to_entities.php
@@ -6,16 +6,14 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ProjectIdsToEntities extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -46,4 +44,4 @@ class ProjectIdsToEntities extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2020_10_19_101823_project_name_unique_removal.php b/database/migrations/2020_10_19_101823_project_name_unique_removal.php
index f7b79c965ce4..48d4ef9bdde4 100644
--- a/database/migrations/2020_10_19_101823_project_name_unique_removal.php
+++ b/database/migrations/2020_10_19_101823_project_name_unique_removal.php
@@ -6,16 +6,14 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ProjectNameUniqueRemoval extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -71,4 +69,4 @@ class ProjectNameUniqueRemoval extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_10_21_222738_expenses_nullable_assigned_user.php b/database/migrations/2020_10_21_222738_expenses_nullable_assigned_user.php
index 1118424f0c8d..268a9ae7a357 100644
--- a/database/migrations/2020_10_21_222738_expenses_nullable_assigned_user.php
+++ b/database/migrations/2020_10_21_222738_expenses_nullable_assigned_user.php
@@ -6,16 +6,14 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ExpensesNullableAssignedUser extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -37,4 +35,4 @@ class ExpensesNullableAssignedUser extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_10_22_204900_company_table_fields.php b/database/migrations/2020_10_22_204900_company_table_fields.php
index 0e51dcbfd97b..8dfb9ea7c415 100644
--- a/database/migrations/2020_10_22_204900_company_table_fields.php
+++ b/database/migrations/2020_10_22_204900_company_table_fields.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CompanyTableFields extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -33,4 +32,4 @@ class CompanyTableFields extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_10_27_021751_tasks_invoice_documents.php b/database/migrations/2020_10_27_021751_tasks_invoice_documents.php
index 112cfbe73388..f794cdba7d81 100644
--- a/database/migrations/2020_10_27_021751_tasks_invoice_documents.php
+++ b/database/migrations/2020_10_27_021751_tasks_invoice_documents.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class TasksInvoiceDocuments extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -43,4 +42,4 @@ class TasksInvoiceDocuments extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_10_28_224711_status_sort_order.php b/database/migrations/2020_10_28_224711_status_sort_order.php
index 3cb2dfd34d3a..4d0c403a58f9 100644
--- a/database/migrations/2020_10_28_224711_status_sort_order.php
+++ b/database/migrations/2020_10_28_224711_status_sort_order.php
@@ -3,8 +3,7 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\Schema;
 
-class StatusSortOrder extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -26,4 +25,4 @@ class StatusSortOrder extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_10_28_225022_assigned_user_tasks_table.php b/database/migrations/2020_10_28_225022_assigned_user_tasks_table.php
index 738ae8e69779..b2d521d54c87 100644
--- a/database/migrations/2020_10_28_225022_assigned_user_tasks_table.php
+++ b/database/migrations/2020_10_28_225022_assigned_user_tasks_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AssignedUserTasksTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -27,4 +26,4 @@ class AssignedUserTasksTable extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_10_29_001541_vendors_phone_column.php b/database/migrations/2020_10_29_001541_vendors_phone_column.php
index f1cec4e9a616..031304a515b1 100644
--- a/database/migrations/2020_10_29_001541_vendors_phone_column.php
+++ b/database/migrations/2020_10_29_001541_vendors_phone_column.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class VendorsPhoneColumn extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -13,7 +12,7 @@ class VendorsPhoneColumn extends Migration
      */
     public function up()
     {
-        Schema::table('vendors', function ($t){
+        Schema::table('vendors', function ($t) {
             $t->renameColumn('work_phone', 'phone');
         });
     }
@@ -27,4 +26,4 @@ class VendorsPhoneColumn extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_10_29_093836_change_start_time_column_type.php b/database/migrations/2020_10_29_093836_change_start_time_column_type.php
index b3670c47a457..b4184e56fd6a 100644
--- a/database/migrations/2020_10_29_093836_change_start_time_column_type.php
+++ b/database/migrations/2020_10_29_093836_change_start_time_column_type.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ChangeStartTimeColumnType extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -27,4 +26,4 @@ class ChangeStartTimeColumnType extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_10_29_204434_tasks_table_project_nullable.php b/database/migrations/2020_10_29_204434_tasks_table_project_nullable.php
index 78af867014a2..ce24992a9a68 100644
--- a/database/migrations/2020_10_29_204434_tasks_table_project_nullable.php
+++ b/database/migrations/2020_10_29_204434_tasks_table_project_nullable.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class TasksTableProjectNullable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -27,4 +26,4 @@ class TasksTableProjectNullable extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_10_29_210402_change_default_show_tasks_table.php b/database/migrations/2020_10_29_210402_change_default_show_tasks_table.php
index 741a809b5c1c..55cdda57e2d0 100644
--- a/database/migrations/2020_10_29_210402_change_default_show_tasks_table.php
+++ b/database/migrations/2020_10_29_210402_change_default_show_tasks_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ChangeDefaultShowTasksTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -27,4 +26,4 @@ class ChangeDefaultShowTasksTable extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_10_30_084139_change_expense_currency_id_column.php b/database/migrations/2020_10_30_084139_change_expense_currency_id_column.php
index 0fcb88fd9bb6..045251bb03d1 100644
--- a/database/migrations/2020_10_30_084139_change_expense_currency_id_column.php
+++ b/database/migrations/2020_10_30_084139_change_expense_currency_id_column.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ChangeExpenseCurrencyIdColumn extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -31,4 +30,4 @@ class ChangeExpenseCurrencyIdColumn extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_11_01_031750_drop_migrating_column.php b/database/migrations/2020_11_01_031750_drop_migrating_column.php
index 0bb55768259e..f73aff33322b 100644
--- a/database/migrations/2020_11_01_031750_drop_migrating_column.php
+++ b/database/migrations/2020_11_01_031750_drop_migrating_column.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class DropMigratingColumn extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -27,4 +26,4 @@ class DropMigratingColumn extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_11_03_200345_company_gateway_fields_refactor.php b/database/migrations/2020_11_03_200345_company_gateway_fields_refactor.php
index 67305af17b04..9c8387d4402b 100644
--- a/database/migrations/2020_11_03_200345_company_gateway_fields_refactor.php
+++ b/database/migrations/2020_11_03_200345_company_gateway_fields_refactor.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CompanyGatewayFieldsRefactor extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -33,4 +32,4 @@ class CompanyGatewayFieldsRefactor extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_11_08_212050_custom_fields_for_payments_table.php b/database/migrations/2020_11_08_212050_custom_fields_for_payments_table.php
index 039f60d0c1c6..320a9d85ac63 100644
--- a/database/migrations/2020_11_08_212050_custom_fields_for_payments_table.php
+++ b/database/migrations/2020_11_08_212050_custom_fields_for_payments_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CustomFieldsForPaymentsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -30,4 +29,4 @@ class CustomFieldsForPaymentsTable extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_11_12_104413_company_gateway_rename_column.php b/database/migrations/2020_11_12_104413_company_gateway_rename_column.php
index 3be9a3a66f48..b81637951d49 100644
--- a/database/migrations/2020_11_12_104413_company_gateway_rename_column.php
+++ b/database/migrations/2020_11_12_104413_company_gateway_rename_column.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CompanyGatewayRenameColumn extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -27,4 +26,4 @@ class CompanyGatewayRenameColumn extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_11_15_203755_soft_delete_paymentables.php b/database/migrations/2020_11_15_203755_soft_delete_paymentables.php
index bf744ae13725..78219bb2b729 100644
--- a/database/migrations/2020_11_15_203755_soft_delete_paymentables.php
+++ b/database/migrations/2020_11_15_203755_soft_delete_paymentables.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class SoftDeletePaymentables extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -27,4 +26,4 @@ class SoftDeletePaymentables extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_12_14_114722_task_fields.php b/database/migrations/2020_12_14_114722_task_fields.php
index 440330421bf0..d6618df9b434 100644
--- a/database/migrations/2020_12_14_114722_task_fields.php
+++ b/database/migrations/2020_12_14_114722_task_fields.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class TaskFields extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -31,4 +30,4 @@ class TaskFields extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_12_17_104033_add_enable_product_discount_field_to_companies_table.php b/database/migrations/2020_12_17_104033_add_enable_product_discount_field_to_companies_table.php
index 24ea3836c6d0..7c14b561fb2a 100644
--- a/database/migrations/2020_12_17_104033_add_enable_product_discount_field_to_companies_table.php
+++ b/database/migrations/2020_12_17_104033_add_enable_product_discount_field_to_companies_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddEnableProductDiscountFieldToCompaniesTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -29,4 +28,4 @@ class AddEnableProductDiscountFieldToCompaniesTable extends Migration
             //
         });
     }
-}
+};
diff --git a/database/migrations/2020_12_20_005609_change_products_table_cost_resolution.php b/database/migrations/2020_12_20_005609_change_products_table_cost_resolution.php
index c7682c5f2ac7..971033a29141 100644
--- a/database/migrations/2020_12_20_005609_change_products_table_cost_resolution.php
+++ b/database/migrations/2020_12_20_005609_change_products_table_cost_resolution.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ChangeProductsTableCostResolution extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -29,4 +28,4 @@ class ChangeProductsTableCostResolution extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2020_12_23_220648_remove_null_values_in_countries_table.php b/database/migrations/2020_12_23_220648_remove_null_values_in_countries_table.php
index 02c1e9ed7502..d7c605e661f1 100644
--- a/database/migrations/2020_12_23_220648_remove_null_values_in_countries_table.php
+++ b/database/migrations/2020_12_23_220648_remove_null_values_in_countries_table.php
@@ -5,8 +5,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class RemoveNullValuesInCountriesTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -29,4 +28,4 @@ class RemoveNullValuesInCountriesTable extends Migration
             //
         });
     }
-}
+};
diff --git a/database/migrations/2021_01_03_215053_update_canadian_dollar_symbol.php b/database/migrations/2021_01_03_215053_update_canadian_dollar_symbol.php
index c4fd282f3d21..0a8d5c9204c0 100644
--- a/database/migrations/2021_01_03_215053_update_canadian_dollar_symbol.php
+++ b/database/migrations/2021_01_03_215053_update_canadian_dollar_symbol.php
@@ -4,9 +4,9 @@ use App\Models\Currency;
 use App\Utils\Traits\AppSetup;
 use Illuminate\Database\Migrations\Migration;
 
-class UpdateCanadianDollarSymbol extends Migration
-{
+return new class extends Migration {
     use AppSetup;
+
     /**
      * Run the migrations.
      *
@@ -32,4 +32,4 @@ class UpdateCanadianDollarSymbol extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_01_05_013203_improve_decimal_resolution.php b/database/migrations/2021_01_05_013203_improve_decimal_resolution.php
index 72cccfd524dd..893442332202 100644
--- a/database/migrations/2021_01_05_013203_improve_decimal_resolution.php
+++ b/database/migrations/2021_01_05_013203_improve_decimal_resolution.php
@@ -6,8 +6,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ImproveDecimalResolution extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -15,12 +14,11 @@ class ImproveDecimalResolution extends Migration
      */
     public function up()
     {
-   
         Schema::table('company_ledgers', function (Blueprint $table) {
             $table->decimal('balance', 20, 6)->change();
             $table->decimal('adjustment', 20, 6)->change();
         });
-   
+
         Schema::table('credits', function (Blueprint $table) {
             $table->decimal('tax_rate1', 20, 6)->change();
             $table->decimal('tax_rate2', 20, 6)->change();
@@ -110,7 +108,7 @@ class ImproveDecimalResolution extends Migration
             $table->integer('status_sort_order')->nullable()->default(null)->change();
         });
 
-        Schema::table('task_statuses', function (Blueprint $table){
+        Schema::table('task_statuses', function (Blueprint $table) {
             $table->string('color')->default('#fff');
             $table->integer('status_sort_order')->nullable()->default(null)->change();
         });
@@ -124,27 +122,26 @@ class ImproveDecimalResolution extends Migration
             $table->boolean('hide_empty_columns_on_pdf')->false();
         });
 
-        Schema::table('expense_categories', function (Blueprint $table){
+        Schema::table('expense_categories', function (Blueprint $table) {
             $table->string('color')->default('#fff');
         });
 
-        Schema::table('projects', function (Blueprint $table){
+        Schema::table('projects', function (Blueprint $table) {
             $table->string('color')->default('#fff');
         });
 
-
-        Task::query()->update(['status_sort_order' => NULL]);
-        TaskStatus::query()->update(['status_sort_order' => NULL]);
+        Task::query()->update(['status_sort_order' => null]);
+        TaskStatus::query()->update(['status_sort_order' => null]);
 
         Schema::table('tasks', function (Blueprint $table) {
             $table->integer('status_order')->nullable();
         });
 
-        Schema::table('task_statuses', function (Blueprint $table){
+        Schema::table('task_statuses', function (Blueprint $table) {
             $table->integer('status_order')->nullable();
         });
 
-         Schema::table('companies', function (Blueprint $table) {
+        Schema::table('companies', function (Blueprint $table) {
             $table->dropColumn('hide_empty_columns_on_pdf');
         });
     }
@@ -158,4 +155,4 @@ class ImproveDecimalResolution extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_01_07_023350_update_singapore_dollar_symbol.php b/database/migrations/2021_01_07_023350_update_singapore_dollar_symbol.php
index cd80cef7bb70..1915a4cfdee6 100644
--- a/database/migrations/2021_01_07_023350_update_singapore_dollar_symbol.php
+++ b/database/migrations/2021_01_07_023350_update_singapore_dollar_symbol.php
@@ -4,9 +4,9 @@ use App\Models\Currency;
 use App\Utils\Traits\AppSetup;
 use Illuminate\Database\Migrations\Migration;
 
-class UpdateSingaporeDollarSymbol extends Migration
-{
+return new class extends Migration {
     use AppSetup;
+
     /**
      * Run the migrations.
      *
@@ -32,4 +32,4 @@ class UpdateSingaporeDollarSymbol extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_01_08_093324_expenses_table_additional_fields.php b/database/migrations/2021_01_08_093324_expenses_table_additional_fields.php
index 8d7b7bc5fc5b..8ebdc904c7d2 100644
--- a/database/migrations/2021_01_08_093324_expenses_table_additional_fields.php
+++ b/database/migrations/2021_01_08_093324_expenses_table_additional_fields.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ExpensesTableAdditionalFields extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -13,7 +12,6 @@ class ExpensesTableAdditionalFields extends Migration
      */
     public function up()
     {
-           
         Schema::table('expenses', function (Blueprint $table) {
             $table->decimal('tax_amount1', 20, 6)->default();
             $table->decimal('tax_amount2', 20, 6)->default();
@@ -21,7 +19,7 @@ class ExpensesTableAdditionalFields extends Migration
             $table->boolean('uses_inclusive_taxes')->default(0);
             $table->boolean('amount_is_pretax')->default(1);
         });
-   
+
         Schema::table('companies', function (Blueprint $table) {
             $table->boolean('expense_inclusive_taxes')->default(0);
             $table->boolean('expense_amount_is_pretax')->default(1);
@@ -37,4 +35,4 @@ class ExpensesTableAdditionalFields extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_01_11_092056_fix_company_settings_url.php b/database/migrations/2021_01_11_092056_fix_company_settings_url.php
index 1df76cd65b9a..ea156bef958f 100644
--- a/database/migrations/2021_01_11_092056_fix_company_settings_url.php
+++ b/database/migrations/2021_01_11_092056_fix_company_settings_url.php
@@ -5,8 +5,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class FixCompanySettingsUrl extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -14,9 +13,7 @@ class FixCompanySettingsUrl extends Migration
      */
     public function up()
     {
-
-        Company::all()->each(function ($company){
-
+        Company::all()->each(function ($company) {
             $settings = $company->settings;
 
             $company_logo = $settings->company_logo;
@@ -26,7 +23,6 @@ class FixCompanySettingsUrl extends Migration
 
             $company->settings = $settings;
             $company->save();
-
         });
 
         Schema::table('companies', function (Blueprint $table) {
@@ -53,4 +49,4 @@ class FixCompanySettingsUrl extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_01_17_040331_change_custom_surcharge_column_type.php b/database/migrations/2021_01_17_040331_change_custom_surcharge_column_type.php
index 13ab32f111a8..cf00db8af5e3 100644
--- a/database/migrations/2021_01_17_040331_change_custom_surcharge_column_type.php
+++ b/database/migrations/2021_01_17_040331_change_custom_surcharge_column_type.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ChangeCustomSurchargeColumnType extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -14,35 +13,32 @@ class ChangeCustomSurchargeColumnType extends Migration
     public function up()
     {
         Schema::table('invoices', function (Blueprint $table) {
-            $table->decimal('custom_surcharge1', 20,6)->change();
-            $table->decimal('custom_surcharge2', 20,6)->change();
-            $table->decimal('custom_surcharge3', 20,6)->change();
-            $table->decimal('custom_surcharge4', 20,6)->change();
+            $table->decimal('custom_surcharge1', 20, 6)->change();
+            $table->decimal('custom_surcharge2', 20, 6)->change();
+            $table->decimal('custom_surcharge3', 20, 6)->change();
+            $table->decimal('custom_surcharge4', 20, 6)->change();
         });
 
         Schema::table('recurring_invoices', function (Blueprint $table) {
-            $table->decimal('custom_surcharge1', 20,6)->change();
-            $table->decimal('custom_surcharge2', 20,6)->change();
-            $table->decimal('custom_surcharge3', 20,6)->change();
-            $table->decimal('custom_surcharge4', 20,6)->change();
+            $table->decimal('custom_surcharge1', 20, 6)->change();
+            $table->decimal('custom_surcharge2', 20, 6)->change();
+            $table->decimal('custom_surcharge3', 20, 6)->change();
+            $table->decimal('custom_surcharge4', 20, 6)->change();
         });
 
-
         Schema::table('quotes', function (Blueprint $table) {
-            $table->decimal('custom_surcharge1', 20,6)->change();
-            $table->decimal('custom_surcharge2', 20,6)->change();
-            $table->decimal('custom_surcharge3', 20,6)->change();
-            $table->decimal('custom_surcharge4', 20,6)->change();
+            $table->decimal('custom_surcharge1', 20, 6)->change();
+            $table->decimal('custom_surcharge2', 20, 6)->change();
+            $table->decimal('custom_surcharge3', 20, 6)->change();
+            $table->decimal('custom_surcharge4', 20, 6)->change();
         });
 
-
         Schema::table('credits', function (Blueprint $table) {
-            $table->decimal('custom_surcharge1', 20,6)->change();
-            $table->decimal('custom_surcharge2', 20,6)->change();
-            $table->decimal('custom_surcharge3', 20,6)->change();
-            $table->decimal('custom_surcharge4', 20,6)->change();
+            $table->decimal('custom_surcharge1', 20, 6)->change();
+            $table->decimal('custom_surcharge2', 20, 6)->change();
+            $table->decimal('custom_surcharge3', 20, 6)->change();
+            $table->decimal('custom_surcharge4', 20, 6)->change();
         });
-
     }
 
     /**
@@ -54,4 +50,4 @@ class ChangeCustomSurchargeColumnType extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_01_23_044502_scheduler_is_running_check.php b/database/migrations/2021_01_23_044502_scheduler_is_running_check.php
index 5c8d2e91a928..2138589db63f 100644
--- a/database/migrations/2021_01_23_044502_scheduler_is_running_check.php
+++ b/database/migrations/2021_01_23_044502_scheduler_is_running_check.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class SchedulerIsRunningCheck extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -27,4 +26,4 @@ class SchedulerIsRunningCheck extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_01_24_052645_add_paid_to_date_column.php b/database/migrations/2021_01_24_052645_add_paid_to_date_column.php
index 614cce02b4a7..1446c3a49f7f 100644
--- a/database/migrations/2021_01_24_052645_add_paid_to_date_column.php
+++ b/database/migrations/2021_01_24_052645_add_paid_to_date_column.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddPaidToDateColumn extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -37,6 +36,5 @@ class AddPaidToDateColumn extends Migration
      */
     public function down()
     {
-
     }
-}
+};
diff --git a/database/migrations/2021_01_25_095351_add_number_field_to_clients_and_vendors.php b/database/migrations/2021_01_25_095351_add_number_field_to_clients_and_vendors.php
index 3a95f1cd3291..7e82339cbf63 100644
--- a/database/migrations/2021_01_25_095351_add_number_field_to_clients_and_vendors.php
+++ b/database/migrations/2021_01_25_095351_add_number_field_to_clients_and_vendors.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddNumberFieldToClientsAndVendors extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -29,9 +28,7 @@ class AddNumberFieldToClientsAndVendors extends Migration
         Schema::table('vendors', function (Blueprint $table) {
             $table->string('id_number')->nullable();
             $table->unique(['company_id', 'number']);
-
         });
-
     }
 
     /**
@@ -41,6 +38,5 @@ class AddNumberFieldToClientsAndVendors extends Migration
      */
     public function down()
     {
-
     }
-}
+};
diff --git a/database/migrations/2021_01_29_121502_add_permission_changed_timestamp.php b/database/migrations/2021_01_29_121502_add_permission_changed_timestamp.php
index 30ff2096d393..c0cf10974420 100644
--- a/database/migrations/2021_01_29_121502_add_permission_changed_timestamp.php
+++ b/database/migrations/2021_01_29_121502_add_permission_changed_timestamp.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddPermissionChangedTimestamp extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -27,4 +26,4 @@ class AddPermissionChangedTimestamp extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_02_15_214724_additional_company_properties.php b/database/migrations/2021_02_15_214724_additional_company_properties.php
index 2c76e3be117a..291456f5164c 100644
--- a/database/migrations/2021_02_15_214724_additional_company_properties.php
+++ b/database/migrations/2021_02_15_214724_additional_company_properties.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AdditionalCompanyProperties extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -13,7 +12,7 @@ class AdditionalCompanyProperties extends Migration
      */
     public function up()
     {
-        Schema::table('companies', function(Blueprint $table){
+        Schema::table('companies', function (Blueprint $table) {
             $table->integer('session_timeout')->default(0);
             $table->boolean('oauth_password_required')->default(0);
         });
@@ -28,4 +27,4 @@ class AdditionalCompanyProperties extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_02_19_212722_email_last_confirmed_email_address_users_table.php b/database/migrations/2021_02_19_212722_email_last_confirmed_email_address_users_table.php
index cf197f67de10..b10c306dc36b 100644
--- a/database/migrations/2021_02_19_212722_email_last_confirmed_email_address_users_table.php
+++ b/database/migrations/2021_02_19_212722_email_last_confirmed_email_address_users_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class EmailLastConfirmedEmailAddressUsersTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -13,7 +12,7 @@ class EmailLastConfirmedEmailAddressUsersTable extends Migration
      */
     public function up()
     {
-        Schema::table('users', function(Blueprint $table){
+        Schema::table('users', function (Blueprint $table) {
             $table->string('last_confirmed_email_address')->nullable();
         });
     }
@@ -27,4 +26,4 @@ class EmailLastConfirmedEmailAddressUsersTable extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_02_25_205901_enum_invitations_email_status.php b/database/migrations/2021_02_25_205901_enum_invitations_email_status.php
index cb7e8be1cce3..f8a30e525496 100644
--- a/database/migrations/2021_02_25_205901_enum_invitations_email_status.php
+++ b/database/migrations/2021_02_25_205901_enum_invitations_email_status.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class EnumInvitationsEmailStatus extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -13,19 +12,19 @@ class EnumInvitationsEmailStatus extends Migration
      */
     public function up()
     {
-        Schema::table('invoice_invitations', function(Blueprint $table){
+        Schema::table('invoice_invitations', function (Blueprint $table) {
             $table->enum('email_status', ['delivered', 'bounced', 'spam'])->nullable();
         });
 
-        Schema::table('quote_invitations', function(Blueprint $table){
+        Schema::table('quote_invitations', function (Blueprint $table) {
             $table->enum('email_status', ['delivered', 'bounced', 'spam'])->nullable();
         });
 
-        Schema::table('credit_invitations', function(Blueprint $table){
+        Schema::table('credit_invitations', function (Blueprint $table) {
             $table->enum('email_status', ['delivered', 'bounced', 'spam'])->nullable();
         });
 
-        Schema::table('recurring_invoice_invitations', function(Blueprint $table){
+        Schema::table('recurring_invoice_invitations', function (Blueprint $table) {
             $table->enum('email_status', ['delivered', 'bounced', 'spam'])->nullable();
         });
     }
@@ -39,4 +38,4 @@ class EnumInvitationsEmailStatus extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_02_27_091713_add_invoice_task_datelog_property.php b/database/migrations/2021_02_27_091713_add_invoice_task_datelog_property.php
index 3267ab777846..7e32cf93b303 100644
--- a/database/migrations/2021_02_27_091713_add_invoice_task_datelog_property.php
+++ b/database/migrations/2021_02_27_091713_add_invoice_task_datelog_property.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddInvoiceTaskDatelogProperty extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -13,10 +12,9 @@ class AddInvoiceTaskDatelogProperty extends Migration
      */
     public function up()
     {
-        Schema::table('companies', function(Blueprint $table){
+        Schema::table('companies', function (Blueprint $table) {
             $table->boolean('invoice_task_datelog')->default(0);
         });
-
     }
 
     /**
@@ -28,4 +26,4 @@ class AddInvoiceTaskDatelogProperty extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_03_03_230941_add_has_password_field_to_user_table.php b/database/migrations/2021_03_03_230941_add_has_password_field_to_user_table.php
index 92f3821c8d6a..2c2741049d5e 100644
--- a/database/migrations/2021_03_03_230941_add_has_password_field_to_user_table.php
+++ b/database/migrations/2021_03_03_230941_add_has_password_field_to_user_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddHasPasswordFieldToUserTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -25,6 +24,5 @@ class AddHasPasswordFieldToUserTable extends Migration
      */
     public function down()
     {
-
     }
-}
+};
diff --git a/database/migrations/2021_03_08_123729_create_billing_subscriptions_table.php b/database/migrations/2021_03_08_123729_create_billing_subscriptions_table.php
index 6f76050fb056..0fc957566a7b 100644
--- a/database/migrations/2021_03_08_123729_create_billing_subscriptions_table.php
+++ b/database/migrations/2021_03_08_123729_create_billing_subscriptions_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateBillingSubscriptionsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -73,4 +72,4 @@ class CreateBillingSubscriptionsTable extends Migration
         Schema::dropIfExists('billing_subscriptions');
         Schema::dropIfExists('client_subscriptions');
     }
-}
+};
diff --git a/database/migrations/2021_03_08_205030_add_russian_lang.php b/database/migrations/2021_03_08_205030_add_russian_lang.php
index 443de5c73660..2298d3e5b239 100644
--- a/database/migrations/2021_03_08_205030_add_russian_lang.php
+++ b/database/migrations/2021_03_08_205030_add_russian_lang.php
@@ -7,8 +7,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddRussianLang extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -16,7 +15,6 @@ class AddRussianLang extends Migration
      */
     public function up()
     {
-
         $russian = ['id' => 29, 'name' => 'Russian (Russia)', 'locale' => 'ru_RU'];
 
         Language::unguard();
@@ -27,7 +25,6 @@ class AddRussianLang extends Migration
         });
 
         Company::whereNotNull('id')->update(['default_password_timeout' => 30]);
-
     }
 
     /**
@@ -39,4 +36,4 @@ class AddRussianLang extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_03_09_132242_add_currency_id_to_billing_subscriptions_table.php b/database/migrations/2021_03_09_132242_add_currency_id_to_billing_subscriptions_table.php
index ab3da33f51bd..18e864af4517 100644
--- a/database/migrations/2021_03_09_132242_add_currency_id_to_billing_subscriptions_table.php
+++ b/database/migrations/2021_03_09_132242_add_currency_id_to_billing_subscriptions_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddCurrencyIdToBillingSubscriptionsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -38,4 +37,4 @@ class AddCurrencyIdToBillingSubscriptionsTable extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2021_03_18_113704_change_2fa_column_from_varchar_to_text.php b/database/migrations/2021_03_18_113704_change_2fa_column_from_varchar_to_text.php
index 1ff1d26ddf00..2d8cb4844044 100644
--- a/database/migrations/2021_03_18_113704_change_2fa_column_from_varchar_to_text.php
+++ b/database/migrations/2021_03_18_113704_change_2fa_column_from_varchar_to_text.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class Change2faColumnFromVarcharToText extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -25,6 +24,5 @@ class Change2faColumnFromVarcharToText extends Migration
      */
     public function down()
     {
-
     }
-}
+};
diff --git a/database/migrations/2021_03_19_221024_add_unique_constraints_on_all_entities.php b/database/migrations/2021_03_19_221024_add_unique_constraints_on_all_entities.php
index 8ccbb6532086..07791c4d9b89 100644
--- a/database/migrations/2021_03_19_221024_add_unique_constraints_on_all_entities.php
+++ b/database/migrations/2021_03_19_221024_add_unique_constraints_on_all_entities.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddUniqueConstraintsOnAllEntities extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -13,9 +12,6 @@ class AddUniqueConstraintsOnAllEntities extends Migration
      */
     public function up()
     {
-
-
-
     }
 
     /**
@@ -27,4 +23,4 @@ class AddUniqueConstraintsOnAllEntities extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_03_20_033751_add_invoice_id_to_client_subscriptions_table.php b/database/migrations/2021_03_20_033751_add_invoice_id_to_client_subscriptions_table.php
index 1bf3e9c397cd..45b460d3fa6a 100644
--- a/database/migrations/2021_03_20_033751_add_invoice_id_to_client_subscriptions_table.php
+++ b/database/migrations/2021_03_20_033751_add_invoice_id_to_client_subscriptions_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddInvoiceIdToClientSubscriptionsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -28,4 +27,4 @@ class AddInvoiceIdToClientSubscriptionsTable extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2021_03_23_233844_add_nullable_constraint_to_recurring_invoice_id.php b/database/migrations/2021_03_23_233844_add_nullable_constraint_to_recurring_invoice_id.php
index f1224c7cdb1a..21003dd0c28f 100644
--- a/database/migrations/2021_03_23_233844_add_nullable_constraint_to_recurring_invoice_id.php
+++ b/database/migrations/2021_03_23_233844_add_nullable_constraint_to_recurring_invoice_id.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddNullableConstraintToRecurringInvoiceId extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -26,4 +25,4 @@ class AddNullableConstraintToRecurringInvoiceId extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2021_03_25_082025_refactor_billing_scriptions_table.php b/database/migrations/2021_03_25_082025_refactor_billing_scriptions_table.php
index 561f19db350f..ccaf8d2d5931 100644
--- a/database/migrations/2021_03_25_082025_refactor_billing_scriptions_table.php
+++ b/database/migrations/2021_03_25_082025_refactor_billing_scriptions_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class RefactorBillingScriptionsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -13,7 +12,6 @@ class RefactorBillingScriptionsTable extends Migration
      */
     public function up()
     {
-
         Schema::rename('billing_subscriptions', 'subscriptions');
 
         Schema::table('subscriptions', function (Blueprint $table) {
@@ -28,7 +26,6 @@ class RefactorBillingScriptionsTable extends Migration
             $table->renameColumn('product_id', 'product_ids');
             $table->dropColumn('is_recurring');
         });
-
     }
 
     /**
@@ -40,4 +37,4 @@ class RefactorBillingScriptionsTable extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_03_26_201148_add_price_column_to_subscriptions_table.php b/database/migrations/2021_03_26_201148_add_price_column_to_subscriptions_table.php
index c4f1e453008d..fc9bddad1765 100644
--- a/database/migrations/2021_03_26_201148_add_price_column_to_subscriptions_table.php
+++ b/database/migrations/2021_03_26_201148_add_price_column_to_subscriptions_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddPriceColumnToSubscriptionsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -31,7 +30,6 @@ class AddPriceColumnToSubscriptionsTable extends Migration
             $table->unsignedInteger('frequency_id')->nullable()->change();
             $table->text('plan_map')->nullable()->change();
         });
-
     }
 
     /**
@@ -42,4 +40,4 @@ class AddPriceColumnToSubscriptionsTable extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2021_04_01_093128_modify_column_on_subscriptions_table.php b/database/migrations/2021_04_01_093128_modify_column_on_subscriptions_table.php
index 430c5131ba49..586e9bb0cdf3 100644
--- a/database/migrations/2021_04_01_093128_modify_column_on_subscriptions_table.php
+++ b/database/migrations/2021_04_01_093128_modify_column_on_subscriptions_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ModifyColumnOnSubscriptionsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -27,4 +26,4 @@ class ModifyColumnOnSubscriptionsTable extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_04_05_115345_add_trial_duration_to_accounts_table.php b/database/migrations/2021_04_05_115345_add_trial_duration_to_accounts_table.php
index bdee046183ca..1d3524fc37bb 100644
--- a/database/migrations/2021_04_05_115345_add_trial_duration_to_accounts_table.php
+++ b/database/migrations/2021_04_05_115345_add_trial_duration_to_accounts_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddTrialDurationToAccountsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -16,7 +15,6 @@ class AddTrialDurationToAccountsTable extends Migration
         Schema::table('accounts', function (Blueprint $table) {
             $table->unsignedInteger('trial_duration')->nullable();
         });
-
     }
 
     /**
@@ -27,4 +25,4 @@ class AddTrialDurationToAccountsTable extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2021_04_05_213802_add_rest_fields_to_webhooks_table.php b/database/migrations/2021_04_05_213802_add_rest_fields_to_webhooks_table.php
index ca43f4c01af0..34469d1127cb 100644
--- a/database/migrations/2021_04_05_213802_add_rest_fields_to_webhooks_table.php
+++ b/database/migrations/2021_04_05_213802_add_rest_fields_to_webhooks_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddRestFieldsToWebhooksTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -30,4 +29,4 @@ class AddRestFieldsToWebhooksTable extends Migration
             //
         });
     }
-}
+};
diff --git a/database/migrations/2021_04_06_131028_create_licenses_table.php b/database/migrations/2021_04_06_131028_create_licenses_table.php
index 40ee64f047ab..2c891f452c29 100644
--- a/database/migrations/2021_04_06_131028_create_licenses_table.php
+++ b/database/migrations/2021_04_06_131028_create_licenses_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateLicensesTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -13,7 +12,6 @@ class CreateLicensesTable extends Migration
      */
     public function up()
     {
-
         Schema::create('licenses', function (Blueprint $table) {
             $table->increments('id');
             $table->timestamps();
@@ -37,4 +35,4 @@ class CreateLicensesTable extends Migration
     {
         Schema::dropIfExists('licenses');
     }
-}
+};
diff --git a/database/migrations/2021_04_12_095424_stripe_connect_gateway.php b/database/migrations/2021_04_12_095424_stripe_connect_gateway.php
index ef85ec207b3d..5ff86d08aeea 100644
--- a/database/migrations/2021_04_12_095424_stripe_connect_gateway.php
+++ b/database/migrations/2021_04_12_095424_stripe_connect_gateway.php
@@ -7,8 +7,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class StripeConnectGateway extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -19,12 +18,12 @@ class StripeConnectGateway extends Migration
         Model::unguard();
 
         $gateway = [
-            'id' => 56, 
-            'name' => 'Stripe Connect', 
-            'provider' => 'StripeConnect', 
-            'sort_order' => 1, 
-            'key' => 'd14dd26a47cecc30fdd65700bfb67b34', 
-            'fields' => '{"account_id":"","appleDomainVerification":""}'
+            'id' => 56,
+            'name' => 'Stripe Connect',
+            'provider' => 'StripeConnect',
+            'sort_order' => 1,
+            'key' => 'd14dd26a47cecc30fdd65700bfb67b34',
+            'fields' => '{"account_id":"","appleDomainVerification":""}',
         ];
 
         Gateway::create($gateway);
@@ -44,4 +43,4 @@ class StripeConnectGateway extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_04_13_013424_add_subscription_id_to_activities_table.php b/database/migrations/2021_04_13_013424_add_subscription_id_to_activities_table.php
index db32a6854104..dcc7828bac6d 100644
--- a/database/migrations/2021_04_13_013424_add_subscription_id_to_activities_table.php
+++ b/database/migrations/2021_04_13_013424_add_subscription_id_to_activities_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddSubscriptionIdToActivitiesTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -26,4 +25,4 @@ class AddSubscriptionIdToActivitiesTable extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2021_04_22_110240_add_property_to_checkout_gateway_config.php b/database/migrations/2021_04_22_110240_add_property_to_checkout_gateway_config.php
index 7e9ae8eabbc0..37fe19b238f6 100644
--- a/database/migrations/2021_04_22_110240_add_property_to_checkout_gateway_config.php
+++ b/database/migrations/2021_04_22_110240_add_property_to_checkout_gateway_config.php
@@ -7,9 +7,9 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddPropertyToCheckoutGatewayConfig extends Migration
-{
+return new class extends Migration {
     use AppSetup;
+
     /**
      * Run the migrations.
      *
@@ -17,11 +17,9 @@ class AddPropertyToCheckoutGatewayConfig extends Migration
      */
     public function up()
     {
-
         $gateway = Gateway::where('key', '3758e7f7c6f4cecf0f4f348b9a00f456')->first();
 
-        if($gateway)
-        {
+        if ($gateway) {
             $fields = json_decode($gateway->fields);
 
             $fields->threeds = false;
@@ -29,16 +27,15 @@ class AddPropertyToCheckoutGatewayConfig extends Migration
             $gateway->save();
         }
 
-        CompanyGateway::where('gateway_key', '3758e7f7c6f4cecf0f4f348b9a00f456')->each(function ($checkout){
+        CompanyGateway::where('gateway_key', '3758e7f7c6f4cecf0f4f348b9a00f456')->each(function ($checkout) {
+            $config = json_decode(decrypt($checkout->config));
 
-                $config = json_decode(decrypt($checkout->config));
+            $config->threeds = false;
 
-                $config->threeds = false;
+            $config = encrypt(json_encode($config));
 
-                $config = encrypt(json_encode($config));
-
-                $checkout->config = $config;
-                $checkout->save();
+            $checkout->config = $config;
+            $checkout->save();
         });
 
         // $this->buildCache(true);
@@ -51,6 +48,5 @@ class AddPropertyToCheckoutGatewayConfig extends Migration
      */
     public function down()
     {
-
     }
-}
+};
diff --git a/database/migrations/2021_04_29_085418_add_number_years_active_to_company_users_table.php b/database/migrations/2021_04_29_085418_add_number_years_active_to_company_users_table.php
index 6d5c1d7e584c..d6d7fcc511b8 100644
--- a/database/migrations/2021_04_29_085418_add_number_years_active_to_company_users_table.php
+++ b/database/migrations/2021_04_29_085418_add_number_years_active_to_company_users_table.php
@@ -5,8 +5,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddNumberYearsActiveToCompanyUsersTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -18,11 +17,10 @@ class AddNumberYearsActiveToCompanyUsersTable extends Migration
             $table->unsignedInteger('number_years_active')->default(3);
         });
 
-        CompanyUser::cursor()->each(function ($cu){
+        CompanyUser::cursor()->each(function ($cu) {
             $cu->number_years_active = 3;
             $cu->save();
         });
-
     }
 
     /**
@@ -32,6 +30,5 @@ class AddNumberYearsActiveToCompanyUsersTable extends Migration
      */
     public function down()
     {
-
     }
-}
+};
diff --git a/database/migrations/2021_05_03_152940_make_braintree_provider_visible.php b/database/migrations/2021_05_03_152940_make_braintree_provider_visible.php
index f027712df581..977c5871b71d 100644
--- a/database/migrations/2021_05_03_152940_make_braintree_provider_visible.php
+++ b/database/migrations/2021_05_03_152940_make_braintree_provider_visible.php
@@ -5,8 +5,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class MakeBraintreeProviderVisible extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -26,4 +25,4 @@ class MakeBraintreeProviderVisible extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_05_04_231430_add_task_property_to_companies_table.php b/database/migrations/2021_05_04_231430_add_task_property_to_companies_table.php
index 815be572ec4b..894f2ee23eb1 100644
--- a/database/migrations/2021_05_04_231430_add_task_property_to_companies_table.php
+++ b/database/migrations/2021_05_04_231430_add_task_property_to_companies_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddTaskPropertyToCompaniesTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -13,11 +12,9 @@ class AddTaskPropertyToCompaniesTable extends Migration
      */
     public function up()
     {
-
         Schema::table('company_user', function (Blueprint $table) {
             $table->dropColumn('number_years_active');
         });
-           
     }
 
     /**
@@ -28,4 +25,4 @@ class AddTaskPropertyToCompaniesTable extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2021_05_05_014713_activate_we_pay.php b/database/migrations/2021_05_05_014713_activate_we_pay.php
index bfd1d96815f8..303fbb65c06c 100644
--- a/database/migrations/2021_05_05_014713_activate_we_pay.php
+++ b/database/migrations/2021_05_05_014713_activate_we_pay.php
@@ -6,8 +6,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ActivateWePay extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -15,8 +14,9 @@ class ActivateWePay extends Migration
      */
     public function up()
     {
-        if(Gateway::count() >=1 && Ninja::isHosted())
+        if (Gateway::count() >= 1 && Ninja::isHosted()) {
             Gateway::whereIn('id', [49])->update(['visible' => true]);
+        }
     }
 
     /**
@@ -28,4 +28,4 @@ class ActivateWePay extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_05_10_041528_add_recurring_invoice_id_to_activities_table.php b/database/migrations/2021_05_10_041528_add_recurring_invoice_id_to_activities_table.php
index 9f5f574caf1d..f70587c7ab50 100644
--- a/database/migrations/2021_05_10_041528_add_recurring_invoice_id_to_activities_table.php
+++ b/database/migrations/2021_05_10_041528_add_recurring_invoice_id_to_activities_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddRecurringInvoiceIdToActivitiesTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -17,14 +16,11 @@ class AddRecurringInvoiceIdToActivitiesTable extends Migration
             $table->unsignedInteger('recurring_invoice_id')->nullable();
         });
 
-
-        if (!Schema::hasColumn('companies', 'show_task_end_date'))
-        {
+        if (! Schema::hasColumn('companies', 'show_task_end_date')) {
             Schema::table('companies', function (Blueprint $table) {
                 $table->boolean('show_task_end_date')->default(false);
             });
         }
-
     }
 
     /**
@@ -34,6 +30,5 @@ class AddRecurringInvoiceIdToActivitiesTable extends Migration
      */
     public function down()
     {
-        
     }
-}
+};
diff --git a/database/migrations/2021_05_27_105157_add_tech_design.php b/database/migrations/2021_05_27_105157_add_tech_design.php
index d07b35f68796..fbfe9744fe57 100644
--- a/database/migrations/2021_05_27_105157_add_tech_design.php
+++ b/database/migrations/2021_05_27_105157_add_tech_design.php
@@ -4,8 +4,7 @@ use App\Models\Design;
 use App\Utils\Ninja;
 use Illuminate\Database\Migrations\Migration;
 
-class AddTechDesign extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -46,4 +45,4 @@ class AddTechDesign extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_05_30_100933_make_documents_assigned_user_nullable.php b/database/migrations/2021_05_30_100933_make_documents_assigned_user_nullable.php
index 3135b0d5fc74..b5d6ed974fcc 100644
--- a/database/migrations/2021_05_30_100933_make_documents_assigned_user_nullable.php
+++ b/database/migrations/2021_05_30_100933_make_documents_assigned_user_nullable.php
@@ -6,8 +6,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class MakeDocumentsAssignedUserNullable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -15,18 +14,17 @@ class MakeDocumentsAssignedUserNullable extends Migration
      */
     public function up()
     {
-        Schema::table('documents', function (Blueprint $table){
+        Schema::table('documents', function (Blueprint $table) {
             $table->unsignedInteger('assigned_user_id')->nullable()->change();
         });
 
         Document::where('assigned_user_id', 0)->update(['assigned_user_id' => null]);
 
-        if(config('ninja.db.multi_db_enabled')){
+        if (config('ninja.db.multi_db_enabled')) {
             foreach (MultiDB::$dbs as $db) {
                 Document::on($db)->where('assigned_user_id', 0)->update(['assigned_user_id' => null]);
             }
-        }
-        else{
+        } else {
             Document::where('assigned_user_id', 0)->update(['assigned_user_id' => null]);
         }
     }
@@ -40,4 +38,4 @@ class MakeDocumentsAssignedUserNullable extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_06_10_221012_add_ninja_portal_column_to_accounts_table.php b/database/migrations/2021_06_10_221012_add_ninja_portal_column_to_accounts_table.php
index c03566087f5a..d467f7ea1760 100644
--- a/database/migrations/2021_06_10_221012_add_ninja_portal_column_to_accounts_table.php
+++ b/database/migrations/2021_06_10_221012_add_ninja_portal_column_to_accounts_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddNinjaPortalColumnToAccountsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -25,6 +24,5 @@ class AddNinjaPortalColumnToAccountsTable extends Migration
      */
     public function down()
     {
-
     }
-}
+};
diff --git a/database/migrations/2021_06_24_095942_payments_table_currency_nullable.php b/database/migrations/2021_06_24_095942_payments_table_currency_nullable.php
index 02381a29c181..b9a7e4dfd2d5 100644
--- a/database/migrations/2021_06_24_095942_payments_table_currency_nullable.php
+++ b/database/migrations/2021_06_24_095942_payments_table_currency_nullable.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class PaymentsTableCurrencyNullable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -13,10 +12,8 @@ class PaymentsTableCurrencyNullable extends Migration
      */
     public function up()
     {
-        Schema::table('payments', function (Blueprint $table){
-
+        Schema::table('payments', function (Blueprint $table) {
             $table->unsignedInteger('exchange_currency_id')->nullable()->change();
-
         });
     }
 
@@ -29,4 +26,4 @@ class PaymentsTableCurrencyNullable extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_07_10_085821_activate_payfast_payment_driver.php b/database/migrations/2021_07_10_085821_activate_payfast_payment_driver.php
index b66c5c64aae4..59d722a61c1e 100644
--- a/database/migrations/2021_07_10_085821_activate_payfast_payment_driver.php
+++ b/database/migrations/2021_07_10_085821_activate_payfast_payment_driver.php
@@ -5,8 +5,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ActivatePayfastPaymentDriver extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -26,4 +25,4 @@ class ActivatePayfastPaymentDriver extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_07_19_074503_set_invoice_task_datelog_true_in_companies_table.php b/database/migrations/2021_07_19_074503_set_invoice_task_datelog_true_in_companies_table.php
index 1cd77b7e0b2f..96018e9083e8 100644
--- a/database/migrations/2021_07_19_074503_set_invoice_task_datelog_true_in_companies_table.php
+++ b/database/migrations/2021_07_19_074503_set_invoice_task_datelog_true_in_companies_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class SetInvoiceTaskDatelogTrueInCompaniesTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -25,6 +24,5 @@ class SetInvoiceTaskDatelogTrueInCompaniesTable extends Migration
      */
     public function down()
     {
-
     }
-}
+};
diff --git a/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php b/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
index e690af365e3c..0077ce83a539 100644
--- a/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
+++ b/database/migrations/2021_07_20_095537_activate_paytrace_payment_driver.php
@@ -5,8 +5,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ActivatePaytracePaymentDriver extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -14,11 +13,9 @@ class ActivatePaytracePaymentDriver extends Migration
      */
     public function up()
     {
-
-        if($paytrace = Gateway::find(46))
-        {
+        if ($paytrace = Gateway::find(46)) {
             $fields = json_decode($paytrace->fields);
-            $fields->integratorId = "";
+            $fields->integratorId = '';
 
             $paytrace->fields = json_encode($fields);
             $paytrace->provider = 'Paytrace';
@@ -36,4 +33,4 @@ class ActivatePaytracePaymentDriver extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_07_21_213344_change_english_languages_tables.php b/database/migrations/2021_07_21_213344_change_english_languages_tables.php
index a065a475250c..6f586cb98b21 100644
--- a/database/migrations/2021_07_21_213344_change_english_languages_tables.php
+++ b/database/migrations/2021_07_21_213344_change_english_languages_tables.php
@@ -5,8 +5,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ChangeEnglishLanguagesTables extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -14,8 +13,7 @@ class ChangeEnglishLanguagesTables extends Migration
      */
     public function up()
     {
-        if($language = Language::find(1))
-        {
+        if ($language = Language::find(1)) {
             $language->name = 'English - United States';
             $language->save();
         }
@@ -30,4 +28,4 @@ class ChangeEnglishLanguagesTables extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_07_21_234227_activate_eway_payment_driver.php b/database/migrations/2021_07_21_234227_activate_eway_payment_driver.php
index a0fc56152ddd..423b2b27f484 100644
--- a/database/migrations/2021_07_21_234227_activate_eway_payment_driver.php
+++ b/database/migrations/2021_07_21_234227_activate_eway_payment_driver.php
@@ -5,8 +5,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ActivateEwayPaymentDriver extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -14,18 +13,16 @@ class ActivateEwayPaymentDriver extends Migration
      */
     public function up()
     {
-        if($eway = Gateway::find(3))
-        {
+        if ($eway = Gateway::find(3)) {
             $eway->visible = true;
             $eway->provider = 'Eway';
 
             $fields = json_decode($eway->fields);
             $fields->publicApiKey = '';
             $eway->fields = json_encode($fields);
-            
+
             $eway->save();
         }
-
     }
 
     /**
@@ -37,4 +34,4 @@ class ActivateEwayPaymentDriver extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_08_03_115024_activate_mollie_payment_driver.php b/database/migrations/2021_08_03_115024_activate_mollie_payment_driver.php
index c01c9df755b5..baf8c160407b 100644
--- a/database/migrations/2021_08_03_115024_activate_mollie_payment_driver.php
+++ b/database/migrations/2021_08_03_115024_activate_mollie_payment_driver.php
@@ -15,8 +15,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ActivateMolliePaymentDriver extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -24,8 +23,7 @@ class ActivateMolliePaymentDriver extends Migration
      */
     public function up()
     {
-        if($mollie = Gateway::find(7))
-        {
+        if ($mollie = Gateway::find(7)) {
             $mollie->visible = true;
 
             $fields = json_decode($mollie->fields);
@@ -33,7 +31,7 @@ class ActivateMolliePaymentDriver extends Migration
             $fields->profileId = '';
 
             $mollie->fields = json_encode($fields);
-            
+
             $mollie->save();
         }
     }
@@ -47,4 +45,4 @@ class ActivateMolliePaymentDriver extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_08_05_235942_add_zelle_payment_type.php b/database/migrations/2021_08_05_235942_add_zelle_payment_type.php
index ae200d7c022b..8c09d9301de6 100644
--- a/database/migrations/2021_08_05_235942_add_zelle_payment_type.php
+++ b/database/migrations/2021_08_05_235942_add_zelle_payment_type.php
@@ -1,13 +1,12 @@
 <?php
 
 use App\Models\PaymentType;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Eloquent\Model;
 
-class AddZellePaymentType extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -19,8 +18,7 @@ class AddZellePaymentType extends Migration
 
         $pt = PaymentType::where('name', 'Zelle')->first();
 
-        if(!$pt){
-
+        if (! $pt) {
             $payment_type = new PaymentType();
             $payment_type->id = 33;
             $payment_type->name = 'Zelle';
@@ -37,4 +35,4 @@ class AddZellePaymentType extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_08_07_222435_add_markdown_enabled_column_to_companies_table.php b/database/migrations/2021_08_07_222435_add_markdown_enabled_column_to_companies_table.php
index 60c43d95e4e4..8ce6332b070c 100644
--- a/database/migrations/2021_08_07_222435_add_markdown_enabled_column_to_companies_table.php
+++ b/database/migrations/2021_08_07_222435_add_markdown_enabled_column_to_companies_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddMarkdownEnabledColumnToCompaniesTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -25,6 +24,5 @@ class AddMarkdownEnabledColumnToCompaniesTable extends Migration
      */
     public function down()
     {
-        
     }
-}
+};
diff --git a/database/migrations/2021_08_10_034407_add_more_languages.php b/database/migrations/2021_08_10_034407_add_more_languages.php
index 88a743e911ae..bb61c12945d6 100644
--- a/database/migrations/2021_08_10_034407_add_more_languages.php
+++ b/database/migrations/2021_08_10_034407_add_more_languages.php
@@ -5,8 +5,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddMoreLanguages extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -18,29 +17,21 @@ class AddMoreLanguages extends Migration
 
         $language = Language::find(30);
 
-        if(!$language){
-
+        if (! $language) {
             Language::create(['id' => 30, 'name' => 'Arabic', 'locale' => 'ar']);
-
         }
 
         $language = Language::find(31);
 
-        if(!$language){
-
+        if (! $language) {
             Language::create(['id' => 31, 'name' => 'Persian', 'locale' => 'fa']);
-
         }
 
         $language = Language::find(32);
 
-        if(!$language){
-
+        if (! $language) {
             Language::create(['id' => 32, 'name' => 'Latvian', 'locale' => 'lv_LV']);
-
         }
-        
-
     }
 
     /**
@@ -52,4 +43,4 @@ class AddMoreLanguages extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_08_14_054458_square_payment_driver.php b/database/migrations/2021_08_14_054458_square_payment_driver.php
index 7da0bb5949fa..6ba89620c67b 100644
--- a/database/migrations/2021_08_14_054458_square_payment_driver.php
+++ b/database/migrations/2021_08_14_054458_square_payment_driver.php
@@ -1,13 +1,12 @@
 <?php
 
 use App\Models\Gateway;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Eloquent\Model;
 
-class SquarePaymentDriver extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -15,26 +14,24 @@ class SquarePaymentDriver extends Migration
      */
     public function up()
     {
-        
         Model::unguard();
 
         $fields = new \stdClass;
-        $fields->accessToken = "";
-        $fields->applicationId = "";
-        $fields->locationId = "";
+        $fields->accessToken = '';
+        $fields->applicationId = '';
+        $fields->locationId = '';
         $fields->testMode = false;
 
         $square = new Gateway();
         $square->id = 57;
-        $square->name = "Square";
-        $square->provider = "Square";
+        $square->name = 'Square';
+        $square->provider = 'Square';
         $square->key = '65faab2ab6e3223dbe848b1686490baz';
         $square->sort_order = 4343;
         $square->is_offsite = false;
         $square->visible = true;
         $square->fields = json_encode($fields);
         $square->save();
-
     }
 
     /**
@@ -46,4 +43,4 @@ class SquarePaymentDriver extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_08_18_220124_use_comma_as_decimal_place_companies_table.php b/database/migrations/2021_08_18_220124_use_comma_as_decimal_place_companies_table.php
index d5330bea293b..3168a95b304b 100644
--- a/database/migrations/2021_08_18_220124_use_comma_as_decimal_place_companies_table.php
+++ b/database/migrations/2021_08_18_220124_use_comma_as_decimal_place_companies_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class UseCommaAsDecimalPlaceCompaniesTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -13,11 +12,9 @@ class UseCommaAsDecimalPlaceCompaniesTable extends Migration
      */
     public function up()
     {
-        
         Schema::table('companies', function (Blueprint $table) {
             $table->boolean('use_comma_as_decimal_place')->default(0);
         });
-
     }
 
     /**
@@ -29,4 +26,4 @@ class UseCommaAsDecimalPlaceCompaniesTable extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_08_23_101529_recurring_expenses_schema.php b/database/migrations/2021_08_23_101529_recurring_expenses_schema.php
index eefea2ebed1e..5d4e57c311aa 100644
--- a/database/migrations/2021_08_23_101529_recurring_expenses_schema.php
+++ b/database/migrations/2021_08_23_101529_recurring_expenses_schema.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class RecurringExpensesSchema extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -14,7 +13,6 @@ class RecurringExpensesSchema extends Migration
     public function up()
     {
         Schema::create('recurring_expenses', function ($table) {
-            
             $table->increments('id');
             $table->timestamps(6);
             $table->softDeletes();
@@ -75,7 +73,6 @@ class RecurringExpensesSchema extends Migration
             // Relations
             $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade')->onUpdate('cascade');
             $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade')->onUpdate('cascade');
-
         });
 
         Schema::table('activities', function (Blueprint $table) {
@@ -83,14 +80,14 @@ class RecurringExpensesSchema extends Migration
             $table->unsignedInteger('recurring_quote_id')->nullable();
         });
 
-        Schema::table('recurring_quotes', function ($table){
+        Schema::table('recurring_quotes', function ($table) {
             $table->string('auto_bill')->default('off');
             $table->boolean('auto_bill_enabled')->default(0);
             $table->decimal('paid_to_date', 20, 6)->default(0);
-            $table->decimal('custom_surcharge1', 20,6)->nullable();
-            $table->decimal('custom_surcharge2', 20,6)->nullable();
-            $table->decimal('custom_surcharge3', 20,6)->nullable();
-            $table->decimal('custom_surcharge4', 20,6)->nullable();
+            $table->decimal('custom_surcharge1', 20, 6)->nullable();
+            $table->decimal('custom_surcharge2', 20, 6)->nullable();
+            $table->decimal('custom_surcharge3', 20, 6)->nullable();
+            $table->decimal('custom_surcharge4', 20, 6)->nullable();
             $table->boolean('custom_surcharge_tax1')->default(false);
             $table->boolean('custom_surcharge_tax2')->default(false);
             $table->boolean('custom_surcharge_tax3')->default(false);
@@ -98,7 +95,7 @@ class RecurringExpensesSchema extends Migration
             $table->string('due_date_days')->nullable();
             $table->decimal('exchange_rate', 13, 6)->default(1);
             $table->decimal('partial', 16, 4)->nullable();
-            $table->date('partial_due_date')->nullable();                        
+            $table->date('partial_due_date')->nullable();
             $table->unsignedInteger('remaining_cycles')->nullable()->change();
             $table->unsignedInteger('subscription_id')->nullable();
             $table->dropColumn('start_date');
@@ -135,17 +132,6 @@ class RecurringExpensesSchema extends Migration
             $t->index(['deleted_at', 'recurring_quote_id', 'company_id'], 'rec_co_del_q');
             $t->unique(['client_contact_id', 'recurring_quote_id'], 'cli_rec_q');
         });
-
-
-
-
-
-
-
-
-
-
-
     }
 
     /**
@@ -157,4 +143,4 @@ class RecurringExpensesSchema extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_08_25_093105_report_include_drafts_in_companies_table.php b/database/migrations/2021_08_25_093105_report_include_drafts_in_companies_table.php
index ca8e0ab3d2a9..216999772fb4 100644
--- a/database/migrations/2021_08_25_093105_report_include_drafts_in_companies_table.php
+++ b/database/migrations/2021_08_25_093105_report_include_drafts_in_companies_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ReportIncludeDraftsInCompaniesTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -14,7 +13,7 @@ class ReportIncludeDraftsInCompaniesTable extends Migration
     public function up()
     {
         Schema::table('companies', function (Blueprint $table) {
-            $table->boolean('report_include_drafts')->default(0);            
+            $table->boolean('report_include_drafts')->default(0);
         });
     }
 
@@ -25,6 +24,5 @@ class ReportIncludeDraftsInCompaniesTable extends Migration
      */
     public function down()
     {
-
     }
-}
+};
diff --git a/database/migrations/2021_09_05_101209_update_braintree_gateway.php b/database/migrations/2021_09_05_101209_update_braintree_gateway.php
index ac4f47704272..8a4e6a4461be 100644
--- a/database/migrations/2021_09_05_101209_update_braintree_gateway.php
+++ b/database/migrations/2021_09_05_101209_update_braintree_gateway.php
@@ -5,8 +5,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class UpdateBraintreeGateway extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -22,4 +21,4 @@ class UpdateBraintreeGateway extends Migration
             $gateway->save();
         }
     }
-}
+};
diff --git a/database/migrations/2021_09_20_233053_set_square_test_mode_boolean.php b/database/migrations/2021_09_20_233053_set_square_test_mode_boolean.php
index bdf714f1f1a1..52de94691d61 100644
--- a/database/migrations/2021_09_20_233053_set_square_test_mode_boolean.php
+++ b/database/migrations/2021_09_20_233053_set_square_test_mode_boolean.php
@@ -9,8 +9,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class SetSquareTestModeBoolean extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -28,20 +27,16 @@ class SetSquareTestModeBoolean extends Migration
      */
     public function down()
     {
-        //Fixes a state where the deleted_at timestamp is 000 
-        
-        if(!Ninja::isHosted())
-        {
+        //Fixes a state where the deleted_at timestamp is 000
 
+        if (! Ninja::isHosted()) {
             Invoice::withTrashed()->where('deleted_at', '0000-00-00 00:00:00.000000')->update(['deleted_at' => null]);
             Quote::withTrashed()->where('deleted_at', '0000-00-00 00:00:00.000000')->update(['deleted_at' => null]);
             Credit::withTrashed()->where('deleted_at', '0000-00-00 00:00:00.000000')->update(['deleted_at' => null]);
-
         }
 
         // fixes a bool cast to string back to bool
-        if($gateway = Gateway::find(57))
-        {
+        if ($gateway = Gateway::find(57)) {
             $fields = json_decode($gateway->fields);
             $fields->testMode = false;
 
@@ -49,4 +44,4 @@ class SetSquareTestModeBoolean extends Migration
             $gateway->save();
         }
     }
-}
+};
diff --git a/database/migrations/2021_09_23_100629_add_currencies.php b/database/migrations/2021_09_23_100629_add_currencies.php
index dd6187e4bab4..b57ce2afbb61 100644
--- a/database/migrations/2021_09_23_100629_add_currencies.php
+++ b/database/migrations/2021_09_23_100629_add_currencies.php
@@ -1,13 +1,12 @@
 <?php
 
 use App\Models\Currency;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Eloquent\Model;
 
-class AddCurrencies extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -15,19 +14,17 @@ class AddCurrencies extends Migration
      */
     public function up()
     {
+        Model::unguard();
 
-    Model::unguard();
+        $currencies = [
+            ['id' => 105, 'name' => 'Gambia Dalasi', 'code' => 'GMD', 'symbol' => 'D', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 106, 'name' => 'Paraguayan Guarani', 'code' => 'PYG', 'symbol' => '₲', 'precision' => '0', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 107, 'name' => 'Malawi Kwacha', 'code' => 'MWK', 'symbol' => 'MK', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 108, 'name' => 'Zimbabwean Dollar', 'code' => 'ZWL', 'symbol' => 'Z$', 'precision' => '0', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 109, 'name' => 'Cambodian Riel', 'code' => 'KHR', 'symbol' => '៛', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['id' => 110, 'name' => 'Vanuatu Vatu', 'code' => 'VUV', 'symbol' => 'VT', 'precision' => '0', 'thousand_separator' => ',', 'decimal_separator' => '.'],
 
-
-    $currencies = [
-['id' => 105, 'name' => 'Gambia Dalasi', 'code' => 'GMD', 'symbol' => 'D', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
-['id' => 106, 'name' => 'Paraguayan Guarani', 'code' => 'PYG', 'symbol' => '₲', 'precision' => '0', 'thousand_separator' => ',', 'decimal_separator' => '.'],
-['id' => 107, 'name' => 'Malawi Kwacha','code' => 'MWK', 'symbol' => 'MK', 'precision' => '2','thousand_separator' => ',', 'decimal_separator' => '.'],
-['id' => 108, 'name' => 'Zimbabwean Dollar', 'code' => 'ZWL', 'symbol' => 'Z$', 'precision' => '0', 'thousand_separator' => ',', 'decimal_separator' => '.'],
-['id' => 109, 'name' => 'Cambodian Riel', 'code' => 'KHR', 'symbol' => '៛', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
-['id' => 110, 'name' => 'Vanuatu Vatu','code' => 'VUV', 'symbol' => 'VT', 'precision' => '0','thousand_separator' => ',','decimal_separator' => '.'],
-
-    ];
+        ];
 
         foreach ($currencies as $currency) {
             $record = Currency::whereCode($currency['code'])->first();
@@ -45,10 +42,8 @@ class AddCurrencies extends Migration
                 Currency::create($currency);
             }
         }
-
-
     }
-    
+
     /**
      * Reverse the migrations.
      *
@@ -57,4 +52,4 @@ class AddCurrencies extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2021_09_24_201319_add_mollie_bank_transfer_to_payment_types.php b/database/migrations/2021_09_24_201319_add_mollie_bank_transfer_to_payment_types.php
index 0f00a831f77a..b05c22c4438f 100644
--- a/database/migrations/2021_09_24_201319_add_mollie_bank_transfer_to_payment_types.php
+++ b/database/migrations/2021_09_24_201319_add_mollie_bank_transfer_to_payment_types.php
@@ -4,8 +4,7 @@ use App\Models\GatewayType;
 use App\Models\PaymentType;
 use Illuminate\Database\Migrations\Migration;
 
-class AddMollieBankTransferToPaymentTypes extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -21,4 +20,4 @@ class AddMollieBankTransferToPaymentTypes extends Migration
 
         $type->save();
     }
-}
+};
diff --git a/database/migrations/2021_09_24_211504_add_kbc_to_payment_types.php b/database/migrations/2021_09_24_211504_add_kbc_to_payment_types.php
index 9962e7802c4f..768f8d4f3c4a 100644
--- a/database/migrations/2021_09_24_211504_add_kbc_to_payment_types.php
+++ b/database/migrations/2021_09_24_211504_add_kbc_to_payment_types.php
@@ -6,8 +6,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddKbcToPaymentTypes extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -23,4 +22,4 @@ class AddKbcToPaymentTypes extends Migration
 
         $type->save();
     }
-}
+};
diff --git a/database/migrations/2021_09_24_213858_add_bancontact_to_payment_types.php b/database/migrations/2021_09_24_213858_add_bancontact_to_payment_types.php
index 74302b8d508b..5694ac9a9b84 100644
--- a/database/migrations/2021_09_24_213858_add_bancontact_to_payment_types.php
+++ b/database/migrations/2021_09_24_213858_add_bancontact_to_payment_types.php
@@ -6,8 +6,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddBancontactToPaymentTypes extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -23,4 +22,4 @@ class AddBancontactToPaymentTypes extends Migration
 
         $type->save();
     }
-}
+};
diff --git a/database/migrations/2021_09_28_154647_activate_gocardless_payment_driver.php b/database/migrations/2021_09_28_154647_activate_gocardless_payment_driver.php
index 25f7c1bb14c6..beb5ca934297 100644
--- a/database/migrations/2021_09_28_154647_activate_gocardless_payment_driver.php
+++ b/database/migrations/2021_09_28_154647_activate_gocardless_payment_driver.php
@@ -7,14 +7,13 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 use App\Models\Gateway;
 use Illuminate\Database\Migrations\Migration;
 
-class ActivateGocardlessPaymentDriver extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -30,4 +29,4 @@ class ActivateGocardlessPaymentDriver extends Migration
             $gateway->save();
         }
     }
-}
+};
diff --git a/database/migrations/2021_09_29_190258_add_required_client_registration_fields.php b/database/migrations/2021_09_29_190258_add_required_client_registration_fields.php
index 4ae9eba8400a..ca5cfc71782c 100644
--- a/database/migrations/2021_09_29_190258_add_required_client_registration_fields.php
+++ b/database/migrations/2021_09_29_190258_add_required_client_registration_fields.php
@@ -8,8 +8,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddRequiredClientRegistrationFields extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -17,23 +16,20 @@ class AddRequiredClientRegistrationFields extends Migration
      */
     public function up()
     {
-        
         Schema::table('companies', function (Blueprint $table) {
             $table->mediumText('client_registration_fields')->nullable();
         });
 
-        Company::all()->each(function ($company){
+        Company::all()->each(function ($company) {
             $company->update(['client_registration_fields' => ClientRegistrationFields::generate()]);
         });
 
-
         Model::unguard();
 
+        $currencies = [
+            ['id' => 111, 'name' => 'Cuban Peso', 'code' => 'CUP', 'symbol' => '₱', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
 
-    $currencies = [
-['id' => 111, 'name' => 'Cuban Peso','code' => 'CUP', 'symbol' => '₱', 'precision' => '2','thousand_separator' => ',','decimal_separator' => '.'],
-
-    ];
+        ];
 
         foreach ($currencies as $currency) {
             $record = Currency::whereCode($currency['code'])->first();
@@ -51,7 +47,6 @@ class AddRequiredClientRegistrationFields extends Migration
                 Currency::create($currency);
             }
         }
-
     }
 
     /**
@@ -63,4 +58,4 @@ class AddRequiredClientRegistrationFields extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_10_04_134908_add_ideal_to_payment_types.php b/database/migrations/2021_10_04_134908_add_ideal_to_payment_types.php
index c1a3840c018f..731e018e2310 100644
--- a/database/migrations/2021_10_04_134908_add_ideal_to_payment_types.php
+++ b/database/migrations/2021_10_04_134908_add_ideal_to_payment_types.php
@@ -6,8 +6,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddIdealToPaymentTypes extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -25,4 +24,4 @@ class AddIdealToPaymentTypes extends Migration
             $type->save();
         });
     }
-}
+};
diff --git a/database/migrations/2021_10_06_044800_updated_bold_and_modern_designs.php b/database/migrations/2021_10_06_044800_updated_bold_and_modern_designs.php
index d010c440f394..4ac2b8ad9974 100644
--- a/database/migrations/2021_10_06_044800_updated_bold_and_modern_designs.php
+++ b/database/migrations/2021_10_06_044800_updated_bold_and_modern_designs.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class UpdatedBoldAndModernDesigns extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -25,4 +24,4 @@ class UpdatedBoldAndModernDesigns extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_10_07_141737_razorpay.php b/database/migrations/2021_10_07_141737_razorpay.php
index 6dcacd66d63e..98f075f21f90 100644
--- a/database/migrations/2021_10_07_141737_razorpay.php
+++ b/database/migrations/2021_10_07_141737_razorpay.php
@@ -4,8 +4,7 @@ use App\Models\Gateway;
 use App\Models\GatewayType;
 use Illuminate\Database\Migrations\Migration;
 
-class Razorpay extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -30,4 +29,4 @@ class Razorpay extends Migration
         $gateway->default_gateway_type_id = GatewayType::HOSTED_PAGE;
         $gateway->save();
     }
-}
+};
diff --git a/database/migrations/2021_10_07_155410_add_hosted_page_to_payment_types.php b/database/migrations/2021_10_07_155410_add_hosted_page_to_payment_types.php
index 7343eef1ba39..d32b3c4bb82c 100644
--- a/database/migrations/2021_10_07_155410_add_hosted_page_to_payment_types.php
+++ b/database/migrations/2021_10_07_155410_add_hosted_page_to_payment_types.php
@@ -4,8 +4,7 @@ use App\Models\GatewayType;
 use App\Models\PaymentType;
 use Illuminate\Database\Migrations\Migration;
 
-class AddHostedPageToPaymentTypes extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -21,4 +20,4 @@ class AddHostedPageToPaymentTypes extends Migration
 
         $type->save();
     }
-}
+};
diff --git a/database/migrations/2021_10_15_00000_stripe_payment_gateways.php b/database/migrations/2021_10_15_00000_stripe_payment_gateways.php
index a05bae1e0c56..971044dc3962 100644
--- a/database/migrations/2021_10_15_00000_stripe_payment_gateways.php
+++ b/database/migrations/2021_10_15_00000_stripe_payment_gateways.php
@@ -6,8 +6,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class StripePaymentGateways extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -49,4 +48,4 @@ class StripePaymentGateways extends Migration
             $type5->save();
         });
     }
-}
+};
diff --git a/database/migrations/2021_10_16_135200_add_direct_debit_to_payment_types.php b/database/migrations/2021_10_16_135200_add_direct_debit_to_payment_types.php
index 8783488476cf..2159e31a242a 100644
--- a/database/migrations/2021_10_16_135200_add_direct_debit_to_payment_types.php
+++ b/database/migrations/2021_10_16_135200_add_direct_debit_to_payment_types.php
@@ -6,8 +6,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddDirectDebitToPaymentTypes extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -25,4 +24,4 @@ class AddDirectDebitToPaymentTypes extends Migration
             $type->save();
         });
     }
-}
+};
diff --git a/database/migrations/2021_10_19_142200_add_gateway_type_for_direct_debit.php b/database/migrations/2021_10_19_142200_add_gateway_type_for_direct_debit.php
index b85ada2a59cd..f185e6bf6217 100644
--- a/database/migrations/2021_10_19_142200_add_gateway_type_for_direct_debit.php
+++ b/database/migrations/2021_10_19_142200_add_gateway_type_for_direct_debit.php
@@ -3,8 +3,7 @@
 use App\Models\GatewayType;
 use Illuminate\Database\Migrations\Migration;
 
-class AddGatewayTypeForDirectDebit extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -20,4 +19,4 @@ class AddGatewayTypeForDirectDebit extends Migration
 
         $type->save();
     }
-}
+};
diff --git a/database/migrations/2021_10_20_005529_add_filename_to_backups_table.php b/database/migrations/2021_10_20_005529_add_filename_to_backups_table.php
index b73264237a29..59467c88187a 100644
--- a/database/migrations/2021_10_20_005529_add_filename_to_backups_table.php
+++ b/database/migrations/2021_10_20_005529_add_filename_to_backups_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddFilenameToBackupsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -26,4 +25,4 @@ class AddFilenameToBackupsTable extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2021_11_08_131308_onboarding.php b/database/migrations/2021_11_08_131308_onboarding.php
index 21bafd04a090..86e95421daa2 100644
--- a/database/migrations/2021_11_08_131308_onboarding.php
+++ b/database/migrations/2021_11_08_131308_onboarding.php
@@ -5,8 +5,7 @@ use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
 //class Onboarding extends Migration
-return new class extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -14,25 +13,16 @@ return new class extends Migration
      */
     public function up()
     {
-
-        if (!Schema::hasColumn('accounts', 'is_onboarding'))
-        {
-
+        if (! Schema::hasColumn('accounts', 'is_onboarding')) {
             Schema::table('accounts', function (Blueprint $table) {
                 $table->boolean('is_onboarding')->default(false);
             });
-            
         }
 
-
-        if (!Schema::hasColumn('accounts', 'onboarding'))
-        {
-
+        if (! Schema::hasColumn('accounts', 'onboarding')) {
             Schema::table('accounts', function (Blueprint $table) {
                 $table->mediumText('onboarding')->nullable();
             });
-            
         }
-
     }
 };
diff --git a/database/migrations/2021_11_09_115919_update_designs.php b/database/migrations/2021_11_09_115919_update_designs.php
index 5fb63b46b0c4..9b6265db822b 100644
--- a/database/migrations/2021_11_09_115919_update_designs.php
+++ b/database/migrations/2021_11_09_115919_update_designs.php
@@ -2,8 +2,7 @@
 
 use Illuminate\Database\Migrations\Migration;
 
-class UpdateDesigns extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -23,4 +22,4 @@ class UpdateDesigns extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2021_11_10_184847_add_is_migrate_column_to_accounts_table.php b/database/migrations/2021_11_10_184847_add_is_migrate_column_to_accounts_table.php
index 1d0b7baa1fad..f7cce29e7068 100644
--- a/database/migrations/2021_11_10_184847_add_is_migrate_column_to_accounts_table.php
+++ b/database/migrations/2021_11_10_184847_add_is_migrate_column_to_accounts_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddIsMigrateColumnToAccountsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -29,4 +28,4 @@ class AddIsMigrateColumnToAccountsTable extends Migration
             //
         });
     }
-}
+};
diff --git a/database/migrations/2021_11_11_163121_add_instant_bank_transfer.php b/database/migrations/2021_11_11_163121_add_instant_bank_transfer.php
index 15a2ba3ff61f..8dd548179cf8 100644
--- a/database/migrations/2021_11_11_163121_add_instant_bank_transfer.php
+++ b/database/migrations/2021_11_11_163121_add_instant_bank_transfer.php
@@ -6,8 +6,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddInstantBankTransfer extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -23,4 +22,4 @@ class AddInstantBankTransfer extends Migration
 
         $type->save();
     }
-}
+};
diff --git a/database/migrations/2021_12_20_095542_add_serbian_language_translations.php b/database/migrations/2021_12_20_095542_add_serbian_language_translations.php
index d37a86115476..b98ef96fdf02 100644
--- a/database/migrations/2021_12_20_095542_add_serbian_language_translations.php
+++ b/database/migrations/2021_12_20_095542_add_serbian_language_translations.php
@@ -5,8 +5,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddSerbianLanguageTranslations extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -18,7 +17,6 @@ class AddSerbianLanguageTranslations extends Migration
 
         Language::unguard();
         Language::create($serbian);
-
     }
 
     /**
@@ -30,4 +28,4 @@ class AddSerbianLanguageTranslations extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2022_01_02_022421_add_slovak_language.php b/database/migrations/2022_01_02_022421_add_slovak_language.php
index 0ec9fe556bd4..0b7cfd8dff4b 100644
--- a/database/migrations/2022_01_02_022421_add_slovak_language.php
+++ b/database/migrations/2022_01_02_022421_add_slovak_language.php
@@ -5,8 +5,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddSlovakLanguage extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -29,4 +28,4 @@ class AddSlovakLanguage extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2022_01_06_061231_add_app_domain_id_to_gateways_table.php b/database/migrations/2022_01_06_061231_add_app_domain_id_to_gateways_table.php
index 35193d605575..139ee962dd9a 100644
--- a/database/migrations/2022_01_06_061231_add_app_domain_id_to_gateways_table.php
+++ b/database/migrations/2022_01_06_061231_add_app_domain_id_to_gateways_table.php
@@ -6,8 +6,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddAppDomainIdToGatewaysTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -15,24 +14,21 @@ class AddAppDomainIdToGatewaysTable extends Migration
      */
     public function up()
     {
-
-        if(Ninja::isHosted()){
-
+        if (Ninja::isHosted()) {
             $stripe_connect = Gateway::find(56);
 
-            if($stripe_connect){
+            if ($stripe_connect) {
                 $stripe_connect->fields = '{"account_id":"", "appleDomainVerification":""}';
                 $stripe_connect->save();
             }
         }
 
-            $stripe_connect = Gateway::find(20);
+        $stripe_connect = Gateway::find(20);
 
-            if($stripe_connect){
-                $stripe_connect->fields = '{"account_id":"", "appleDomainVerification":""}';
-                $stripe_connect->save();
-            }
-        
+        if ($stripe_connect) {
+            $stripe_connect->fields = '{"account_id":"", "appleDomainVerification":""}';
+            $stripe_connect->save();
+        }
     }
 
     /**
@@ -40,5 +36,4 @@ class AddAppDomainIdToGatewaysTable extends Migration
      *
      * @return void
      */
-
-}
+};
diff --git a/database/migrations/2022_01_18_004856_add_estonian_language.php b/database/migrations/2022_01_18_004856_add_estonian_language.php
index 6a6fd8068960..a154b4c817d2 100644
--- a/database/migrations/2022_01_18_004856_add_estonian_language.php
+++ b/database/migrations/2022_01_18_004856_add_estonian_language.php
@@ -5,8 +5,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddEstonianLanguage extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -14,12 +13,10 @@ class AddEstonianLanguage extends Migration
      */
     public function up()
     {
-
         $estonia = ['id' => 35, 'name' => 'Estonian', 'locale' => 'et'];
 
         Language::unguard();
         Language::create($estonia);
-
     }
 
     /**
@@ -31,4 +28,4 @@ class AddEstonianLanguage extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2022_01_19_085907_add_platform_column_to_accounts_table.php b/database/migrations/2022_01_19_085907_add_platform_column_to_accounts_table.php
index 77d3fe6803fe..d8bbe2cdc12e 100644
--- a/database/migrations/2022_01_19_085907_add_platform_column_to_accounts_table.php
+++ b/database/migrations/2022_01_19_085907_add_platform_column_to_accounts_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddPlatformColumnToAccountsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -26,4 +25,4 @@ class AddPlatformColumnToAccountsTable extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2022_01_19_232436_add_kyd_currency.php b/database/migrations/2022_01_19_232436_add_kyd_currency.php
index adc77d17ed8e..b06f19675968 100644
--- a/database/migrations/2022_01_19_232436_add_kyd_currency.php
+++ b/database/migrations/2022_01_19_232436_add_kyd_currency.php
@@ -5,16 +5,14 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddKydCurrency extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
      * @return void
      */
     public function up()
-    { 
-
+    {
         $currencies = [
 
             ['id' => 112, 'name' => 'Cayman Island Dollar', 'code' => 'KYD', 'symbol' => '', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
@@ -37,7 +35,6 @@ class AddKydCurrency extends Migration
                 Currency::create($currency);
             }
         }
-
     }
 
     /**
@@ -49,4 +46,4 @@ class AddKydCurrency extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2022_01_27_223617_add_client_count_to_accounts_table.php b/database/migrations/2022_01_27_223617_add_client_count_to_accounts_table.php
index 82217e477864..7621bf136db5 100644
--- a/database/migrations/2022_01_27_223617_add_client_count_to_accounts_table.php
+++ b/database/migrations/2022_01_27_223617_add_client_count_to_accounts_table.php
@@ -5,8 +5,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddClientCountToAccountsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -22,8 +21,8 @@ class AddClientCountToAccountsTable extends Migration
 
         $country = Country::find(250);
 
-        if($country){
-            $country->thousand_separator = " ";
+        if ($country) {
+            $country->thousand_separator = ' ';
             $country->save();
         }
     }
@@ -35,6 +34,5 @@ class AddClientCountToAccountsTable extends Migration
      */
     public function down()
     {
-        
     }
-}
+};
diff --git a/database/migrations/2022_02_06_091629_add_client_currency_conversion_to_companies_table.php b/database/migrations/2022_02_06_091629_add_client_currency_conversion_to_companies_table.php
index 08134aba1e73..91fe9b3d41aa 100644
--- a/database/migrations/2022_02_06_091629_add_client_currency_conversion_to_companies_table.php
+++ b/database/migrations/2022_02_06_091629_add_client_currency_conversion_to_companies_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddClientCurrencyConversionToCompaniesTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -25,6 +24,5 @@ class AddClientCurrencyConversionToCompaniesTable extends Migration
      */
     public function down()
     {
-
     }
-}
+};
diff --git a/database/migrations/2022_02_25_015411_update_stripe_apple_domain_config.php b/database/migrations/2022_02_25_015411_update_stripe_apple_domain_config.php
index 8b3989512a0a..21153f7cb6fe 100644
--- a/database/migrations/2022_02_25_015411_update_stripe_apple_domain_config.php
+++ b/database/migrations/2022_02_25_015411_update_stripe_apple_domain_config.php
@@ -5,8 +5,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class UpdateStripeAppleDomainConfig extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -14,19 +13,14 @@ class UpdateStripeAppleDomainConfig extends Migration
      */
     public function up()
     {
-
-        CompanyGateway::whereIn('gateway_key', ['d14dd26a47cecc30fdd65700bfb67b34', 'd14dd26a37cecc30fdd65700bfb55b23'])->cursor()->each(function($cg){
-
+        CompanyGateway::whereIn('gateway_key', ['d14dd26a47cecc30fdd65700bfb67b34', 'd14dd26a37cecc30fdd65700bfb55b23'])->cursor()->each(function ($cg) {
             $config = $cg->getConfig();
 
-            if(!property_exists($config, 'appleDomainVerification')){
-
-                $config->appleDomainVerification = "";
+            if (! property_exists($config, 'appleDomainVerification')) {
+                $config->appleDomainVerification = '';
                 $cg->setConfig($config);
                 $cg->save();
-
             }
-
         });
     }
 
@@ -39,4 +33,4 @@ class UpdateStripeAppleDomainConfig extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2022_03_09_053508_transaction_events.php b/database/migrations/2022_03_09_053508_transaction_events.php
index 5e2dddecf72d..702bbd29ab50 100644
--- a/database/migrations/2022_03_09_053508_transaction_events.php
+++ b/database/migrations/2022_03_09_053508_transaction_events.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class TransactionEvents extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -41,7 +40,6 @@ class TransactionEvents extends Migration
             $table->unsignedInteger('credit_status')->nullable();
 
             $table->foreign('client_id')->references('id')->on('clients')->onDelete('cascade')->onUpdate('cascade');
-
         });
     }
 
@@ -54,5 +52,4 @@ class TransactionEvents extends Migration
     {
         //
     }
-}
-
+};
diff --git a/database/migrations/2022_03_24_090728_markdown_email_enabled_wysiwyg_editor.php b/database/migrations/2022_03_24_090728_markdown_email_enabled_wysiwyg_editor.php
index 6ab00a284492..71ff50b599c8 100644
--- a/database/migrations/2022_03_24_090728_markdown_email_enabled_wysiwyg_editor.php
+++ b/database/migrations/2022_03_24_090728_markdown_email_enabled_wysiwyg_editor.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class MarkdownEmailEnabledWysiwygEditor extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -27,4 +26,4 @@ class MarkdownEmailEnabledWysiwygEditor extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2022_03_29_014025_reverse_apple_domain_for_hosted.php b/database/migrations/2022_03_29_014025_reverse_apple_domain_for_hosted.php
index 509eb42065f0..0487373c9bf4 100644
--- a/database/migrations/2022_03_29_014025_reverse_apple_domain_for_hosted.php
+++ b/database/migrations/2022_03_29_014025_reverse_apple_domain_for_hosted.php
@@ -8,8 +8,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ReverseAppleDomainForHosted extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -17,41 +16,33 @@ class ReverseAppleDomainForHosted extends Migration
      */
     public function up()
     {
-    
-        if(Ninja::isHosted())
-        {
-
+        if (Ninja::isHosted()) {
             $stripe_connect = Gateway::find(56);
 
-            if($stripe_connect){
+            if ($stripe_connect) {
                 $stripe_connect->fields = '{"account_id":""}';
                 $stripe_connect->save();
             }
         }
 
-        Company::cursor()->each(function ($company){
+        Company::cursor()->each(function ($company) {
             $company->update(['markdown_email_enabled' => true]);
         });
 
         $chf = Currency::find(17);
-        
-        if($chf)
-        {
+
+        if ($chf) {
             $chf->symbol = 'CHF';
             $chf->save();
         }
 
-        if(Ninja::isSelfHost())
-        {
-
+        if (Ninja::isSelfHost()) {
             $gateway = Gateway::find(20);
 
-            if($gateway)
-            {
+            if ($gateway) {
                 $gateway->fields = '{"publishableKey":"","apiKey":"","appleDomainVerification":""}';
                 $gateway->save();
             }
-            
         }
     }
 
@@ -64,4 +55,4 @@ class ReverseAppleDomainForHosted extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2022_04_22_115838_client_settings_parse_for_types.php b/database/migrations/2022_04_22_115838_client_settings_parse_for_types.php
index cb81d2ec491f..78a1d443e1b0 100644
--- a/database/migrations/2022_04_22_115838_client_settings_parse_for_types.php
+++ b/database/migrations/2022_04_22_115838_client_settings_parse_for_types.php
@@ -7,9 +7,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ClientSettingsParseForTypes extends Migration
-{
-        use ClientGroupSettingsSaver;
+return new class extends Migration {
+    use ClientGroupSettingsSaver;
 
     /**
      * Run the migrations.
@@ -18,19 +17,13 @@ class ClientSettingsParseForTypes extends Migration
      */
     public function up()
     {
-        
-
-        if(Ninja::isSelfHost())
-        {
-
-            Client::withTrashed()->cursor()->each( function ($client) {
+        if (Ninja::isSelfHost()) {
+            Client::withTrashed()->cursor()->each(function ($client) {
                 $entity_settings = $this->checkSettingType($client->settings);
                 $entity_settings->md5 = md5(time());
                 $client->settings = $entity_settings;
                 $client->save();
-                
             });
-
         }
     }
 
@@ -43,4 +36,4 @@ class ClientSettingsParseForTypes extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2022_04_26_032252_convert_custom_fields_column_from_varchar_to_text.php b/database/migrations/2022_04_26_032252_convert_custom_fields_column_from_varchar_to_text.php
index 47d4da044a75..5592b0da8d8f 100644
--- a/database/migrations/2022_04_26_032252_convert_custom_fields_column_from_varchar_to_text.php
+++ b/database/migrations/2022_04_26_032252_convert_custom_fields_column_from_varchar_to_text.php
@@ -5,8 +5,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ConvertCustomFieldsColumnFromVarcharToText extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -17,158 +16,123 @@ class ConvertCustomFieldsColumnFromVarcharToText extends Migration
         set_time_limit(0);
 
         Schema::table('credits', function (Blueprint $table) {
-
             $table->text('custom_value1')->change();
             $table->text('custom_value2')->change();
             $table->text('custom_value3')->change();
             $table->text('custom_value4')->change();
-
         });
 
         Schema::table('client_contacts', function (Blueprint $table) {
-
             $table->text('custom_value1')->change();
             $table->text('custom_value2')->change();
             $table->text('custom_value3')->change();
             $table->text('custom_value4')->change();
-
         });
 
         Schema::table('clients', function (Blueprint $table) {
-
             $table->text('custom_value1')->change();
             $table->text('custom_value2')->change();
             $table->text('custom_value3')->change();
             $table->text('custom_value4')->change();
-
         });
 
         Schema::table('documents', function (Blueprint $table) {
-
             $table->text('custom_value1')->change();
             $table->text('custom_value2')->change();
             $table->text('custom_value3')->change();
             $table->text('custom_value4')->change();
-
         });
 
         Schema::table('expenses', function (Blueprint $table) {
-
             $table->text('custom_value1')->change();
             $table->text('custom_value2')->change();
             $table->text('custom_value3')->change();
             $table->text('custom_value4')->change();
-
         });
 
         Schema::table('invoices', function (Blueprint $table) {
-
             $table->text('custom_value1')->change();
             $table->text('custom_value2')->change();
             $table->text('custom_value3')->change();
             $table->text('custom_value4')->change();
-
         });
 
         Schema::table('payments', function (Blueprint $table) {
-
             $table->text('custom_value1')->change();
             $table->text('custom_value2')->change();
             $table->text('custom_value3')->change();
             $table->text('custom_value4')->change();
-
         });
 
         Schema::table('products', function (Blueprint $table) {
-
             $table->text('custom_value1')->change();
             $table->text('custom_value2')->change();
             $table->text('custom_value3')->change();
             $table->text('custom_value4')->change();
-
         });
 
         Schema::table('projects', function (Blueprint $table) {
-
             $table->text('custom_value1')->change();
             $table->text('custom_value2')->change();
             $table->text('custom_value3')->change();
             $table->text('custom_value4')->change();
-
         });
 
         Schema::table('quotes', function (Blueprint $table) {
-
             $table->text('custom_value1')->change();
             $table->text('custom_value2')->change();
             $table->text('custom_value3')->change();
             $table->text('custom_value4')->change();
-
         });
 
         Schema::table('recurring_invoices', function (Blueprint $table) {
-
             $table->text('custom_value1')->change();
             $table->text('custom_value2')->change();
             $table->text('custom_value3')->change();
             $table->text('custom_value4')->change();
-
         });
 
         Schema::table('recurring_quotes', function (Blueprint $table) {
-
             $table->text('custom_value1')->change();
             $table->text('custom_value2')->change();
             $table->text('custom_value3')->change();
             $table->text('custom_value4')->change();
-
         });
 
         Schema::table('recurring_expenses', function (Blueprint $table) {
-
             $table->text('custom_value1')->change();
             $table->text('custom_value2')->change();
             $table->text('custom_value3')->change();
             $table->text('custom_value4')->change();
-
         });
 
         Schema::table('tasks', function (Blueprint $table) {
-
             $table->text('custom_value1')->change();
             $table->text('custom_value2')->change();
             $table->text('custom_value3')->change();
             $table->text('custom_value4')->change();
-
         });
 
         Schema::table('users', function (Blueprint $table) {
-
             $table->text('custom_value1')->change();
             $table->text('custom_value2')->change();
             $table->text('custom_value3')->change();
             $table->text('custom_value4')->change();
-
         });
 
         Schema::table('vendors', function (Blueprint $table) {
-
             $table->text('custom_value1')->change();
             $table->text('custom_value2')->change();
             $table->text('custom_value3')->change();
             $table->text('custom_value4')->change();
-
         });
 
         Schema::table('vendor_contacts', function (Blueprint $table) {
-
             $table->text('custom_value1')->change();
             $table->text('custom_value2')->change();
             $table->text('custom_value3')->change();
             $table->text('custom_value4')->change();
-
         });
-        
     }
 
     /**
@@ -178,6 +142,5 @@ class ConvertCustomFieldsColumnFromVarcharToText extends Migration
      */
     public function down()
     {
-        
     }
-}
+};
diff --git a/database/migrations/2022_05_08_004937_heal_stripe_gateway_configuration.php b/database/migrations/2022_05_08_004937_heal_stripe_gateway_configuration.php
index c68db858b46d..236fe7dc5534 100644
--- a/database/migrations/2022_05_08_004937_heal_stripe_gateway_configuration.php
+++ b/database/migrations/2022_05_08_004937_heal_stripe_gateway_configuration.php
@@ -8,9 +8,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class HealStripeGatewayConfiguration extends Migration
-{
-
+return new class extends Migration {
     use AppSetup;
 
     /**
@@ -20,18 +18,15 @@ class HealStripeGatewayConfiguration extends Migration
      */
     public function up()
     {
-
-        if(Ninja::isSelfHost())
-        {
-     
+        if (Ninja::isSelfHost()) {
             Model::unguard();
 
             $stripe = [
-                'name' => 'Stripe', 
-                'provider' => 'Stripe', 
-                'sort_order' => 1, 
-                'key' => 'd14dd26a37cecc30fdd65700bfb55b23', 
-                'fields' => '{"publishableKey":"","apiKey":"","appleDomainVerification":""}'
+                'name' => 'Stripe',
+                'provider' => 'Stripe',
+                'sort_order' => 1,
+                'key' => 'd14dd26a37cecc30fdd65700bfb55b23',
+                'fields' => '{"publishableKey":"","apiKey":"","appleDomainVerification":""}',
             ];
 
             $record = Gateway::find(20);
@@ -41,8 +36,7 @@ class HealStripeGatewayConfiguration extends Migration
                 $record->save();
             }
 
-        $this->buildCache(true);
-
+            $this->buildCache(true);
         }
     }
 
@@ -55,4 +49,4 @@ class HealStripeGatewayConfiguration extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2022_05_16_224917_add_auto_bill_tries_to_invoices_table.php b/database/migrations/2022_05_16_224917_add_auto_bill_tries_to_invoices_table.php
index 01d4c313c606..3092850f2ca2 100644
--- a/database/migrations/2022_05_16_224917_add_auto_bill_tries_to_invoices_table.php
+++ b/database/migrations/2022_05_16_224917_add_auto_bill_tries_to_invoices_table.php
@@ -4,8 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddAutoBillTriesToInvoicesTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -31,6 +30,5 @@ class AddAutoBillTriesToInvoicesTable extends Migration
      */
     public function down()
     {
-
     }
-}
+};
diff --git a/database/migrations/2022_05_18_055442_update_custom_value_four_columns.php b/database/migrations/2022_05_18_055442_update_custom_value_four_columns.php
index 257cf3556cea..513a07ee9e5d 100644
--- a/database/migrations/2022_05_18_055442_update_custom_value_four_columns.php
+++ b/database/migrations/2022_05_18_055442_update_custom_value_four_columns.php
@@ -5,8 +5,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class UpdateCustomValueFourColumns extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -16,117 +15,78 @@ class UpdateCustomValueFourColumns extends Migration
     {
         set_time_limit(0);
 
-        if(Ninja::isSelfHost())
-        {
-
+        if (Ninja::isSelfHost()) {
             Schema::table('credits', function (Blueprint $table) {
-
                 $table->text('custom_value4')->change();
-
             });
 
             Schema::table('client_contacts', function (Blueprint $table) {
-
                 $table->text('custom_value4')->change();
-
             });
 
             Schema::table('clients', function (Blueprint $table) {
-
                 $table->text('custom_value4')->change();
-
             });
 
             Schema::table('clients', function (Blueprint $table) {
-
                 $table->text('custom_value4')->change();
-
             });
 
             Schema::table('documents', function (Blueprint $table) {
-
                 $table->text('custom_value4')->change();
-
             });
 
             Schema::table('expenses', function (Blueprint $table) {
-
                 $table->text('custom_value4')->change();
-
             });
 
             Schema::table('invoices', function (Blueprint $table) {
-
                 $table->text('custom_value4')->change();
-
             });
 
             Schema::table('payments', function (Blueprint $table) {
-
                 $table->text('custom_value4')->change();
-
             });
 
             Schema::table('products', function (Blueprint $table) {
-
                 $table->text('custom_value4')->change();
-
             });
 
             Schema::table('projects', function (Blueprint $table) {
-
                 $table->text('custom_value4')->change();
-
             });
 
             Schema::table('quotes', function (Blueprint $table) {
-
                 $table->text('custom_value4')->change();
-
             });
 
             Schema::table('recurring_invoices', function (Blueprint $table) {
-
                 $table->text('custom_value4')->change();
-
             });
 
             Schema::table('recurring_quotes', function (Blueprint $table) {
-
                 $table->text('custom_value4')->change();
-
             });
 
             Schema::table('recurring_expenses', function (Blueprint $table) {
-
                 $table->text('custom_value4')->change();
-
             });
 
             Schema::table('tasks', function (Blueprint $table) {
-
                 $table->text('custom_value4')->change();
-
             });
 
             Schema::table('users', function (Blueprint $table) {
-
                 $table->text('custom_value4')->change();
-
             });
 
             Schema::table('vendors', function (Blueprint $table) {
-
                 $table->text('custom_value4')->change();
-
             });
 
             Schema::table('vendor_contacts', function (Blueprint $table) {
-                
                 $table->text('custom_value4')->change();
-
             });
-
         }
     }
 
@@ -139,4 +99,4 @@ class UpdateCustomValueFourColumns extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2022_05_18_162152_create_scheduled_jobs_table.php b/database/migrations/2022_05_18_162152_create_scheduled_jobs_table.php
index 1b3a966db726..7908bbcd0965 100644
--- a/database/migrations/2022_05_18_162152_create_scheduled_jobs_table.php
+++ b/database/migrations/2022_05_18_162152_create_scheduled_jobs_table.php
@@ -13,8 +13,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateScheduledJobsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -43,4 +42,4 @@ class CreateScheduledJobsTable extends Migration
     {
         Schema::dropIfExists('scheduled_jobs');
     }
-}
+};
diff --git a/database/migrations/2022_05_18_162443_create_schedulers_table.php b/database/migrations/2022_05_18_162443_create_schedulers_table.php
index 61c8311b667b..d8c5bb8d18f6 100644
--- a/database/migrations/2022_05_18_162443_create_schedulers_table.php
+++ b/database/migrations/2022_05_18_162443_create_schedulers_table.php
@@ -6,15 +6,14 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateSchedulersTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -44,4 +43,4 @@ class CreateSchedulersTable extends Migration
     {
         Schema::dropIfExists('schedulers');
     }
-}
+};
diff --git a/database/migrations/2022_05_23_050754_drop_redundant_column_show_production_description_dropdown.php b/database/migrations/2022_05_23_050754_drop_redundant_column_show_production_description_dropdown.php
index 507b64d2b996..4574df9e7dbc 100644
--- a/database/migrations/2022_05_23_050754_drop_redundant_column_show_production_description_dropdown.php
+++ b/database/migrations/2022_05_23_050754_drop_redundant_column_show_production_description_dropdown.php
@@ -5,8 +5,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class DropRedundantColumnShowProductionDescriptionDropdown extends Migration
-{
+return new class extends Migration {
     use AppSetup;
 
     /**
@@ -21,7 +20,6 @@ class DropRedundantColumnShowProductionDescriptionDropdown extends Migration
         });
 
         $this->buildCache(true);
-        
     }
 
     /**
@@ -33,4 +31,4 @@ class DropRedundantColumnShowProductionDescriptionDropdown extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2022_05_28_234651_create_purchase_orders_table.php b/database/migrations/2022_05_28_234651_create_purchase_orders_table.php
index a4cc4ecb6792..5adcb10e75c4 100644
--- a/database/migrations/2022_05_28_234651_create_purchase_orders_table.php
+++ b/database/migrations/2022_05_28_234651_create_purchase_orders_table.php
@@ -12,8 +12,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreatePurchaseOrdersTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -54,7 +53,6 @@ class CreatePurchaseOrdersTable extends Migration
 
             $table->string('tax_name1')->nullable();
 
-
             $table->decimal('tax_rate1', 20, 6)->default(0);
 
             $table->string('tax_name2')->nullable();
@@ -63,7 +61,6 @@ class CreatePurchaseOrdersTable extends Migration
             $table->string('tax_name3')->nullable();
             $table->decimal('tax_rate3', 20, 6)->default(0);
 
-
             $table->decimal('total_taxes', 20, 6)->default(0);
             $table->boolean('uses_inclusive_taxes')->default(0);
 
@@ -77,23 +74,18 @@ class CreatePurchaseOrdersTable extends Migration
             $table->text('custom_value3')->nullable();
             $table->text('custom_value4')->nullable();
 
-
             $table->datetime('next_send_date')->nullable();
 
-
-
-            $table->decimal('custom_surcharge1', 20,6)->nullable();
-            $table->decimal('custom_surcharge2', 20,6)->nullable();
-            $table->decimal('custom_surcharge3', 20,6)->nullable();
-            $table->decimal('custom_surcharge4', 20,6)->nullable();
-
+            $table->decimal('custom_surcharge1', 20, 6)->nullable();
+            $table->decimal('custom_surcharge2', 20, 6)->nullable();
+            $table->decimal('custom_surcharge3', 20, 6)->nullable();
+            $table->decimal('custom_surcharge4', 20, 6)->nullable();
 
             $table->boolean('custom_surcharge_tax1')->default(false);
             $table->boolean('custom_surcharge_tax2')->default(false);
             $table->boolean('custom_surcharge_tax3')->default(false);
             $table->boolean('custom_surcharge_tax4')->default(false);
 
-
             $table->decimal('exchange_rate', 20, 6)->default(1);
             $table->decimal('balance', 20, 6);
             $table->decimal('partial', 20, 6)->nullable();
@@ -111,7 +103,6 @@ class CreatePurchaseOrdersTable extends Migration
 
             $table->softDeletes();
             $table->timestamps();
-
         });
     }
 
@@ -123,4 +114,4 @@ class CreatePurchaseOrdersTable extends Migration
     public function down()
     {
     }
-}
+};
diff --git a/database/migrations/2022_05_30_181109_drop_scheduled_jobs_table.php b/database/migrations/2022_05_30_181109_drop_scheduled_jobs_table.php
index 6e29ed1759a0..0f1d48dd59c7 100644
--- a/database/migrations/2022_05_30_181109_drop_scheduled_jobs_table.php
+++ b/database/migrations/2022_05_30_181109_drop_scheduled_jobs_table.php
@@ -12,8 +12,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class DropScheduledJobsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -33,4 +32,4 @@ class DropScheduledJobsTable extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2022_05_30_184320_add_job_related_fields_to_schedulers_table.php b/database/migrations/2022_05_30_184320_add_job_related_fields_to_schedulers_table.php
index 36f877cc2b76..4fb950c59725 100644
--- a/database/migrations/2022_05_30_184320_add_job_related_fields_to_schedulers_table.php
+++ b/database/migrations/2022_05_30_184320_add_job_related_fields_to_schedulers_table.php
@@ -12,8 +12,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddJobRelatedFieldsToSchedulersTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -35,6 +34,5 @@ class AddJobRelatedFieldsToSchedulersTable extends Migration
      */
     public function down()
     {
-
     }
-}
+};
diff --git a/database/migrations/2022_05_31_101504_inventory_management_schema.php b/database/migrations/2022_05_31_101504_inventory_management_schema.php
index d1d3bedae47e..b7d887cc5a5c 100644
--- a/database/migrations/2022_05_31_101504_inventory_management_schema.php
+++ b/database/migrations/2022_05_31_101504_inventory_management_schema.php
@@ -12,8 +12,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class InventoryManagementSchema extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -21,8 +20,6 @@ class InventoryManagementSchema extends Migration
      */
     public function up()
     {
-
-
         Schema::table('companies', function (Blueprint $table) {
             $table->boolean('enable_applying_payments')->default(0);
             $table->boolean('track_inventory')->default(0);
@@ -30,13 +27,11 @@ class InventoryManagementSchema extends Migration
             $table->boolean('stock_notification')->default(1);
         });
 
-        Schema::table('products', function (Blueprint $table){
+        Schema::table('products', function (Blueprint $table) {
             $table->integer('in_stock_quantity')->default(0);
             $table->boolean('stock_notification')->default(1);
             $table->integer('stock_notification_threshold')->default(0);
         });
-
-
     }
 
     /**
@@ -48,5 +43,4 @@ class InventoryManagementSchema extends Migration
     {
         //
     }
-}
-
+};
diff --git a/database/migrations/2022_06_01_215859_set_recurring_client_timestamp.php b/database/migrations/2022_06_01_215859_set_recurring_client_timestamp.php
index a66c4d3ef7bd..5011d72ac5b6 100644
--- a/database/migrations/2022_06_01_215859_set_recurring_client_timestamp.php
+++ b/database/migrations/2022_06_01_215859_set_recurring_client_timestamp.php
@@ -15,18 +15,14 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class SetRecurringClientTimestamp extends Migration
-{
-
+return new class extends Migration {
     /**
      * Run the migrations.
-     *
      */
     public function up()
     {
-    
         set_time_limit(0);
-    
+
         Schema::table('recurring_invoices', function (Blueprint $table) {
             $table->datetime('next_send_date_client')->nullable();
         });
@@ -35,18 +31,16 @@ class SetRecurringClientTimestamp extends Migration
             $table->datetime('next_send_date_client')->nullable();
         });
 
-
-        RecurringInvoice::withTrashed()->whereNotNull('next_send_date')->cursor()->each(function ($recurring_invoice){
+        RecurringInvoice::withTrashed()->whereNotNull('next_send_date')->cursor()->each(function ($recurring_invoice) {
 
             // $offset = $recurring_invoice->client->timezone_offset();
             // $re = Carbon::parse($recurring_invoice->next_send_date)->subSeconds($offset)->format('Y-m-d');
             $re = Carbon::parse($recurring_invoice->next_send_date)->format('Y-m-d');
             $recurring_invoice->next_send_date_client = $re;
             $recurring_invoice->saveQuietly();
-
         });
-    
-        RecurringExpense::withTrashed()->whereNotNull('next_send_date')->cursor()->each(function ($recurring_expense){
+
+        RecurringExpense::withTrashed()->whereNotNull('next_send_date')->cursor()->each(function ($recurring_expense) {
             $recurring_expense->next_send_date_client = $recurring_expense->next_send_date;
             $recurring_expense->saveQuietly();
         });
@@ -61,4 +55,4 @@ class SetRecurringClientTimestamp extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2022_06_01_224339_create_purchase_order_invitations_table.php b/database/migrations/2022_06_01_224339_create_purchase_order_invitations_table.php
index e914fefa7fb4..381a32ac63da 100644
--- a/database/migrations/2022_06_01_224339_create_purchase_order_invitations_table.php
+++ b/database/migrations/2022_06_01_224339_create_purchase_order_invitations_table.php
@@ -13,8 +13,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreatePurchaseOrderInvitationsTable extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -23,7 +22,7 @@ class CreatePurchaseOrderInvitationsTable extends Migration
     public function up()
     {
         set_time_limit(0);
-    
+
         Schema::create('purchase_order_invitations', function (Blueprint $table) {
             $table->id();
             $table->unsignedInteger('company_id');
@@ -50,7 +49,6 @@ class CreatePurchaseOrderInvitationsTable extends Migration
             $table->softDeletes('deleted_at', 6);
             $table->unique(['vendor_contact_id', 'purchase_order_id'], 'vendor_purchase_unique');
             $table->index(['deleted_at', 'purchase_order_id', 'company_id'], 'vendor_purchase_company_index');
-
         });
 
         Schema::table('purchase_orders', function (Blueprint $table) {
@@ -62,8 +60,7 @@ class CreatePurchaseOrderInvitationsTable extends Migration
             $table->unsignedInteger('vendor_contact_id')->nullable();
         });
 
-        Company::cursor()->each(function ($company){
-
+        Company::cursor()->each(function ($company) {
             $settings = $company->settings;
 
             $settings->purchase_order_design_id = 'Wpmbk5ezJn';
@@ -79,7 +76,6 @@ class CreatePurchaseOrderInvitationsTable extends Migration
             $company->settings = $settings;
             $company->save();
         });
-
     }
 
     /**
@@ -90,5 +86,4 @@ class CreatePurchaseOrderInvitationsTable extends Migration
     public function down()
     {
     }
-
-}
\ No newline at end of file
+};
diff --git a/database/migrations/2022_06_10_030503_set_account_flag_for_react.php b/database/migrations/2022_06_10_030503_set_account_flag_for_react.php
index 3a26ea68b3a3..89051c861910 100644
--- a/database/migrations/2022_06_10_030503_set_account_flag_for_react.php
+++ b/database/migrations/2022_06_10_030503_set_account_flag_for_react.php
@@ -12,8 +12,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class SetAccountFlagForReact extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -22,7 +21,6 @@ class SetAccountFlagForReact extends Migration
     public function up()
     {
         Illuminate\Support\Facades\Artisan::call('ninja:design-update');
-
     }
 
     /**
@@ -34,4 +32,4 @@ class SetAccountFlagForReact extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2022_06_16_025156_add_react_switching_flag.php b/database/migrations/2022_06_16_025156_add_react_switching_flag.php
index fc44a6f0e968..3c807d7e417c 100644
--- a/database/migrations/2022_06_16_025156_add_react_switching_flag.php
+++ b/database/migrations/2022_06_16_025156_add_react_switching_flag.php
@@ -12,8 +12,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddReactSwitchingFlag extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -35,4 +34,4 @@ class AddReactSwitchingFlag extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2022_06_17_082627_change_refresh_token_column_size.php b/database/migrations/2022_06_17_082627_change_refresh_token_column_size.php
index a2206795c1cb..83d076f792a7 100644
--- a/database/migrations/2022_06_17_082627_change_refresh_token_column_size.php
+++ b/database/migrations/2022_06_17_082627_change_refresh_token_column_size.php
@@ -12,8 +12,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class ChangeRefreshTokenColumnSize extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      *
@@ -21,12 +20,9 @@ class ChangeRefreshTokenColumnSize extends Migration
      */
     public function up()
     {
-
         Schema::table('users', function (Blueprint $table) {
             $table->text('oauth_user_refresh_token')->change();
         });
-
-        
     }
 
     /**
@@ -38,4 +34,4 @@ class ChangeRefreshTokenColumnSize extends Migration
     {
         //
     }
-}
+};
diff --git a/database/migrations/2022_06_24_141018_upgrade_failed_jobs_table.php b/database/migrations/2022_06_24_141018_upgrade_failed_jobs_table.php
new file mode 100644
index 000000000000..6ff0098e5689
--- /dev/null
+++ b/database/migrations/2022_06_24_141018_upgrade_failed_jobs_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('failed_jobs', function (Blueprint $table) {
+            $table->string('uuid')->after('id')->nullable()->unique();
+        });
+
+        DB::table('failed_jobs')->whereNull('uuid')->cursor()->each(function ($job) {
+            DB::table('failed_jobs')
+                ->where('id', $job->id)
+                ->update(['uuid' => (string) Illuminate\Support\Str::uuid()]);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+};
diff --git a/database/migrations/2022_07_18_033756_fixes_for_date_formats_table_react.php b/database/migrations/2022_07_18_033756_fixes_for_date_formats_table_react.php
new file mode 100644
index 000000000000..78b1adec8a09
--- /dev/null
+++ b/database/migrations/2022_07_18_033756_fixes_for_date_formats_table_react.php
@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if($df = App\Models\DateFormat::find(7))
+        {
+
+            $df->format_moment = 'ddd MMM D, YYYY';
+            $df->save();
+        }
+
+        if($df = App\Models\DateFormat::find(14))
+        {
+        
+            $df->format_moment = 'DD/MM/YYYY';
+            $df->save();
+            
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+};
diff --git a/database/migrations/2022_07_26_091216_add_sms_verification_to_hosted_account.php b/database/migrations/2022_07_26_091216_add_sms_verification_to_hosted_account.php
new file mode 100644
index 000000000000..7ef526562963
--- /dev/null
+++ b/database/migrations/2022_07_26_091216_add_sms_verification_to_hosted_account.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddSmsVerificationToHostedAccount extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('accounts', function (Blueprint $table) {
+            $table->text('account_sms_verification_code')->nullable();
+            $table->text('account_sms_verification_number')->nullable();
+            $table->boolean('account_sms_verified')->default(0);
+        });
+
+        App\Models\Account::query()->cursor()->each(function ($account){
+
+            $account->account_sms_verified = true;
+            $account->save();
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+
+    }
+}
diff --git a/database/migrations/2022_07_28_232340_enabled_expense_tax_rates_to_companies_table.php b/database/migrations/2022_07_28_232340_enabled_expense_tax_rates_to_companies_table.php
new file mode 100644
index 000000000000..04a07d8f7d22
--- /dev/null
+++ b/database/migrations/2022_07_28_232340_enabled_expense_tax_rates_to_companies_table.php
@@ -0,0 +1,38 @@
+<?php
+
+use App\Models\Company;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('companies', function (Blueprint $table) {
+            $table->boolean('enabled_expense_tax_rates')->default(0);
+        });
+
+        Company::query()->where('enabled_item_tax_rates', true)->cursor()->each(function ($company){
+            
+            $company->enabled_expense_tax_rates = true;
+            $company->save();
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+
+    }
+};
diff --git a/database/migrations/2022_07_29_091235_correction_for_companies_table_types.php b/database/migrations/2022_07_29_091235_correction_for_companies_table_types.php
new file mode 100644
index 000000000000..45564710b6a5
--- /dev/null
+++ b/database/migrations/2022_07_29_091235_correction_for_companies_table_types.php
@@ -0,0 +1,38 @@
+<?php
+
+use App\Models\Company;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('companies', function (Blueprint $table) {
+            $table->unsignedInteger('enabled_expense_tax_rates')->default(0)->change();
+        });
+
+        Company::query()->where('enabled_item_tax_rates', true)->cursor()->each(function ($company){
+            
+            $company->enabled_expense_tax_rates = $company->enabled_item_tax_rates;
+            $company->save();
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+};
diff --git a/database/schema/db-ninja-01-schema.dump b/database/schema/db-ninja-01-schema.dump
index 64acb93e94ce..8c4198c363c0 100644
--- a/database/schema/db-ninja-01-schema.dump
+++ b/database/schema/db-ninja-01-schema.dump
@@ -41,6 +41,12 @@ CREATE TABLE `accounts` (
   `hosted_client_count` int unsigned DEFAULT NULL,
   `hosted_company_count` int unsigned DEFAULT NULL,
   `inapp_transaction_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `set_react_as_default_ap` tinyint(1) NOT NULL DEFAULT '0',
+  `is_flagged` tinyint(1) NOT NULL DEFAULT '0',
+  `is_verified_account` tinyint(1) NOT NULL DEFAULT '0',
+  `account_sms_verification_code` text COLLATE utf8mb4_unicode_ci,
+  `account_sms_verification_number` text COLLATE utf8mb4_unicode_ci,
+  `account_sms_verified` tinyint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `accounts_payment_id_index` (`payment_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
@@ -75,6 +81,8 @@ CREATE TABLE `activities` (
   `recurring_invoice_id` int unsigned DEFAULT NULL,
   `recurring_expense_id` int unsigned DEFAULT NULL,
   `recurring_quote_id` int unsigned DEFAULT NULL,
+  `purchase_order_id` int unsigned DEFAULT NULL,
+  `vendor_contact_id` int unsigned DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `activities_vendor_id_company_id_index` (`vendor_id`,`company_id`),
   KEY `activities_project_id_company_id_index` (`project_id`,`company_id`),
@@ -88,6 +96,10 @@ CREATE TABLE `activities` (
   KEY `activities_expense_id_company_id_index` (`expense_id`,`company_id`),
   KEY `activities_client_contact_id_company_id_index` (`client_contact_id`,`company_id`),
   KEY `activities_company_id_foreign` (`company_id`),
+  KEY `activities_quote_id_company_id_index` (`quote_id`,`company_id`),
+  KEY `activities_recurring_invoice_id_company_id_index` (`recurring_invoice_id`,`company_id`),
+  KEY `activities_purchase_order_id_company_id_index` (`purchase_order_id`,`company_id`),
+  KEY `activities_vendor_contact_id_company_id_index` (`vendor_contact_id`,`company_id`),
   CONSTRAINT `activities_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -178,7 +190,7 @@ CREATE TABLE `client_contacts` (
   `custom_value1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `custom_value4` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `custom_value4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `email` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `email_verified_at` timestamp NULL DEFAULT NULL,
   `confirmation_code` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
@@ -298,7 +310,7 @@ CREATE TABLE `clients` (
   `custom_value1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `custom_value4` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `custom_value4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `shipping_address1` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `shipping_address2` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `shipping_city` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
@@ -391,6 +403,13 @@ CREATE TABLE `companies` (
   `client_registration_fields` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `convert_rate_to_client` tinyint(1) NOT NULL DEFAULT '1',
   `markdown_email_enabled` tinyint(1) NOT NULL DEFAULT '0',
+  `stop_on_unpaid_recurring` tinyint(1) NOT NULL DEFAULT '0',
+  `use_quote_terms_on_conversion` tinyint(1) NOT NULL DEFAULT '0',
+  `enable_applying_payments` tinyint(1) NOT NULL DEFAULT '0',
+  `track_inventory` tinyint(1) NOT NULL DEFAULT '0',
+  `inventory_notification_threshold` int NOT NULL DEFAULT '0',
+  `stock_notification` tinyint(1) NOT NULL DEFAULT '1',
+  `enabled_expense_tax_rates` int unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `companies_company_key_unique` (`company_key`),
   KEY `companies_industry_id_foreign` (`industry_id`),
@@ -618,7 +637,7 @@ CREATE TABLE `credits` (
   `custom_value1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `custom_value4` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `custom_value4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `next_send_date` datetime DEFAULT NULL,
   `custom_surcharge1` decimal(20,6) DEFAULT NULL,
   `custom_surcharge2` decimal(20,6) DEFAULT NULL,
@@ -736,7 +755,7 @@ CREATE TABLE `documents` (
   `custom_value1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `custom_value4` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `custom_value4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `deleted_at` timestamp(6) NULL DEFAULT NULL,
   `documentable_id` int unsigned NOT NULL,
   `documentable_type` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
@@ -808,7 +827,7 @@ CREATE TABLE `expenses` (
   `custom_value1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `custom_value4` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `custom_value4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `number` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `project_id` int unsigned DEFAULT NULL,
   `tax_amount1` decimal(20,6) NOT NULL DEFAULT '1.000000',
@@ -829,12 +848,14 @@ DROP TABLE IF EXISTS `failed_jobs`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `failed_jobs` (
   `id` bigint unsigned NOT NULL AUTO_INCREMENT,
+  `uuid` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `connection` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `queue` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `payload` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `exception` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
   `failed_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `failed_jobs_uuid_unique` (`uuid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS `gateway_types`;
@@ -971,7 +992,7 @@ CREATE TABLE `invoices` (
   `custom_value1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `custom_value4` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `custom_value4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `next_send_date` datetime DEFAULT NULL,
   `custom_surcharge1` decimal(20,6) DEFAULT NULL,
   `custom_surcharge2` decimal(20,6) DEFAULT NULL,
@@ -997,6 +1018,7 @@ CREATE TABLE `invoices` (
   `auto_bill_enabled` tinyint(1) NOT NULL DEFAULT '0',
   `paid_to_date` decimal(20,6) NOT NULL DEFAULT '0.000000',
   `subscription_id` int unsigned DEFAULT NULL,
+  `auto_bill_tries` smallint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `invoices_company_id_number_unique` (`company_id`,`number`),
   KEY `invoices_user_id_foreign` (`user_id`),
@@ -1086,6 +1108,7 @@ CREATE TABLE `payment_hashes` (
   `updated_at` timestamp(6) NULL DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `payment_hashes_payment_id_foreign` (`payment_id`),
+  KEY `payment_hashes_hash_index` (`hash`),
   CONSTRAINT `payment_hashes_payment_id_foreign` FOREIGN KEY (`payment_id`) REFERENCES `payments` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1186,7 +1209,7 @@ CREATE TABLE `payments` (
   `custom_value1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `custom_value4` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `custom_value4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`id`),
   KEY `payments_company_id_deleted_at_index` (`company_id`,`deleted_at`),
   KEY `payments_client_contact_id_foreign` (`client_contact_id`),
@@ -1215,7 +1238,7 @@ CREATE TABLE `products` (
   `custom_value1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `custom_value4` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `custom_value4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `product_key` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `notes` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `cost` decimal(20,6) NOT NULL DEFAULT '0.000000',
@@ -1231,10 +1254,14 @@ CREATE TABLE `products` (
   `created_at` timestamp(6) NULL DEFAULT NULL,
   `updated_at` timestamp(6) NULL DEFAULT NULL,
   `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `in_stock_quantity` int NOT NULL DEFAULT '0',
+  `stock_notification` tinyint(1) NOT NULL DEFAULT '1',
+  `stock_notification_threshold` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `products_company_id_deleted_at_index` (`company_id`,`deleted_at`),
   KEY `products_user_id_foreign` (`user_id`),
   KEY `products_company_id_index` (`company_id`),
+  KEY `pro_co_us_up_index` (`company_id`,`user_id`,`assigned_user_id`,`updated_at`),
   CONSTRAINT `products_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
   CONSTRAINT `products_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
@@ -1272,6 +1299,117 @@ CREATE TABLE `projects` (
   CONSTRAINT `projects_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
 /*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `purchase_order_invitations`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `purchase_order_invitations` (
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT,
+  `company_id` int unsigned NOT NULL,
+  `user_id` int unsigned NOT NULL,
+  `vendor_contact_id` int unsigned NOT NULL,
+  `purchase_order_id` bigint unsigned NOT NULL,
+  `key` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `transaction_reference` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `message_id` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `email_error` mediumtext COLLATE utf8mb4_unicode_ci,
+  `signature_base64` text COLLATE utf8mb4_unicode_ci,
+  `signature_date` datetime DEFAULT NULL,
+  `sent_date` datetime DEFAULT NULL,
+  `viewed_date` datetime DEFAULT NULL,
+  `opened_date` datetime DEFAULT NULL,
+  `created_at` timestamp(6) NULL DEFAULT NULL,
+  `updated_at` timestamp(6) NULL DEFAULT NULL,
+  `deleted_at` timestamp(6) NULL DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `vendor_purchase_unique` (`vendor_contact_id`,`purchase_order_id`),
+  KEY `purchase_order_invitations_user_id_foreign` (`user_id`),
+  KEY `purchase_order_invitations_company_id_foreign` (`company_id`),
+  KEY `vendor_purchase_company_index` (`deleted_at`,`purchase_order_id`,`company_id`),
+  KEY `purchase_order_invitations_purchase_order_id_index` (`purchase_order_id`),
+  KEY `purchase_order_invitations_key_index` (`key`),
+  KEY `purchase_order_invitations_message_id_index` (`message_id`),
+  CONSTRAINT `purchase_order_invitations_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `purchase_order_invitations_purchase_order_id_foreign` FOREIGN KEY (`purchase_order_id`) REFERENCES `purchase_orders` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `purchase_order_invitations_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `purchase_order_invitations_vendor_contact_id_foreign` FOREIGN KEY (`vendor_contact_id`) REFERENCES `vendor_contacts` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `purchase_orders`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `purchase_orders` (
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT,
+  `client_id` int unsigned DEFAULT NULL,
+  `user_id` int unsigned NOT NULL,
+  `assigned_user_id` int unsigned DEFAULT NULL,
+  `company_id` int unsigned NOT NULL,
+  `status_id` int unsigned NOT NULL,
+  `project_id` int unsigned DEFAULT NULL,
+  `vendor_id` int unsigned DEFAULT NULL,
+  `recurring_id` int unsigned DEFAULT NULL,
+  `design_id` int unsigned DEFAULT NULL,
+  `invoice_id` int unsigned DEFAULT NULL,
+  `number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `discount` double(8,2) NOT NULL DEFAULT '0.00',
+  `is_amount_discount` tinyint(1) NOT NULL DEFAULT '0',
+  `po_number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `date` date DEFAULT NULL,
+  `last_sent_date` datetime DEFAULT NULL,
+  `due_date` date DEFAULT NULL,
+  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `line_items` mediumtext COLLATE utf8mb4_unicode_ci,
+  `backup` mediumtext COLLATE utf8mb4_unicode_ci,
+  `footer` text COLLATE utf8mb4_unicode_ci,
+  `public_notes` text COLLATE utf8mb4_unicode_ci,
+  `private_notes` text COLLATE utf8mb4_unicode_ci,
+  `terms` text COLLATE utf8mb4_unicode_ci,
+  `tax_name1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `tax_rate1` decimal(20,6) NOT NULL DEFAULT '0.000000',
+  `tax_name2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `tax_rate2` decimal(20,6) NOT NULL DEFAULT '0.000000',
+  `tax_name3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `tax_rate3` decimal(20,6) NOT NULL DEFAULT '0.000000',
+  `total_taxes` decimal(20,6) NOT NULL DEFAULT '0.000000',
+  `uses_inclusive_taxes` tinyint(1) NOT NULL DEFAULT '0',
+  `reminder1_sent` date DEFAULT NULL,
+  `reminder2_sent` date DEFAULT NULL,
+  `reminder3_sent` date DEFAULT NULL,
+  `reminder_last_sent` date DEFAULT NULL,
+  `custom_value1` text COLLATE utf8mb4_unicode_ci,
+  `custom_value2` text COLLATE utf8mb4_unicode_ci,
+  `custom_value3` text COLLATE utf8mb4_unicode_ci,
+  `custom_value4` text COLLATE utf8mb4_unicode_ci,
+  `next_send_date` datetime DEFAULT NULL,
+  `custom_surcharge1` decimal(20,6) DEFAULT NULL,
+  `custom_surcharge2` decimal(20,6) DEFAULT NULL,
+  `custom_surcharge3` decimal(20,6) DEFAULT NULL,
+  `custom_surcharge4` decimal(20,6) DEFAULT NULL,
+  `custom_surcharge_tax1` tinyint(1) NOT NULL DEFAULT '0',
+  `custom_surcharge_tax2` tinyint(1) NOT NULL DEFAULT '0',
+  `custom_surcharge_tax3` tinyint(1) NOT NULL DEFAULT '0',
+  `custom_surcharge_tax4` tinyint(1) NOT NULL DEFAULT '0',
+  `exchange_rate` decimal(20,6) NOT NULL DEFAULT '1.000000',
+  `balance` decimal(20,6) NOT NULL,
+  `partial` decimal(20,6) DEFAULT NULL,
+  `amount` decimal(20,6) NOT NULL,
+  `paid_to_date` decimal(20,6) NOT NULL DEFAULT '0.000000',
+  `partial_due_date` datetime DEFAULT NULL,
+  `last_viewed` datetime DEFAULT NULL,
+  `deleted_at` timestamp NULL DEFAULT NULL,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  `expense_id` int unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `purchase_orders_user_id_foreign` (`user_id`),
+  KEY `purchase_orders_company_id_deleted_at_index` (`company_id`,`deleted_at`),
+  KEY `purchase_orders_client_id_index` (`client_id`),
+  KEY `purchase_orders_company_id_index` (`company_id`),
+  KEY `purchase_orders_expense_id_index` (`expense_id`),
+  CONSTRAINT `purchase_orders_client_id_foreign` FOREIGN KEY (`client_id`) REFERENCES `clients` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `purchase_orders_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `purchase_orders_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS `quote_invitations`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
@@ -1349,7 +1487,7 @@ CREATE TABLE `quotes` (
   `custom_value1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `custom_value4` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `custom_value4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_surcharge1` decimal(20,6) DEFAULT NULL,
   `custom_surcharge2` decimal(20,6) DEFAULT NULL,
   `custom_surcharge3` decimal(20,6) DEFAULT NULL,
@@ -1415,7 +1553,7 @@ CREATE TABLE `recurring_expenses` (
   `custom_value1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `custom_value4` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `custom_value4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `category_id` int unsigned DEFAULT NULL,
   `calculate_tax_by_amount` tinyint(1) NOT NULL DEFAULT '0',
   `tax_amount1` decimal(20,6) DEFAULT NULL,
@@ -1438,6 +1576,7 @@ CREATE TABLE `recurring_expenses` (
   `last_sent_date` datetime DEFAULT NULL,
   `next_send_date` datetime DEFAULT NULL,
   `remaining_cycles` int DEFAULT NULL,
+  `next_send_date_client` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `recurring_expenses_company_id_number_unique` (`company_id`,`number`),
   KEY `recurring_expenses_company_id_deleted_at_index` (`company_id`,`deleted_at`),
@@ -1517,7 +1656,7 @@ CREATE TABLE `recurring_invoices` (
   `custom_value1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `custom_value4` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `custom_value4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `amount` decimal(20,6) NOT NULL,
   `balance` decimal(20,6) NOT NULL,
   `partial` decimal(16,4) DEFAULT NULL,
@@ -1546,6 +1685,7 @@ CREATE TABLE `recurring_invoices` (
   `exchange_rate` decimal(13,6) NOT NULL DEFAULT '1.000000',
   `paid_to_date` decimal(20,6) NOT NULL DEFAULT '0.000000',
   `subscription_id` int unsigned DEFAULT NULL,
+  `next_send_date_client` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `recurring_invoices_company_id_deleted_at_index` (`company_id`,`deleted_at`),
   KEY `recurring_invoices_user_id_foreign` (`user_id`),
@@ -1627,7 +1767,7 @@ CREATE TABLE `recurring_quotes` (
   `custom_value1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `custom_value4` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `custom_value4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `amount` decimal(20,6) NOT NULL DEFAULT '0.000000',
   `balance` decimal(20,6) NOT NULL DEFAULT '0.000000',
   `last_viewed` datetime DEFAULT NULL,
@@ -1666,6 +1806,27 @@ CREATE TABLE `recurring_quotes` (
   CONSTRAINT `recurring_quotes_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
 /*!40101 SET character_set_client = @saved_cs_client */;
+DROP TABLE IF EXISTS `schedulers`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `schedulers` (
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT,
+  `paused` tinyint(1) NOT NULL DEFAULT '0',
+  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
+  `repeat_every` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `start_from` timestamp NOT NULL,
+  `scheduled_run` timestamp NOT NULL,
+  `company_id` bigint unsigned NOT NULL,
+  `created_at` timestamp NULL DEFAULT NULL,
+  `updated_at` timestamp NULL DEFAULT NULL,
+  `deleted_at` timestamp NULL DEFAULT NULL,
+  `action_name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `action_class` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `parameters` mediumtext COLLATE utf8mb4_unicode_ci,
+  PRIMARY KEY (`id`),
+  KEY `schedulers_action_name_index` (`action_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
+/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS `sizes`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
@@ -1855,11 +2016,11 @@ CREATE TABLE `transaction_events` (
   `payment_applied` decimal(16,4) NOT NULL DEFAULT '0.0000',
   `payment_refunded` decimal(16,4) NOT NULL DEFAULT '0.0000',
   `payment_status` int unsigned DEFAULT NULL,
-  `paymentables` mediumtext COLLATE utf8mb4_unicode_ci,
+  `paymentables` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `event_id` int unsigned NOT NULL,
   `timestamp` int unsigned NOT NULL,
-  `payment_request` mediumtext COLLATE utf8mb4_unicode_ci,
-  `metadata` mediumtext COLLATE utf8mb4_unicode_ci,
+  `payment_request` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `metadata` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `credit_balance` decimal(16,4) NOT NULL DEFAULT '0.0000',
   `credit_amount` decimal(16,4) NOT NULL DEFAULT '0.0000',
   `credit_status` int unsigned DEFAULT NULL,
@@ -1902,13 +2063,14 @@ CREATE TABLE `users` (
   `custom_value1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `custom_value4` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `custom_value4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `created_at` timestamp(6) NULL DEFAULT NULL,
   `updated_at` timestamp(6) NULL DEFAULT NULL,
   `deleted_at` timestamp(6) NULL DEFAULT NULL,
-  `oauth_user_refresh_token` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `oauth_user_refresh_token` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `last_confirmed_email_address` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `has_password` tinyint(1) NOT NULL DEFAULT '0',
+  `oauth_user_token_expiry` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `users_email_unique` (`email`),
   UNIQUE KEY `users_oauth_user_id_oauth_provider_id_unique` (`oauth_user_id`,`oauth_provider_id`),
@@ -1935,7 +2097,7 @@ CREATE TABLE `vendor_contacts` (
   `custom_value1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `custom_value4` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `custom_value4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `send_email` tinyint(1) NOT NULL DEFAULT '0',
   `email_verified_at` timestamp NULL DEFAULT NULL,
   `confirmation_code` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
@@ -1995,7 +2157,7 @@ CREATE TABLE `vendors` (
   `custom_value1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `custom_value3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `custom_value4` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `custom_value4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `vendor_hash` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `public_notes` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `id_number` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
@@ -2170,3 +2332,30 @@ INSERT INTO `migrations` VALUES (127,'2022_03_24_090728_markdown_email_enabled_w
 INSERT INTO `migrations` VALUES (128,'2022_03_29_014025_reverse_apple_domain_for_hosted',10);
 INSERT INTO `migrations` VALUES (129,'2022_04_22_115838_client_settings_parse_for_types',10);
 INSERT INTO `migrations` VALUES (130,'2022_04_26_032252_convert_custom_fields_column_from_varchar_to_text',10);
+INSERT INTO `migrations` VALUES (131,'2022_04_14_121548_forte_payment_gateway',11);
+INSERT INTO `migrations` VALUES (132,'2022_05_08_004937_heal_stripe_gateway_configuration',11);
+INSERT INTO `migrations` VALUES (133,'2022_05_16_224917_add_auto_bill_tries_to_invoices_table',11);
+INSERT INTO `migrations` VALUES (134,'2022_05_18_055442_update_custom_value_four_columns',11);
+INSERT INTO `migrations` VALUES (135,'2022_05_18_162152_create_scheduled_jobs_table',11);
+INSERT INTO `migrations` VALUES (136,'2022_05_18_162443_create_schedulers_table',11);
+INSERT INTO `migrations` VALUES (137,'2022_05_23_050754_drop_redundant_column_show_production_description_dropdown',11);
+INSERT INTO `migrations` VALUES (138,'2022_05_28_234651_create_purchase_orders_table',11);
+INSERT INTO `migrations` VALUES (139,'2022_05_30_181109_drop_scheduled_jobs_table',11);
+INSERT INTO `migrations` VALUES (140,'2022_05_30_184320_add_job_related_fields_to_schedulers_table',11);
+INSERT INTO `migrations` VALUES (141,'2022_05_31_101504_inventory_management_schema',11);
+INSERT INTO `migrations` VALUES (142,'2022_06_01_215859_set_recurring_client_timestamp',11);
+INSERT INTO `migrations` VALUES (143,'2022_06_01_224339_create_purchase_order_invitations_table',11);
+INSERT INTO `migrations` VALUES (144,'2022_06_10_030503_set_account_flag_for_react',11);
+INSERT INTO `migrations` VALUES (145,'2022_06_16_025156_add_react_switching_flag',11);
+INSERT INTO `migrations` VALUES (146,'2022_06_17_082627_change_refresh_token_column_size',11);
+INSERT INTO `migrations` VALUES (147,'2022_06_21_104350_fixes_for_description_in_pdf_designs',11);
+INSERT INTO `migrations` VALUES (148,'2022_06_22_090547_set_oauth_expiry_column',11);
+INSERT INTO `migrations` VALUES (149,'2022_06_24_141018_upgrade_failed_jobs_table',11);
+INSERT INTO `migrations` VALUES (150,'2022_06_30_000126_add_flag_to_accounts_table',11);
+INSERT INTO `migrations` VALUES (151,'2022_07_06_080127_add_purchase_order_to_expense',11);
+INSERT INTO `migrations` VALUES (152,'2022_07_09_235510_add_index_to_payment_hash',11);
+INSERT INTO `migrations` VALUES (153,'2022_07_18_033756_fixes_for_date_formats_table_react',11);
+INSERT INTO `migrations` VALUES (154,'2022_07_21_023805_add_hebrew_language',11);
+INSERT INTO `migrations` VALUES (155,'2022_07_26_091216_add_sms_verification_to_hosted_account',11);
+INSERT INTO `migrations` VALUES (156,'2022_07_28_232340_enabled_expense_tax_rates_to_companies_table',11);
+INSERT INTO `migrations` VALUES (157,'2022_07_29_091235_correction_for_companies_table_types',11);
diff --git a/database/seeders/BanksSeeder.php b/database/seeders/BanksSeeder.php
index 039a7ad9b008..ef44180a45e5 100644
--- a/database/seeders/BanksSeeder.php
+++ b/database/seeders/BanksSeeder.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Seeders;
 
 use App\Models\Bank;
diff --git a/database/seeders/ConstantsSeeder.php b/database/seeders/ConstantsSeeder.php
index fd5edd4b740a..fbd5109f3e99 100644
--- a/database/seeders/ConstantsSeeder.php
+++ b/database/seeders/ConstantsSeeder.php
@@ -6,7 +6,7 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace Database\Seeders;
diff --git a/database/seeders/CountriesSeeder.php b/database/seeders/CountriesSeeder.php
index 47fb3202fd72..9ec2e81e6324 100644
--- a/database/seeders/CountriesSeeder.php
+++ b/database/seeders/CountriesSeeder.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Seeders;
 
 use App\Models\Country;
diff --git a/database/seeders/CurrenciesSeeder.php b/database/seeders/CurrenciesSeeder.php
index 45495f210d50..0a74e65d10a6 100644
--- a/database/seeders/CurrenciesSeeder.php
+++ b/database/seeders/CurrenciesSeeder.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Seeders;
 
 use App\Models\Currency;
@@ -115,7 +116,7 @@ class CurrenciesSeeder extends Seeder
             ['id' => 91, 'name' => 'Macedonian Denar', 'code' => 'MKD', 'symbol' => 'ден', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
             ['id' => 92, 'name' => 'Fijian Dollar', 'code' => 'FJD', 'symbol' => 'FJ$', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
             ['id' => 93, 'name' => 'Bolivian Boliviano', 'code' => 'BOB', 'symbol' => 'Bs', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
-            ['id' => 94,'name' => 'Albanian Lek', 'code' => 'ALL', 'symbol' => 'L ', 'precision' => '2', 'thousand_separator' => '.', 'decimal_separator' => ','],
+            ['id' => 94, 'name' => 'Albanian Lek', 'code' => 'ALL', 'symbol' => 'L ', 'precision' => '2', 'thousand_separator' => '.', 'decimal_separator' => ','],
             ['id' => 95, 'name' => 'Serbian Dinar', 'code' => 'RSD', 'symbol' => 'din', 'precision' => '2', 'thousand_separator' => '.', 'decimal_separator' => ','],
             ['id' => 96, 'name' => 'Lebanese Pound', 'code' => 'LBP', 'symbol' => 'LL ', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
             ['id' => 97, 'name' => 'Armenian Dram', 'code' => 'AMD', 'symbol' => '', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 6065ff29f4e1..d935c97456d7 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Seeders;
 
 use App\Models\Timezone;
diff --git a/database/seeders/DateFormatsSeeder.php b/database/seeders/DateFormatsSeeder.php
index 6acd1b365e37..e3ed5c2373c7 100644
--- a/database/seeders/DateFormatsSeeder.php
+++ b/database/seeders/DateFormatsSeeder.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Seeders;
 
 use App\Models\DateFormat;
@@ -29,14 +30,14 @@ class DateFormatsSeeder extends Seeder
             ['id' => 4, 'format' => 'd-F-Y',  'format_moment' => 'DD-MMMM-YYYY', 'format_dart' => 'dd-MMMM-yyyy'],
             ['id' => 5, 'format' => 'M j, Y',  'format_moment' => 'MMM D, YYYY', 'format_dart' => 'MMM d, yyyy'],
             ['id' => 6, 'format' => 'F j, Y',  'format_moment' => 'MMMM D, YYYY', 'format_dart' => 'MMMM d, yyyy'],
-            ['id' => 7, 'format' => 'D M j, Y',  'format_moment' => 'ddd MMM Do, YYYY', 'format_dart' => 'EEE MMM d, yyyy'],
+            ['id' => 7, 'format' => 'D M j, Y',  'format_moment' => 'ddd MMM D, YYYY', 'format_dart' => 'EEE MMM d, yyyy'],
             ['id' => 8, 'format' => 'Y-m-d',  'format_moment' => 'YYYY-MM-DD', 'format_dart' => 'yyyy-MM-dd'],
             ['id' => 9, 'format' => 'd-m-Y',  'format_moment' => 'DD-MM-YYYY', 'format_dart' => 'dd-MM-yyyy'],
             ['id' => 10, 'format' => 'm/d/Y',  'format_moment' => 'MM/DD/YYYY', 'format_dart' => 'MM/dd/yyyy'],
             ['id' => 11, 'format' => 'd.m.Y',  'format_moment' => 'D.MM.YYYY', 'format_dart' => 'dd.MM.yyyy'],
             ['id' => 12, 'format' => 'j. M. Y',  'format_moment' => 'DD. MMM. YYYY', 'format_dart' => 'd. MMM. yyyy'],
             ['id' => 13, 'format' => 'j. F Y',  'format_moment' => 'DD. MMMM YYYY', 'format_dart' => 'd. MMMM yyyy'],
-            ['id' => 14, 'format' => 'd/m/Y',  'format_moment' => 'DD/MM/YYY', 'format_dart' => 'dd/MM/yyyy'],
+            ['id' => 14, 'format' => 'd/m/Y',  'format_moment' => 'DD/MM/YYYY', 'format_dart' => 'dd/MM/yyyy'],
         ];
 
         foreach ($formats as $format) {
@@ -80,4 +81,4 @@ class DateFormatsSeeder extends Seeder
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/database/seeders/DesignSeeder.php b/database/seeders/DesignSeeder.php
index 67909bae7037..fb17cba8ff2e 100644
--- a/database/seeders/DesignSeeder.php
+++ b/database/seeders/DesignSeeder.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Seeders;
 
 use App\Models\Design;
diff --git a/database/seeders/GatewayTypesSeeder.php b/database/seeders/GatewayTypesSeeder.php
index f65cef95d16b..d1869e238e4d 100644
--- a/database/seeders/GatewayTypesSeeder.php
+++ b/database/seeders/GatewayTypesSeeder.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Seeders;
 
 use App\Models\GatewayType;
diff --git a/database/seeders/IndustrySeeder.php b/database/seeders/IndustrySeeder.php
index ed448f34c916..f95b2af0d7ea 100644
--- a/database/seeders/IndustrySeeder.php
+++ b/database/seeders/IndustrySeeder.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Seeders;
 
 use App\Models\Industry;
diff --git a/database/seeders/LanguageSeeder.php b/database/seeders/LanguageSeeder.php
index 6e2541ffbf79..4ba2b59c1f7b 100644
--- a/database/seeders/LanguageSeeder.php
+++ b/database/seeders/LanguageSeeder.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Seeders;
 
 use App\Models\Language;
diff --git a/database/seeders/PaymentTermsSeeder.php b/database/seeders/PaymentTermsSeeder.php
index e0fdf0060e01..201003cda757 100644
--- a/database/seeders/PaymentTermsSeeder.php
+++ b/database/seeders/PaymentTermsSeeder.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Seeders;
 
 use App\Models\PaymentTerm;
diff --git a/database/seeders/PaymentTypesSeeder.php b/database/seeders/PaymentTypesSeeder.php
index 8c8df0c6a93a..1ba71743ee0f 100644
--- a/database/seeders/PaymentTypesSeeder.php
+++ b/database/seeders/PaymentTypesSeeder.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Seeders;
 
 use App\Models\PaymentType;
@@ -17,19 +18,33 @@ use Illuminate\Database\Seeder;
 class PaymentTypesSeeder extends Seeder
 {
     const BANK_LIBRARY_OFX = 1;
+
     const GATEWAY_TYPE_CREDIT_CARD = 1;
+
     const GATEWAY_TYPE_BANK_TRANSFER = 2;
+
     const GATEWAY_TYPE_PAYPAL = 3;
+
     const GATEWAY_TYPE_CRYPTO = 4;
+
     const GATEWAY_TYPE_DWOLLA = 5;
+
     const GATEWAY_TYPE_CUSTOM1 = 6;
+
     const GATEWAY_TYPE_ALIPAY = 7;
+
     const GATEWAY_TYPE_SOFORT = 8;
+
     const GATEWAY_TYPE_SEPA = 9;
+
     const GATEWAY_TYPE_GOCARDLESS = 10;
+
     const GATEWAY_TYPE_APPLE_PAY = 11;
+
     const GATEWAY_TYPE_CUSTOM2 = 12;
+
     const GATEWAY_TYPE_CUSTOM3 = 13;
+
     const GATEWAY_TYPE_CREDIT = 14;
 
     public function run()
@@ -37,7 +52,7 @@ class PaymentTypesSeeder extends Seeder
         Model::unguard();
 
         $paymentTypes = [
-//            ['name' => 'Apply Credit'],
+            //            ['name' => 'Apply Credit'],
             ['name' => 'Bank Transfer', 'gateway_type_id' => self::GATEWAY_TYPE_BANK_TRANSFER],
             ['name' => 'Cash'],
             ['name' => 'Debit', 'gateway_type_id' => self::GATEWAY_TYPE_CREDIT_CARD],
diff --git a/database/seeders/RandomDataSeeder.php b/database/seeders/RandomDataSeeder.php
index 849189e5b010..0571c5d39c4a 100644
--- a/database/seeders/RandomDataSeeder.php
+++ b/database/seeders/RandomDataSeeder.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Seeders;
 
 use App\DataMapper\ClientSettings;
@@ -94,7 +95,7 @@ class RandomDataSeeder extends Seeder
         $account->save();
 
         $user = User::factory()->create([
-            'email'             => $faker->freeEmail,
+            'email'             => $faker->freeEmail(),
             'account_id' => $account->id,
             'confirmation_code' => $this->createDbHash(config('database.default')),
         ]);
@@ -152,8 +153,8 @@ class RandomDataSeeder extends Seeder
         ]);
 
         ClientContact::create([
-            'first_name' => $faker->firstName,
-            'last_name' => $faker->lastName,
+            'first_name' => $faker->firstName(),
+            'last_name' => $faker->lastName(),
             'email' => config('ninja.testvars.username'),
             'company_id' => $company->id,
             'password' => Hash::make(config('ninja.testvars.password')),
diff --git a/database/seeders/UsersTableSeeder.php b/database/seeders/UsersTableSeeder.php
index dc8d9e43b04f..4366d31bc7ec 100644
--- a/database/seeders/UsersTableSeeder.php
+++ b/database/seeders/UsersTableSeeder.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Database\Seeders;
 
 use App\DataMapper\CompanySettings;
@@ -50,13 +51,13 @@ class UsersTableSeeder extends Seeder
         ]);
 
         $userPermissions = collect([
-                                    'view_invoice',
-                                    'view_client',
-                                    'edit_client',
-                                    'edit_invoice',
-                                    'create_invoice',
-                                    'create_client',
-                                ]);
+            'view_invoice',
+            'view_client',
+            'edit_client',
+            'edit_invoice',
+            'create_invoice',
+            'create_client',
+        ]);
 
         $user->companies()->attach($company->id, [
             'account_id' => $account->id,
@@ -74,8 +75,8 @@ class UsersTableSeeder extends Seeder
         ]);
 
         ClientContact::create([
-            'first_name' => $faker->firstName,
-            'last_name' => $faker->lastName,
+            'first_name' => $faker->firstName(),
+            'last_name' => $faker->lastName(),
             'email' => config('ninja.testvars.clientname'),
             'company_id' => $company->id,
             'password' => Hash::make(config('ninja.testvars.password')),
diff --git a/resources/lang/ar/auth.php b/lang/ar/auth.php
similarity index 100%
rename from resources/lang/ar/auth.php
rename to lang/ar/auth.php
diff --git a/resources/lang/ar/help.php b/lang/ar/help.php
similarity index 100%
rename from resources/lang/ar/help.php
rename to lang/ar/help.php
diff --git a/resources/lang/ar/pagination.php b/lang/ar/pagination.php
similarity index 100%
rename from resources/lang/ar/pagination.php
rename to lang/ar/pagination.php
diff --git a/resources/lang/ar/texts.php b/lang/ar/texts.php
similarity index 100%
rename from resources/lang/ar/texts.php
rename to lang/ar/texts.php
diff --git a/resources/lang/ar/validation.php b/lang/ar/validation.php
similarity index 100%
rename from resources/lang/ar/validation.php
rename to lang/ar/validation.php
diff --git a/resources/lang/bg/auth.php b/lang/bg/auth.php
similarity index 100%
rename from resources/lang/bg/auth.php
rename to lang/bg/auth.php
diff --git a/resources/lang/bg/help.php b/lang/bg/help.php
similarity index 100%
rename from resources/lang/bg/help.php
rename to lang/bg/help.php
diff --git a/resources/lang/bg/pagination.php b/lang/bg/pagination.php
similarity index 100%
rename from resources/lang/bg/pagination.php
rename to lang/bg/pagination.php
diff --git a/resources/lang/bg/texts.php b/lang/bg/texts.php
similarity index 100%
rename from resources/lang/bg/texts.php
rename to lang/bg/texts.php
diff --git a/resources/lang/bg/validation.php b/lang/bg/validation.php
similarity index 100%
rename from resources/lang/bg/validation.php
rename to lang/bg/validation.php
diff --git a/resources/lang/ca/auth.php b/lang/ca/auth.php
similarity index 100%
rename from resources/lang/ca/auth.php
rename to lang/ca/auth.php
diff --git a/resources/lang/ca/pagination.php b/lang/ca/pagination.php
similarity index 100%
rename from resources/lang/ca/pagination.php
rename to lang/ca/pagination.php
diff --git a/resources/lang/ca/passwords.php b/lang/ca/passwords.php
similarity index 100%
rename from resources/lang/ca/passwords.php
rename to lang/ca/passwords.php
diff --git a/resources/lang/ca/texts.php b/lang/ca/texts.php
similarity index 100%
rename from resources/lang/ca/texts.php
rename to lang/ca/texts.php
diff --git a/resources/lang/ca/validation.php b/lang/ca/validation.php
similarity index 100%
rename from resources/lang/ca/validation.php
rename to lang/ca/validation.php
diff --git a/resources/lang/cs/auth.php b/lang/cs/auth.php
similarity index 100%
rename from resources/lang/cs/auth.php
rename to lang/cs/auth.php
diff --git a/resources/lang/cs/pagination.php b/lang/cs/pagination.php
similarity index 100%
rename from resources/lang/cs/pagination.php
rename to lang/cs/pagination.php
diff --git a/resources/lang/cs/passwords.php b/lang/cs/passwords.php
similarity index 100%
rename from resources/lang/cs/passwords.php
rename to lang/cs/passwords.php
diff --git a/resources/lang/cs/texts.php b/lang/cs/texts.php
similarity index 100%
rename from resources/lang/cs/texts.php
rename to lang/cs/texts.php
diff --git a/resources/lang/cs/validation.php b/lang/cs/validation.php
similarity index 100%
rename from resources/lang/cs/validation.php
rename to lang/cs/validation.php
diff --git a/resources/lang/da/pagination.php b/lang/da/pagination.php
similarity index 100%
rename from resources/lang/da/pagination.php
rename to lang/da/pagination.php
diff --git a/resources/lang/da/reminders.php b/lang/da/reminders.php
similarity index 100%
rename from resources/lang/da/reminders.php
rename to lang/da/reminders.php
diff --git a/resources/lang/da/texts.php b/lang/da/texts.php
similarity index 100%
rename from resources/lang/da/texts.php
rename to lang/da/texts.php
diff --git a/resources/lang/da/validation.php b/lang/da/validation.php
similarity index 100%
rename from resources/lang/da/validation.php
rename to lang/da/validation.php
diff --git a/resources/lang/de/pagination.php b/lang/de/pagination.php
similarity index 100%
rename from resources/lang/de/pagination.php
rename to lang/de/pagination.php
diff --git a/resources/lang/de/passwords.php b/lang/de/passwords.php
similarity index 100%
rename from resources/lang/de/passwords.php
rename to lang/de/passwords.php
diff --git a/resources/lang/de/reminders.php b/lang/de/reminders.php
similarity index 100%
rename from resources/lang/de/reminders.php
rename to lang/de/reminders.php
diff --git a/resources/lang/de/texts.php b/lang/de/texts.php
similarity index 100%
rename from resources/lang/de/texts.php
rename to lang/de/texts.php
diff --git a/resources/lang/de/validation.php b/lang/de/validation.php
similarity index 100%
rename from resources/lang/de/validation.php
rename to lang/de/validation.php
diff --git a/resources/lang/el/auth.php b/lang/el/auth.php
similarity index 100%
rename from resources/lang/el/auth.php
rename to lang/el/auth.php
diff --git a/resources/lang/el/pagination.php b/lang/el/pagination.php
similarity index 100%
rename from resources/lang/el/pagination.php
rename to lang/el/pagination.php
diff --git a/resources/lang/el/passwords.php b/lang/el/passwords.php
similarity index 100%
rename from resources/lang/el/passwords.php
rename to lang/el/passwords.php
diff --git a/resources/lang/el/texts.php b/lang/el/texts.php
similarity index 100%
rename from resources/lang/el/texts.php
rename to lang/el/texts.php
diff --git a/resources/lang/el/validation.php b/lang/el/validation.php
similarity index 100%
rename from resources/lang/el/validation.php
rename to lang/el/validation.php
diff --git a/resources/lang/sr/auth.php b/lang/en/auth.php
similarity index 91%
rename from resources/lang/sr/auth.php
rename to lang/en/auth.php
index e5506df2907a..6598e2c06073 100644
--- a/resources/lang/sr/auth.php
+++ b/lang/en/auth.php
@@ -14,6 +14,7 @@ return [
     */
 
     'failed' => 'These credentials do not match our records.',
+    'password' => 'The provided password is incorrect.',
     'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
 
 ];
diff --git a/resources/lang/en/help.php b/lang/en/help.php
similarity index 100%
rename from resources/lang/en/help.php
rename to lang/en/help.php
diff --git a/resources/lang/en/pagination.php b/lang/en/pagination.php
similarity index 100%
rename from resources/lang/en/pagination.php
rename to lang/en/pagination.php
diff --git a/resources/lang/sk/passwords.php b/lang/en/passwords.php
similarity index 89%
rename from resources/lang/sk/passwords.php
rename to lang/en/passwords.php
index 114cc03b88d0..52c61c69a957 100644
--- a/resources/lang/sk/passwords.php
+++ b/lang/en/passwords.php
@@ -18,6 +18,6 @@ return [
     'sent' => 'We have e-mailed your password reset link!',
     'token' => 'This password reset token is invalid.',
     'user' => "We can't find a user with that e-mail address.",
-    'throttled' => "You have requested password reset recently, please check your email.",
+    'throttled' => 'You have requested password reset recently, please check your email.',
 
 ];
diff --git a/resources/lang/en/t.php b/lang/en/t.php
similarity index 100%
rename from resources/lang/en/t.php
rename to lang/en/t.php
diff --git a/resources/lang/en/texts.php b/lang/en/texts.php
similarity index 100%
rename from resources/lang/en/texts.php
rename to lang/en/texts.php
diff --git a/lang/en/validation.php b/lang/en/validation.php
new file mode 100644
index 000000000000..77fb5118ddb2
--- /dev/null
+++ b/lang/en/validation.php
@@ -0,0 +1,170 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | as the size rules. Feel free to tweak each of these messages here.
+    |
+    */
+
+    'accepted' => 'The :attribute must be accepted.',
+    'accepted_if' => 'The :attribute must be accepted when :other is :value.',
+    'active_url' => 'The :attribute is not a valid URL.',
+    'after' => 'The :attribute must be a date after :date.',
+    'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+    'alpha' => 'The :attribute must only contain letters.',
+    'alpha_dash' => 'The :attribute must only contain letters, numbers, dashes and underscores.',
+    'alpha_num' => 'The :attribute must only contain letters and numbers.',
+    'array' => 'The :attribute must be an array.',
+    'before' => 'The :attribute must be a date before :date.',
+    'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute must have between :min and :max items.',
+        'file' => 'The :attribute must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute must be between :min and :max.',
+        'string' => 'The :attribute must be between :min and :max characters.',
+    ],
+    'boolean' => 'The :attribute field must be true or false.',
+    'confirmed' => 'The :attribute confirmation does not match.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute is not a valid date.',
+    'date_equals' => 'The :attribute must be a date equal to :date.',
+    'date_format' => 'The :attribute does not match the format :format.',
+    'declined' => 'The :attribute must be declined.',
+    'declined_if' => 'The :attribute must be declined when :other is :value.',
+    'different' => 'The :attribute and :other must be different.',
+    'digits' => 'The :attribute must be :digits digits.',
+    'digits_between' => 'The :attribute must be between :min and :max digits.',
+    'dimensions' => 'The :attribute has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'email' => 'The :attribute must be a valid email address.',
+    'ends_with' => 'The :attribute must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'file' => 'The :attribute must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute must have more than :value items.',
+        'file' => 'The :attribute must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute must be greater than :value.',
+        'string' => 'The :attribute must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute must have :value items or more.',
+        'file' => 'The :attribute must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute must be greater than or equal to :value.',
+        'string' => 'The :attribute must be greater than or equal to :value characters.',
+    ],
+    'image' => 'The :attribute must be an image.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field does not exist in :other.',
+    'integer' => 'The :attribute must be an integer.',
+    'ip' => 'The :attribute must be a valid IP address.',
+    'ipv4' => 'The :attribute must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute must be a valid IPv6 address.',
+    'json' => 'The :attribute must be a valid JSON string.',
+    'lt' => [
+        'array' => 'The :attribute must have less than :value items.',
+        'file' => 'The :attribute must be less than :value kilobytes.',
+        'numeric' => 'The :attribute must be less than :value.',
+        'string' => 'The :attribute must be less than :value characters.',
+    ],
+    'lte' => [
+        'array' => 'The :attribute must not have more than :value items.',
+        'file' => 'The :attribute must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute must be less than or equal to :value.',
+        'string' => 'The :attribute must be less than or equal to :value characters.',
+    ],
+    'mac_address' => 'The :attribute must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute must not have more than :max items.',
+        'file' => 'The :attribute must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute must not be greater than :max.',
+        'string' => 'The :attribute must not be greater than :max characters.',
+    ],
+    'mimes' => 'The :attribute must be a file of type: :values.',
+    'mimetypes' => 'The :attribute must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute must have at least :min items.',
+        'file' => 'The :attribute must be at least :min kilobytes.',
+        'numeric' => 'The :attribute must be at least :min.',
+        'string' => 'The :attribute must be at least :min characters.',
+    ],
+    'multiple_of' => 'The :attribute must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute format is invalid.',
+    'numeric' => 'The :attribute must be a number.',
+    'password' => [
+        'letters' => 'The :attribute must contain at least one letter.',
+        'mixed' => 'The :attribute must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute must contain at least one number.',
+        'symbols' => 'The :attribute must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'present' => 'The :attribute field must be present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
+    'required_without_all' => 'The :attribute field is required when none of :values are present.',
+    'same' => 'The :attribute and :other must match.',
+    'size' => [
+        'array' => 'The :attribute must contain :size items.',
+        'file' => 'The :attribute must be :size kilobytes.',
+        'numeric' => 'The :attribute must be :size.',
+        'string' => 'The :attribute must be :size characters.',
+    ],
+    'starts_with' => 'The :attribute must start with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute may not start with one of the following: :values.',
+    'string' => 'The :attribute must be a string.',
+    'timezone' => 'The :attribute must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'url' => 'The :attribute must be a valid URL.',
+    'uuid' => 'The :attribute must be a valid UUID.',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => [
+        'attribute-name' => [
+            'rule-name' => 'custom-message',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap our attribute placeholder
+    | with something more reader friendly such as "E-Mail Address" instead
+    | of "email". This simply helps us make our message more expressive.
+    |
+    */
+
+    'attributes' => [],
+
+];
diff --git a/resources/lang/en_GB/pagination.php b/lang/en_GB/pagination.php
similarity index 100%
rename from resources/lang/en_GB/pagination.php
rename to lang/en_GB/pagination.php
diff --git a/resources/lang/en_GB/passwords.php b/lang/en_GB/passwords.php
similarity index 100%
rename from resources/lang/en_GB/passwords.php
rename to lang/en_GB/passwords.php
diff --git a/resources/lang/en_GB/reminders.php b/lang/en_GB/reminders.php
similarity index 100%
rename from resources/lang/en_GB/reminders.php
rename to lang/en_GB/reminders.php
diff --git a/resources/lang/en_GB/texts.php b/lang/en_GB/texts.php
similarity index 100%
rename from resources/lang/en_GB/texts.php
rename to lang/en_GB/texts.php
diff --git a/resources/lang/en_GB/validation.php b/lang/en_GB/validation.php
similarity index 100%
rename from resources/lang/en_GB/validation.php
rename to lang/en_GB/validation.php
diff --git a/resources/lang/es/pagination.php b/lang/es/pagination.php
similarity index 100%
rename from resources/lang/es/pagination.php
rename to lang/es/pagination.php
diff --git a/resources/lang/es/reminders.php b/lang/es/reminders.php
similarity index 100%
rename from resources/lang/es/reminders.php
rename to lang/es/reminders.php
diff --git a/resources/lang/es/texts.php b/lang/es/texts.php
similarity index 100%
rename from resources/lang/es/texts.php
rename to lang/es/texts.php
diff --git a/resources/lang/es/validation.php b/lang/es/validation.php
similarity index 100%
rename from resources/lang/es/validation.php
rename to lang/es/validation.php
diff --git a/resources/lang/es_ES/pagination.php b/lang/es_ES/pagination.php
similarity index 100%
rename from resources/lang/es_ES/pagination.php
rename to lang/es_ES/pagination.php
diff --git a/resources/lang/es_ES/reminders.php b/lang/es_ES/reminders.php
similarity index 100%
rename from resources/lang/es_ES/reminders.php
rename to lang/es_ES/reminders.php
diff --git a/resources/lang/es_ES/texts.php b/lang/es_ES/texts.php
similarity index 100%
rename from resources/lang/es_ES/texts.php
rename to lang/es_ES/texts.php
diff --git a/resources/lang/es_ES/validation.php b/lang/es_ES/validation.php
similarity index 100%
rename from resources/lang/es_ES/validation.php
rename to lang/es_ES/validation.php
diff --git a/resources/lang/en/auth.php b/lang/et/auth.php
similarity index 100%
rename from resources/lang/en/auth.php
rename to lang/et/auth.php
diff --git a/resources/lang/et/help.php b/lang/et/help.php
similarity index 100%
rename from resources/lang/et/help.php
rename to lang/et/help.php
diff --git a/resources/lang/et/pagination.php b/lang/et/pagination.php
similarity index 100%
rename from resources/lang/et/pagination.php
rename to lang/et/pagination.php
diff --git a/resources/lang/sr/passwords.php b/lang/et/passwords.php
similarity index 89%
rename from resources/lang/sr/passwords.php
rename to lang/et/passwords.php
index 114cc03b88d0..52c61c69a957 100644
--- a/resources/lang/sr/passwords.php
+++ b/lang/et/passwords.php
@@ -18,6 +18,6 @@ return [
     'sent' => 'We have e-mailed your password reset link!',
     'token' => 'This password reset token is invalid.',
     'user' => "We can't find a user with that e-mail address.",
-    'throttled' => "You have requested password reset recently, please check your email.",
+    'throttled' => 'You have requested password reset recently, please check your email.',
 
 ];
diff --git a/resources/lang/et/t.php b/lang/et/t.php
similarity index 100%
rename from resources/lang/et/t.php
rename to lang/et/t.php
diff --git a/resources/lang/et/texts.php b/lang/et/texts.php
similarity index 100%
rename from resources/lang/et/texts.php
rename to lang/et/texts.php
diff --git a/resources/lang/en/validation.php b/lang/et/validation.php
similarity index 100%
rename from resources/lang/en/validation.php
rename to lang/et/validation.php
diff --git a/resources/lang/et/auth.php b/lang/fa/auth.php
similarity index 100%
rename from resources/lang/et/auth.php
rename to lang/fa/auth.php
diff --git a/resources/lang/fa/help.php b/lang/fa/help.php
similarity index 100%
rename from resources/lang/fa/help.php
rename to lang/fa/help.php
diff --git a/resources/lang/fa/pagination.php b/lang/fa/pagination.php
similarity index 100%
rename from resources/lang/fa/pagination.php
rename to lang/fa/pagination.php
diff --git a/resources/lang/fa/texts.php b/lang/fa/texts.php
similarity index 100%
rename from resources/lang/fa/texts.php
rename to lang/fa/texts.php
diff --git a/resources/lang/et/validation.php b/lang/fa/validation.php
similarity index 100%
rename from resources/lang/et/validation.php
rename to lang/fa/validation.php
diff --git a/resources/lang/fi/auth.php b/lang/fi/auth.php
similarity index 100%
rename from resources/lang/fi/auth.php
rename to lang/fi/auth.php
diff --git a/resources/lang/fi/pagination.php b/lang/fi/pagination.php
similarity index 100%
rename from resources/lang/fi/pagination.php
rename to lang/fi/pagination.php
diff --git a/resources/lang/fi/passwords.php b/lang/fi/passwords.php
similarity index 100%
rename from resources/lang/fi/passwords.php
rename to lang/fi/passwords.php
diff --git a/resources/lang/fi/texts.php b/lang/fi/texts.php
similarity index 100%
rename from resources/lang/fi/texts.php
rename to lang/fi/texts.php
diff --git a/resources/lang/fi/validation.php b/lang/fi/validation.php
similarity index 100%
rename from resources/lang/fi/validation.php
rename to lang/fi/validation.php
diff --git a/resources/lang/fr/pagination.php b/lang/fr/pagination.php
similarity index 100%
rename from resources/lang/fr/pagination.php
rename to lang/fr/pagination.php
diff --git a/resources/lang/fr/reminders.php b/lang/fr/reminders.php
similarity index 100%
rename from resources/lang/fr/reminders.php
rename to lang/fr/reminders.php
diff --git a/resources/lang/fr/texts.php b/lang/fr/texts.php
similarity index 100%
rename from resources/lang/fr/texts.php
rename to lang/fr/texts.php
diff --git a/resources/lang/fr/validation.php b/lang/fr/validation.php
similarity index 100%
rename from resources/lang/fr/validation.php
rename to lang/fr/validation.php
diff --git a/resources/lang/fr_CA/pagination.php b/lang/fr_CA/pagination.php
similarity index 100%
rename from resources/lang/fr_CA/pagination.php
rename to lang/fr_CA/pagination.php
diff --git a/resources/lang/fr_CA/reminders.php b/lang/fr_CA/reminders.php
similarity index 100%
rename from resources/lang/fr_CA/reminders.php
rename to lang/fr_CA/reminders.php
diff --git a/resources/lang/fr_CA/texts.php b/lang/fr_CA/texts.php
similarity index 100%
rename from resources/lang/fr_CA/texts.php
rename to lang/fr_CA/texts.php
diff --git a/resources/lang/fr_CA/validation.php b/lang/fr_CA/validation.php
similarity index 100%
rename from resources/lang/fr_CA/validation.php
rename to lang/fr_CA/validation.php
diff --git a/resources/lang/fa/auth.php b/lang/he/auth.php
similarity index 100%
rename from resources/lang/fa/auth.php
rename to lang/he/auth.php
diff --git a/resources/lang/he/help.php b/lang/he/help.php
similarity index 100%
rename from resources/lang/he/help.php
rename to lang/he/help.php
diff --git a/resources/lang/he/pagination.php b/lang/he/pagination.php
similarity index 100%
rename from resources/lang/he/pagination.php
rename to lang/he/pagination.php
diff --git a/resources/lang/en/passwords.php b/lang/he/passwords.php
similarity index 100%
rename from resources/lang/en/passwords.php
rename to lang/he/passwords.php
diff --git a/resources/lang/he/texts.php b/lang/he/texts.php
similarity index 100%
rename from resources/lang/he/texts.php
rename to lang/he/texts.php
diff --git a/resources/lang/fa/validation.php b/lang/he/validation.php
similarity index 100%
rename from resources/lang/fa/validation.php
rename to lang/he/validation.php
diff --git a/resources/lang/hr/auth.php b/lang/hr/auth.php
similarity index 100%
rename from resources/lang/hr/auth.php
rename to lang/hr/auth.php
diff --git a/resources/lang/hr/pagination.php b/lang/hr/pagination.php
similarity index 100%
rename from resources/lang/hr/pagination.php
rename to lang/hr/pagination.php
diff --git a/resources/lang/hr/passwords.php b/lang/hr/passwords.php
similarity index 100%
rename from resources/lang/hr/passwords.php
rename to lang/hr/passwords.php
diff --git a/resources/lang/hr/texts.php b/lang/hr/texts.php
similarity index 100%
rename from resources/lang/hr/texts.php
rename to lang/hr/texts.php
diff --git a/resources/lang/hr/validation.php b/lang/hr/validation.php
similarity index 100%
rename from resources/lang/hr/validation.php
rename to lang/hr/validation.php
diff --git a/resources/lang/it/pagination.php b/lang/it/pagination.php
similarity index 100%
rename from resources/lang/it/pagination.php
rename to lang/it/pagination.php
diff --git a/resources/lang/it/reminders.php b/lang/it/reminders.php
similarity index 100%
rename from resources/lang/it/reminders.php
rename to lang/it/reminders.php
diff --git a/resources/lang/it/texts.php b/lang/it/texts.php
similarity index 100%
rename from resources/lang/it/texts.php
rename to lang/it/texts.php
diff --git a/resources/lang/it/validation.php b/lang/it/validation.php
similarity index 100%
rename from resources/lang/it/validation.php
rename to lang/it/validation.php
diff --git a/resources/lang/ja/pagination.php b/lang/ja/pagination.php
similarity index 100%
rename from resources/lang/ja/pagination.php
rename to lang/ja/pagination.php
diff --git a/resources/lang/ja/passwords.php b/lang/ja/passwords.php
similarity index 100%
rename from resources/lang/ja/passwords.php
rename to lang/ja/passwords.php
diff --git a/resources/lang/ja/reminders.php b/lang/ja/reminders.php
similarity index 100%
rename from resources/lang/ja/reminders.php
rename to lang/ja/reminders.php
diff --git a/resources/lang/ja/texts.php b/lang/ja/texts.php
similarity index 100%
rename from resources/lang/ja/texts.php
rename to lang/ja/texts.php
diff --git a/resources/lang/ja/validation.php b/lang/ja/validation.php
similarity index 100%
rename from resources/lang/ja/validation.php
rename to lang/ja/validation.php
diff --git a/resources/lang/lt/pagination.php b/lang/lt/pagination.php
similarity index 100%
rename from resources/lang/lt/pagination.php
rename to lang/lt/pagination.php
diff --git a/resources/lang/lt/reminders.php b/lang/lt/reminders.php
similarity index 100%
rename from resources/lang/lt/reminders.php
rename to lang/lt/reminders.php
diff --git a/resources/lang/lt/texts.php b/lang/lt/texts.php
similarity index 100%
rename from resources/lang/lt/texts.php
rename to lang/lt/texts.php
diff --git a/resources/lang/lt/validation.php b/lang/lt/validation.php
similarity index 100%
rename from resources/lang/lt/validation.php
rename to lang/lt/validation.php
diff --git a/resources/lang/he/auth.php b/lang/lv_LV/auth.php
similarity index 100%
rename from resources/lang/he/auth.php
rename to lang/lv_LV/auth.php
diff --git a/resources/lang/lv_LV/help.php b/lang/lv_LV/help.php
similarity index 100%
rename from resources/lang/lv_LV/help.php
rename to lang/lv_LV/help.php
diff --git a/resources/lang/lv_LV/pagination.php b/lang/lv_LV/pagination.php
similarity index 100%
rename from resources/lang/lv_LV/pagination.php
rename to lang/lv_LV/pagination.php
diff --git a/resources/lang/lv_LV/texts.php b/lang/lv_LV/texts.php
similarity index 100%
rename from resources/lang/lv_LV/texts.php
rename to lang/lv_LV/texts.php
diff --git a/resources/lang/he/validation.php b/lang/lv_LV/validation.php
similarity index 100%
rename from resources/lang/he/validation.php
rename to lang/lv_LV/validation.php
diff --git a/resources/lang/mk_MK/auth.php b/lang/mk_MK/auth.php
similarity index 100%
rename from resources/lang/mk_MK/auth.php
rename to lang/mk_MK/auth.php
diff --git a/resources/lang/mk_MK/pagination.php b/lang/mk_MK/pagination.php
similarity index 100%
rename from resources/lang/mk_MK/pagination.php
rename to lang/mk_MK/pagination.php
diff --git a/resources/lang/mk_MK/passwords.php b/lang/mk_MK/passwords.php
similarity index 100%
rename from resources/lang/mk_MK/passwords.php
rename to lang/mk_MK/passwords.php
diff --git a/resources/lang/mk_MK/texts.php b/lang/mk_MK/texts.php
similarity index 100%
rename from resources/lang/mk_MK/texts.php
rename to lang/mk_MK/texts.php
diff --git a/resources/lang/mk_MK/validation.php b/lang/mk_MK/validation.php
similarity index 100%
rename from resources/lang/mk_MK/validation.php
rename to lang/mk_MK/validation.php
diff --git a/resources/lang/nb_NO/pagination.php b/lang/nb_NO/pagination.php
similarity index 100%
rename from resources/lang/nb_NO/pagination.php
rename to lang/nb_NO/pagination.php
diff --git a/resources/lang/nb_NO/reminders.php b/lang/nb_NO/reminders.php
similarity index 100%
rename from resources/lang/nb_NO/reminders.php
rename to lang/nb_NO/reminders.php
diff --git a/resources/lang/nb_NO/texts.php b/lang/nb_NO/texts.php
similarity index 100%
rename from resources/lang/nb_NO/texts.php
rename to lang/nb_NO/texts.php
diff --git a/resources/lang/nb_NO/validation.php b/lang/nb_NO/validation.php
similarity index 100%
rename from resources/lang/nb_NO/validation.php
rename to lang/nb_NO/validation.php
diff --git a/resources/lang/nl/pagination.php b/lang/nl/pagination.php
similarity index 100%
rename from resources/lang/nl/pagination.php
rename to lang/nl/pagination.php
diff --git a/resources/lang/nl/passwords.php b/lang/nl/passwords.php
similarity index 100%
rename from resources/lang/nl/passwords.php
rename to lang/nl/passwords.php
diff --git a/resources/lang/nl/reminders.php b/lang/nl/reminders.php
similarity index 100%
rename from resources/lang/nl/reminders.php
rename to lang/nl/reminders.php
diff --git a/resources/lang/nl/texts.php b/lang/nl/texts.php
similarity index 100%
rename from resources/lang/nl/texts.php
rename to lang/nl/texts.php
diff --git a/resources/lang/nl/validation.php b/lang/nl/validation.php
similarity index 100%
rename from resources/lang/nl/validation.php
rename to lang/nl/validation.php
diff --git a/resources/lang/pl/pagination.php b/lang/pl/pagination.php
similarity index 100%
rename from resources/lang/pl/pagination.php
rename to lang/pl/pagination.php
diff --git a/resources/lang/pl/passwords.php b/lang/pl/passwords.php
similarity index 100%
rename from resources/lang/pl/passwords.php
rename to lang/pl/passwords.php
diff --git a/resources/lang/pl/reminders.php b/lang/pl/reminders.php
similarity index 100%
rename from resources/lang/pl/reminders.php
rename to lang/pl/reminders.php
diff --git a/resources/lang/pl/texts.php b/lang/pl/texts.php
similarity index 100%
rename from resources/lang/pl/texts.php
rename to lang/pl/texts.php
diff --git a/resources/lang/pl/validation.php b/lang/pl/validation.php
similarity index 100%
rename from resources/lang/pl/validation.php
rename to lang/pl/validation.php
diff --git a/resources/lang/pt_BR/pagination.php b/lang/pt_BR/pagination.php
similarity index 84%
rename from resources/lang/pt_BR/pagination.php
rename to lang/pt_BR/pagination.php
index 69dbeb74560e..77424d1f7d5d 100644
--- a/resources/lang/pt_BR/pagination.php
+++ b/lang/pt_BR/pagination.php
@@ -2,7 +2,7 @@
 
 return [
 
-/*
+    /*
 |--------------------------------------------------------------------------
 | Pagination Language Lines
 |--------------------------------------------------------------------------
@@ -13,8 +13,8 @@ return [
 |
 */
 
-'previous' => '&laquo; Anterior',
+    'previous' => '&laquo; Anterior',
 
-'next' => 'Próximo &raquo;',
+    'next' => 'Próximo &raquo;',
 
 ];
diff --git a/resources/lang/pt_BR/passwords.php b/lang/pt_BR/passwords.php
similarity index 100%
rename from resources/lang/pt_BR/passwords.php
rename to lang/pt_BR/passwords.php
diff --git a/resources/lang/pt_BR/reminders.php b/lang/pt_BR/reminders.php
similarity index 59%
rename from resources/lang/pt_BR/reminders.php
rename to lang/pt_BR/reminders.php
index 0e6b063a27cf..686288f601e2 100644
--- a/resources/lang/pt_BR/reminders.php
+++ b/lang/pt_BR/reminders.php
@@ -2,7 +2,7 @@
 
 return [
 
-/*
+    /*
 |--------------------------------------------------------------------------
 | Password Reminder Language Lines
 |--------------------------------------------------------------------------
@@ -13,12 +13,12 @@ return [
 |
 */
 
-'password' => 'Senhas devem possuir no mínimo seis caracteres e devem ser iguais.',
+    'password' => 'Senhas devem possuir no mínimo seis caracteres e devem ser iguais.',
 
-'user' => 'Não foi encontrado um usuário com o endereço de e-mail informado.',
+    'user' => 'Não foi encontrado um usuário com o endereço de e-mail informado.',
 
-'token' => 'Este token de redefinição de senha é inválido.',
+    'token' => 'Este token de redefinição de senha é inválido.',
 
-'sent' => 'Lembrete de senha enviado!',
+    'sent' => 'Lembrete de senha enviado!',
 
 ];
diff --git a/resources/lang/pt_BR/texts.php b/lang/pt_BR/texts.php
similarity index 100%
rename from resources/lang/pt_BR/texts.php
rename to lang/pt_BR/texts.php
diff --git a/lang/pt_BR/validation.php b/lang/pt_BR/validation.php
new file mode 100644
index 000000000000..fc84c5af5f14
--- /dev/null
+++ b/lang/pt_BR/validation.php
@@ -0,0 +1,106 @@
+<?php
+
+return [
+
+    /*
+|--------------------------------------------------------------------------
+| Validation Language Lines
+|--------------------------------------------------------------------------
+|
+| The following language lines contain the default error messages used by
+| the validator class. Some of these rules have multiple versions such
+| such as the size rules. Feel free to tweak each of these messages.
+|
+*/
+
+    'accepted' => ':attribute deve ser aceito.',
+    'active_url' => ':attribute não é uma URL válida.',
+    'after' => ':attribute deve ser uma data maior que :date.',
+    'alpha' => ':attribute deve conter apenas letras.',
+    'alpha_dash' => ':attribute pode conter apenas letras, número e hífens',
+    'alpha_num' => ':attribute pode conter apenas letras e números.',
+    'array' => ':attribute deve ser uma lista.',
+    'before' => ':attribute deve ser uma data anterior a :date.',
+    'between' => [
+        'numeric' => ':attribute deve estar entre :min - :max.',
+        'file' => ':attribute deve estar entre :min - :max kilobytes.',
+        'string' => ':attribute deve estar entre :min - :max caracteres.',
+        'array' => ':attribute deve conter entre :min - :max itens.',
+    ],
+    'confirmed' => ':attribute confirmação não corresponde.',
+    'date' => ':attribute não é uma data válida.',
+    'date_format' => ':attribute não satisfaz o formato :format.',
+    'different' => ':attribute e :other devem ser diferentes.',
+    'digits' => ':attribute deve conter :digits dígitos.',
+    'digits_between' => ':attribute deve conter entre :min e :max dígitos.',
+    'email' => ':attribute está em um formato inválido.',
+    'exists' => 'A opção selecionada :attribute é inválida.',
+    'image' => ':attribute deve ser uma imagem.',
+    'in' => 'A opção selecionada :attribute é inválida.',
+    'integer' => ':attribute deve ser um número inteiro.',
+    'ip' => ':attribute deve ser um endereço IP válido.',
+    'max' => [
+        'numeric' => ':attribute não pode ser maior que :max.',
+        'file' => ':attribute não pode ser maior que :max kilobytes.',
+        'string' => ':attribute não pode ser maior que :max caracteres.',
+        'array' => ':attribute não pode conter mais que :max itens.',
+    ],
+    'mimes' => ':attribute deve ser um arquivo do tipo: :values.',
+    'min' => [
+        'numeric' => ':attribute não deve ser menor que :min.',
+        'file' => ':attribute deve ter no mínimo :min kilobytes.',
+        'string' => ':attribute deve conter no mínimo :min caracteres.',
+        'array' => ':attribute deve conter ao menos :min itens.',
+    ],
+    'not_in' => 'A opção selecionada :attribute é inválida.',
+    'numeric' => ':attribute deve ser um número.',
+    'regex' => ':attribute está em um formato inválido.',
+    'required' => ':attribute é um campo obrigatório.',
+    'required_if' => ':attribute é necessário quando :other é :value.',
+    'required_with' => ':attribute é obrigatório quando :values está presente.',
+    'required_without' => ':attribute é obrigatório quando :values não está presente.',
+    'same' => ':attribute e :other devem corresponder.',
+    'size' => [
+        'numeric' => ':attribute deve ter :size.',
+        'file' => ':attribute deve ter :size kilobytes.',
+        'string' => ':attribute deve conter :size caracteres.',
+        'array' => ':attribute deve conter :size itens.',
+    ],
+    'unique' => ':attribute já está sendo utilizado.',
+    'url' => ':attribute está num formato inválido.',
+
+    'positive' => ':attribute deve ser maior que zero.',
+    'has_credit' => 'O cliente não possui crédito suficiente.',
+    'notmasked' => 'Os valores são mascarados',
+    'less_than' => ':attribute deve ser menor que :value',
+    'has_counter' => 'O valor deve conter {$counter}',
+    'valid_contacts' => 'Todos os contatos devem conter um e-mail ou nome',
+    'valid_invoice_items' => 'Esta fatura excedeu o número mximo de itens',
+
+    /*
+|--------------------------------------------------------------------------
+| Custom Validation Language Lines
+|--------------------------------------------------------------------------
+|
+| Here you may specify custom validation messages for attributes using the
+| convention "attribute.rule" to name the lines. This makes it quick to
+| specify a specific custom language line for a given attribute rule.
+|
+*/
+
+    'custom' => [],
+
+    /*
+|--------------------------------------------------------------------------
+| Custom Validation Attributes
+|--------------------------------------------------------------------------
+|
+| The following language lines are used to swap attribute place-holders
+| with something more reader friendly such as E-Mail Address instead
+| of "email". This simply helps us make messages a little cleaner.
+|
+*/
+
+    'attributes' => [],
+
+];
diff --git a/resources/lang/pt_PT/pagination.php b/lang/pt_PT/pagination.php
similarity index 84%
rename from resources/lang/pt_PT/pagination.php
rename to lang/pt_PT/pagination.php
index 69dbeb74560e..77424d1f7d5d 100644
--- a/resources/lang/pt_PT/pagination.php
+++ b/lang/pt_PT/pagination.php
@@ -2,7 +2,7 @@
 
 return [
 
-/*
+    /*
 |--------------------------------------------------------------------------
 | Pagination Language Lines
 |--------------------------------------------------------------------------
@@ -13,8 +13,8 @@ return [
 |
 */
 
-'previous' => '&laquo; Anterior',
+    'previous' => '&laquo; Anterior',
 
-'next' => 'Próximo &raquo;',
+    'next' => 'Próximo &raquo;',
 
 ];
diff --git a/resources/lang/pt_PT/passwords.php b/lang/pt_PT/passwords.php
similarity index 100%
rename from resources/lang/pt_PT/passwords.php
rename to lang/pt_PT/passwords.php
diff --git a/resources/lang/pt_PT/reminders.php b/lang/pt_PT/reminders.php
similarity index 57%
rename from resources/lang/pt_PT/reminders.php
rename to lang/pt_PT/reminders.php
index eb56381a90b2..3c33807ad480 100644
--- a/resources/lang/pt_PT/reminders.php
+++ b/lang/pt_PT/reminders.php
@@ -2,7 +2,7 @@
 
 return [
 
-/*
+    /*
 |--------------------------------------------------------------------------
 | Password Reminder Language Lines
 |--------------------------------------------------------------------------
@@ -13,12 +13,12 @@ return [
 |
 */
 
-'password' => 'As palavras-passe devem conter no mínimo seis caracteres e devem ser iguais.',
+    'password' => 'As palavras-passe devem conter no mínimo seis caracteres e devem ser iguais.',
 
-'user' => 'Não foi encontrado um utilizador com o endereço de email indicado.',
+    'user' => 'Não foi encontrado um utilizador com o endereço de email indicado.',
 
-'token' => 'Este token de redefinição de palavra-passe é inválido.',
+    'token' => 'Este token de redefinição de palavra-passe é inválido.',
 
-'sent' => 'Lembrete de palavra-passe enviado!',
+    'sent' => 'Lembrete de palavra-passe enviado!',
 
 ];
diff --git a/resources/lang/pt_PT/texts.php b/lang/pt_PT/texts.php
similarity index 100%
rename from resources/lang/pt_PT/texts.php
rename to lang/pt_PT/texts.php
diff --git a/lang/pt_PT/validation.php b/lang/pt_PT/validation.php
new file mode 100644
index 000000000000..ca77fb3cc8b3
--- /dev/null
+++ b/lang/pt_PT/validation.php
@@ -0,0 +1,106 @@
+<?php
+
+return [
+
+    /*
+|--------------------------------------------------------------------------
+| Validation Language Lines
+|--------------------------------------------------------------------------
+|
+| The following language lines contain the default error messages used by
+| the validator class. Some of these rules have multiple versions such
+| such as the size rules. Feel free to tweak each of these messages.
+|
+*/
+
+    'accepted' => ':attribute deve ser aceite.',
+    'active_url' => ':attribute não é um URL válido.',
+    'after' => ':attribute deve ser uma data maior que :date.',
+    'alpha' => ':attribute deve conter apenas letras.',
+    'alpha_dash' => ':attribute pode conter apenas letras, número e hífens',
+    'alpha_num' => ':attribute pode conter apenas letras e números.',
+    'array' => ':attribute deve ser uma lista.',
+    'before' => ':attribute deve ser uma data anterior a :date.',
+    'between' => [
+        'numeric' => ':attribute deve estar entre :min - :max.',
+        'file' => ':attribute deve estar entre :min - :max kilobytes.',
+        'string' => ':attribute deve estar entre :min - :max caracteres.',
+        'array' => ':attribute deve conter entre :min - :max itens.',
+    ],
+    'confirmed' => ':attribute confirmação não corresponde.',
+    'date' => ':attribute não é uma data válida.',
+    'date_format' => ':attribute não satisfaz o formato :format.',
+    'different' => ':attribute e :other devem ser diferentes.',
+    'digits' => ':attribute deve conter :digits dígitos.',
+    'digits_between' => ':attribute deve conter entre :min e :max dígitos.',
+    'email' => ':attribute está em um formato inválido.',
+    'exists' => 'A opção selecionada :attribute é inválida.',
+    'image' => ':attribute deve ser uma imagem.',
+    'in' => 'A opção selecionada :attribute é inválida.',
+    'integer' => ':attribute deve ser um número inteiro.',
+    'ip' => ':attribute deve ser um endereço IP válido.',
+    'max' => [
+        'numeric' => ':attribute não pode ser maior que :max.',
+        'file' => ':attribute não pode ser maior que :max kilobytes.',
+        'string' => ':attribute não pode ser maior que :max caracteres.',
+        'array' => ':attribute não pode conter mais que :max itens.',
+    ],
+    'mimes' => ':attribute deve ser um arquivo do tipo: :values.',
+    'min' => [
+        'numeric' => ':attribute não deve ser menor que :min.',
+        'file' => ':attribute deve ter no mínimo :min kilobytes.',
+        'string' => ':attribute deve conter no mínimo :min caracteres.',
+        'array' => ':attribute deve conter ao menos :min itens.',
+    ],
+    'not_in' => 'A opção selecionada :attribute é inválida.',
+    'numeric' => ':attribute deve ser um número.',
+    'regex' => ':attribute está em um formato inválido.',
+    'required' => ':attribute é um campo obrigatório.',
+    'required_if' => ':attribute é necessário quando :other é :value.',
+    'required_with' => ':attribute é obrigatório quando :values está presente.',
+    'required_without' => ':attribute é obrigatório quando :values não está presente.',
+    'same' => ':attribute e :other devem corresponder.',
+    'size' => [
+        'numeric' => ':attribute deve ter :size.',
+        'file' => ':attribute deve ter :size kilobytes.',
+        'string' => ':attribute deve conter :size caracteres.',
+        'array' => ':attribute deve conter :size itens.',
+    ],
+    'unique' => ':attribute já está sendo utilizado.',
+    'url' => ':attribute está num formato inválido.',
+
+    'positive' => ':attribute deve ser maior que zero.',
+    'has_credit' => 'O cliente não possui crédito suficiente.',
+    'notmasked' => 'Os valores são mascarados',
+    'less_than' => ':attribute deve ser menor que :value',
+    'has_counter' => 'O valor deve conter {$counter}',
+    'valid_contacts' => 'Todos os contatos devem conter um email ou nome',
+    'valid_invoice_items' => 'Esta fatura excedeu o número máximo de itens',
+
+    /*
+|--------------------------------------------------------------------------
+| Custom Validation Language Lines
+|--------------------------------------------------------------------------
+|
+| Here you may specify custom validation messages for attributes using the
+| convention "attribute.rule" to name the lines. This makes it quick to
+| specify a specific custom language line for a given attribute rule.
+|
+*/
+
+    'custom' => [],
+
+    /*
+|--------------------------------------------------------------------------
+| Custom Validation Attributes
+|--------------------------------------------------------------------------
+|
+| The following language lines are used to swap attribute place-holders
+| with something more reader friendly such as E-Mail Address instead
+| of "email". This simply helps us make messages a little cleaner.
+|
+*/
+
+    'attributes' => [],
+
+];
diff --git a/resources/lang/ro/auth.php b/lang/ro/auth.php
similarity index 100%
rename from resources/lang/ro/auth.php
rename to lang/ro/auth.php
diff --git a/resources/lang/ro/pagination.php b/lang/ro/pagination.php
similarity index 100%
rename from resources/lang/ro/pagination.php
rename to lang/ro/pagination.php
diff --git a/resources/lang/ro/passwords.php b/lang/ro/passwords.php
similarity index 100%
rename from resources/lang/ro/passwords.php
rename to lang/ro/passwords.php
diff --git a/resources/lang/ro/texts.php b/lang/ro/texts.php
similarity index 100%
rename from resources/lang/ro/texts.php
rename to lang/ro/texts.php
diff --git a/resources/lang/ro/validation.php b/lang/ro/validation.php
similarity index 100%
rename from resources/lang/ro/validation.php
rename to lang/ro/validation.php
diff --git a/resources/lang/lv_LV/auth.php b/lang/ru_RU/auth.php
similarity index 100%
rename from resources/lang/lv_LV/auth.php
rename to lang/ru_RU/auth.php
diff --git a/resources/lang/ru_RU/help.php b/lang/ru_RU/help.php
similarity index 100%
rename from resources/lang/ru_RU/help.php
rename to lang/ru_RU/help.php
diff --git a/resources/lang/ru_RU/pagination.php b/lang/ru_RU/pagination.php
similarity index 100%
rename from resources/lang/ru_RU/pagination.php
rename to lang/ru_RU/pagination.php
diff --git a/resources/lang/ru_RU/passwords.php b/lang/ru_RU/passwords.php
similarity index 100%
rename from resources/lang/ru_RU/passwords.php
rename to lang/ru_RU/passwords.php
diff --git a/resources/lang/ru_RU/texts.php b/lang/ru_RU/texts.php
similarity index 100%
rename from resources/lang/ru_RU/texts.php
rename to lang/ru_RU/texts.php
diff --git a/resources/lang/lv_LV/validation.php b/lang/ru_RU/validation.php
similarity index 100%
rename from resources/lang/lv_LV/validation.php
rename to lang/ru_RU/validation.php
diff --git a/resources/lang/ru_RU/auth.php b/lang/sk/auth.php
similarity index 100%
rename from resources/lang/ru_RU/auth.php
rename to lang/sk/auth.php
diff --git a/resources/lang/sk/help.php b/lang/sk/help.php
similarity index 100%
rename from resources/lang/sk/help.php
rename to lang/sk/help.php
diff --git a/resources/lang/sk/pagination.php b/lang/sk/pagination.php
similarity index 100%
rename from resources/lang/sk/pagination.php
rename to lang/sk/pagination.php
diff --git a/resources/lang/et/passwords.php b/lang/sk/passwords.php
similarity index 89%
rename from resources/lang/et/passwords.php
rename to lang/sk/passwords.php
index 114cc03b88d0..52c61c69a957 100644
--- a/resources/lang/et/passwords.php
+++ b/lang/sk/passwords.php
@@ -18,6 +18,6 @@ return [
     'sent' => 'We have e-mailed your password reset link!',
     'token' => 'This password reset token is invalid.',
     'user' => "We can't find a user with that e-mail address.",
-    'throttled' => "You have requested password reset recently, please check your email.",
+    'throttled' => 'You have requested password reset recently, please check your email.',
 
 ];
diff --git a/resources/lang/sk/t.php b/lang/sk/t.php
similarity index 100%
rename from resources/lang/sk/t.php
rename to lang/sk/t.php
diff --git a/resources/lang/sk/texts.php b/lang/sk/texts.php
similarity index 100%
rename from resources/lang/sk/texts.php
rename to lang/sk/texts.php
diff --git a/resources/lang/ru_RU/validation.php b/lang/sk/validation.php
similarity index 100%
rename from resources/lang/ru_RU/validation.php
rename to lang/sk/validation.php
diff --git a/resources/lang/sl/auth.php b/lang/sl/auth.php
similarity index 100%
rename from resources/lang/sl/auth.php
rename to lang/sl/auth.php
diff --git a/resources/lang/sl/c3.php b/lang/sl/c3.php
similarity index 100%
rename from resources/lang/sl/c3.php
rename to lang/sl/c3.php
diff --git a/resources/lang/sl/pagination.php b/lang/sl/pagination.php
similarity index 100%
rename from resources/lang/sl/pagination.php
rename to lang/sl/pagination.php
diff --git a/resources/lang/sl/passwords.php b/lang/sl/passwords.php
similarity index 100%
rename from resources/lang/sl/passwords.php
rename to lang/sl/passwords.php
diff --git a/resources/lang/sl/texts.php b/lang/sl/texts.php
similarity index 100%
rename from resources/lang/sl/texts.php
rename to lang/sl/texts.php
diff --git a/resources/lang/sq/auth.php b/lang/sq/auth.php
similarity index 100%
rename from resources/lang/sq/auth.php
rename to lang/sq/auth.php
diff --git a/resources/lang/sq/pagination.php b/lang/sq/pagination.php
similarity index 100%
rename from resources/lang/sq/pagination.php
rename to lang/sq/pagination.php
diff --git a/resources/lang/sq/passwords.php b/lang/sq/passwords.php
similarity index 100%
rename from resources/lang/sq/passwords.php
rename to lang/sq/passwords.php
diff --git a/resources/lang/sq/texts.php b/lang/sq/texts.php
similarity index 100%
rename from resources/lang/sq/texts.php
rename to lang/sq/texts.php
diff --git a/resources/lang/sq/validation.php b/lang/sq/validation.php
similarity index 100%
rename from resources/lang/sq/validation.php
rename to lang/sq/validation.php
diff --git a/resources/lang/sk/auth.php b/lang/sr/auth.php
similarity index 100%
rename from resources/lang/sk/auth.php
rename to lang/sr/auth.php
diff --git a/resources/lang/sr/pagination.php b/lang/sr/pagination.php
similarity index 100%
rename from resources/lang/sr/pagination.php
rename to lang/sr/pagination.php
diff --git a/resources/lang/he/passwords.php b/lang/sr/passwords.php
similarity index 89%
rename from resources/lang/he/passwords.php
rename to lang/sr/passwords.php
index 114cc03b88d0..52c61c69a957 100644
--- a/resources/lang/he/passwords.php
+++ b/lang/sr/passwords.php
@@ -18,6 +18,6 @@ return [
     'sent' => 'We have e-mailed your password reset link!',
     'token' => 'This password reset token is invalid.',
     'user' => "We can't find a user with that e-mail address.",
-    'throttled' => "You have requested password reset recently, please check your email.",
+    'throttled' => 'You have requested password reset recently, please check your email.',
 
 ];
diff --git a/resources/lang/sr/texts.php b/lang/sr/texts.php
similarity index 100%
rename from resources/lang/sr/texts.php
rename to lang/sr/texts.php
diff --git a/resources/lang/sk/validation.php b/lang/sr/validation.php
similarity index 100%
rename from resources/lang/sk/validation.php
rename to lang/sr/validation.php
diff --git a/resources/lang/sv/pagination.php b/lang/sv/pagination.php
similarity index 100%
rename from resources/lang/sv/pagination.php
rename to lang/sv/pagination.php
diff --git a/resources/lang/sv/passwords.php b/lang/sv/passwords.php
similarity index 100%
rename from resources/lang/sv/passwords.php
rename to lang/sv/passwords.php
diff --git a/resources/lang/sv/reminders.php b/lang/sv/reminders.php
similarity index 100%
rename from resources/lang/sv/reminders.php
rename to lang/sv/reminders.php
diff --git a/resources/lang/sv/texts.php b/lang/sv/texts.php
similarity index 100%
rename from resources/lang/sv/texts.php
rename to lang/sv/texts.php
diff --git a/resources/lang/sv/validation.php b/lang/sv/validation.php
similarity index 100%
rename from resources/lang/sv/validation.php
rename to lang/sv/validation.php
diff --git a/resources/lang/th/auth.php b/lang/th/auth.php
similarity index 100%
rename from resources/lang/th/auth.php
rename to lang/th/auth.php
diff --git a/resources/lang/th/pagination.php b/lang/th/pagination.php
similarity index 100%
rename from resources/lang/th/pagination.php
rename to lang/th/pagination.php
diff --git a/resources/lang/th/passwords.php b/lang/th/passwords.php
similarity index 100%
rename from resources/lang/th/passwords.php
rename to lang/th/passwords.php
diff --git a/resources/lang/th/texts.php b/lang/th/texts.php
similarity index 100%
rename from resources/lang/th/texts.php
rename to lang/th/texts.php
diff --git a/resources/lang/th/validation.php b/lang/th/validation.php
similarity index 100%
rename from resources/lang/th/validation.php
rename to lang/th/validation.php
diff --git a/resources/lang/tr_TR/auth.php b/lang/tr_TR/auth.php
similarity index 100%
rename from resources/lang/tr_TR/auth.php
rename to lang/tr_TR/auth.php
diff --git a/resources/lang/tr_TR/pagination.php b/lang/tr_TR/pagination.php
similarity index 100%
rename from resources/lang/tr_TR/pagination.php
rename to lang/tr_TR/pagination.php
diff --git a/resources/lang/tr_TR/passwords.php b/lang/tr_TR/passwords.php
similarity index 100%
rename from resources/lang/tr_TR/passwords.php
rename to lang/tr_TR/passwords.php
diff --git a/resources/lang/tr_TR/texts.php b/lang/tr_TR/texts.php
similarity index 100%
rename from resources/lang/tr_TR/texts.php
rename to lang/tr_TR/texts.php
diff --git a/resources/lang/tr_TR/validation.php b/lang/tr_TR/validation.php
similarity index 100%
rename from resources/lang/tr_TR/validation.php
rename to lang/tr_TR/validation.php
diff --git a/resources/lang/zh_TW/auth.php b/lang/zh_TW/auth.php
similarity index 100%
rename from resources/lang/zh_TW/auth.php
rename to lang/zh_TW/auth.php
diff --git a/resources/lang/zh_TW/pagination.php b/lang/zh_TW/pagination.php
similarity index 100%
rename from resources/lang/zh_TW/pagination.php
rename to lang/zh_TW/pagination.php
diff --git a/resources/lang/zh_TW/passwords.php b/lang/zh_TW/passwords.php
similarity index 100%
rename from resources/lang/zh_TW/passwords.php
rename to lang/zh_TW/passwords.php
diff --git a/resources/lang/zh_TW/texts.php b/lang/zh_TW/texts.php
similarity index 100%
rename from resources/lang/zh_TW/texts.php
rename to lang/zh_TW/texts.php
diff --git a/resources/lang/zh_TW/validation.php b/lang/zh_TW/validation.php
similarity index 100%
rename from resources/lang/zh_TW/validation.php
rename to lang/zh_TW/validation.php
diff --git a/package.json b/package.json
index 04e0df60722a..46d65f0dde42 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     },
     "dependencies": {
         "autoprefixer": "^10.3.7",
-        "axios": "^0.24.0",
+        "axios": "^0.25",
         "card-js": "^1.0.13",
         "card-validator": "^8.1.1",
         "clipboard": "^2.0.10",
diff --git a/psalm.xml b/psalm.xml
index 2c1858a64e00..52f15a658480 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -15,7 +15,8 @@
 
 <issueHandlers>
   <MissingPropertyType errorLevel="suppress" />
-
+  <TypeDoesNotContainNull errorLevel="suppress" />
+  <TypeDoesNotContainType errorLevel="suppress" />
   <UndefinedFunction>
     <errorLevel type="suppress">
       <directory name="app" /> 
diff --git a/public/flutter_service_worker.js b/public/flutter_service_worker.js
index 15fa9a4ec78a..a0cf45a9dd74 100755
--- a/public/flutter_service_worker.js
+++ b/public/flutter_service_worker.js
@@ -7,7 +7,7 @@ const RESOURCES = {
 "canvaskit/profiling/canvaskit.wasm": "95e736ab31147d1b2c7b25f11d4c32cd",
 "canvaskit/canvaskit.js": "c2b4e5f3d7a3d82aed024e7249a78487",
 "canvaskit/canvaskit.wasm": "4b83d89d9fecbea8ca46f2f760c5a9ba",
-"/": "281d0c5f1f79db642cc08a37b86ad866",
+"/": "784b9b59de6c49b2fa8bc36999656d6a",
 "favicon.png": "dca91c54388f52eded692718d5a98b8b",
 "main.dart.js": "819a7e0f760429027b88f15315928b59",
 "manifest.json": "ef43d90e57aa7682d7e2cfba2f484a40",
diff --git a/public/js/clients/invoices/payment.js b/public/js/clients/invoices/payment.js
index a4c3e61899b3..f86a412730c4 100755
--- a/public/js/clients/invoices/payment.js
+++ b/public/js/clients/invoices/payment.js
@@ -1,2 +1,2 @@
 /*! For license information please see payment.js.LICENSE.txt */
-(()=>{function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}var t=function(){function t(e,n){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t),this.shouldDisplayTerms=e,this.shouldDisplaySignature=n,this.termsAccepted=!1,this.submitting=!1}var n,i,a;return n=t,(i=[{key:"handleMethodSelect",value:function(e){var t=this;document.getElementById("company_gateway_id").value=e.dataset.companyGatewayId,document.getElementById("payment_method_id").value=e.dataset.gatewayTypeId,this.shouldDisplaySignature&&!this.shouldDisplayTerms&&(this.signaturePad.isEmpty()&&alert("Please sign"),this.displayTerms(),document.getElementById("accept-terms-button").addEventListener("click",(function(){t.termsAccepted=!0,t.submitForm()}))),!this.shouldDisplaySignature&&this.shouldDisplayTerms&&(this.displaySignature(),document.getElementById("signature-next-step").addEventListener("click",(function(){document.querySelector('input[name="signature"').value=t.signaturePad.toDataURL(),t.submitForm()}))),this.shouldDisplaySignature&&this.shouldDisplayTerms&&(this.displaySignature(),document.getElementById("signature-next-step").addEventListener("click",(function(){t.displayTerms(),document.getElementById("accept-terms-button").addEventListener("click",(function(){document.querySelector('input[name="signature"').value=t.signaturePad.toDataURL(),t.termsAccepted=!0,t.submitForm()}))}))),this.shouldDisplaySignature||this.shouldDisplayTerms||this.submitForm()}},{key:"submitForm",value:function(){this.submitting=!0,document.getElementById("payment-form").submit()}},{key:"displayTerms",value:function(){document.getElementById("displayTermsModal").removeAttribute("style")}},{key:"displaySignature",value:function(){document.getElementById("displaySignatureModal").removeAttribute("style");var e=new SignaturePad(document.getElementById("signature-pad"),{penColor:"rgb(0, 0, 0)"});e.onEnd=function(){document.getElementById("signature-next-step").disabled=!1},this.signaturePad=e}},{key:"handle",value:function(){var e=this;document.getElementById("signature-next-step").disabled=!0,document.querySelectorAll(".dropdown-gateway-button").forEach((function(t){t.addEventListener("click",(function(){e.submitting||e.handleMethodSelect(t)}))}))}}])&&e(n.prototype,i),a&&e(n,a),Object.defineProperty(n,"prototype",{writable:!1}),t}(),n=document.querySelector('meta[name="require-invoice-signature"]').content,i=document.querySelector('meta[name="show-invoice-terms"]').content;new t(Boolean(+n),Boolean(+i)).handle()})();
\ No newline at end of file
+(()=>{function e(e,t){for(var n=0;n<t.length;n++){var i=t[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}var t=function(){function t(e,n){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t),this.shouldDisplayTerms=e,this.shouldDisplaySignature=n,this.termsAccepted=!1,this.submitting=!1}var n,i,a;return n=t,(i=[{key:"handleMethodSelect",value:function(e){var t=this;document.getElementById("company_gateway_id").value=e.dataset.companyGatewayId,document.getElementById("payment_method_id").value=e.dataset.gatewayTypeId,this.shouldDisplaySignature&&!this.shouldDisplayTerms&&(this.signaturePad&&this.signaturePad.isEmpty()&&alert("Please sign"),this.displayTerms(),document.getElementById("accept-terms-button").addEventListener("click",(function(){t.termsAccepted=!0,t.submitForm()}))),!this.shouldDisplaySignature&&this.shouldDisplayTerms&&(this.displaySignature(),document.getElementById("signature-next-step").addEventListener("click",(function(){document.querySelector('input[name="signature"').value=t.signaturePad.toDataURL(),t.submitForm()}))),this.shouldDisplaySignature&&this.shouldDisplayTerms&&(this.displaySignature(),document.getElementById("signature-next-step").addEventListener("click",(function(){t.displayTerms(),document.getElementById("accept-terms-button").addEventListener("click",(function(){document.querySelector('input[name="signature"').value=t.signaturePad.toDataURL(),t.termsAccepted=!0,t.submitForm()}))}))),this.shouldDisplaySignature||this.shouldDisplayTerms||this.submitForm()}},{key:"submitForm",value:function(){this.submitting=!0,document.getElementById("payment-form").submit()}},{key:"displayTerms",value:function(){document.getElementById("displayTermsModal").removeAttribute("style")}},{key:"displaySignature",value:function(){document.getElementById("displaySignatureModal").removeAttribute("style");var e=new SignaturePad(document.getElementById("signature-pad"),{penColor:"rgb(0, 0, 0)"});e.onEnd=function(){document.getElementById("signature-next-step").disabled=!1},this.signaturePad=e}},{key:"handle",value:function(){var e=this;document.getElementById("signature-next-step").disabled=!0,document.querySelectorAll(".dropdown-gateway-button").forEach((function(t){t.addEventListener("click",(function(){e.submitting||e.handleMethodSelect(t)}))}))}}])&&e(n.prototype,i),a&&e(n,a),Object.defineProperty(n,"prototype",{writable:!1}),t}(),n=document.querySelector('meta[name="require-invoice-signature"]').content,i=document.querySelector('meta[name="show-invoice-terms"]').content;new t(Boolean(+n),Boolean(+i)).handle()})();
\ No newline at end of file
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 1e63c46d3185..24ebe3567eee 100755
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -8,7 +8,7 @@
     "/js/clients/invoices/action-selectors.js": "/js/clients/invoices/action-selectors.js?id=d4f86ddee4e8a1d6e9719010aa0fe62b",
     "/js/clients/purchase_orders/action-selectors.js": "/js/clients/purchase_orders/action-selectors.js?id=160b8161599fc2429b449b0970d3ba6c",
     "/js/clients/purchase_orders/accept.js": "/js/clients/purchase_orders/accept.js?id=ddd4aa4069ea79411eeec367b7d5986d",
-    "/js/clients/invoices/payment.js": "/js/clients/invoices/payment.js?id=ada766ace95b727ecdbb6d3a09bf5a8e",
+    "/js/clients/invoices/payment.js": "/js/clients/invoices/payment.js?id=28221de8f1cb37f845ba4ec59bcd8867",
     "/js/clients/payments/stripe-sofort.js": "/js/clients/payments/stripe-sofort.js?id=1c5493a4c53a5b862d07ee1818179ea9",
     "/js/clients/payments/stripe-alipay.js": "/js/clients/payments/stripe-alipay.js?id=0274ab4f8d2b411f2a2fe5142301e7af",
     "/js/clients/payments/checkout-credit-card.js": "/js/clients/payments/checkout-credit-card.js?id=4bd34a0b160f6f29b3096d870ac4d308",
diff --git a/resources/js/clients/invoices/payment.js b/resources/js/clients/invoices/payment.js
index e3096fc2635c..463735982e3b 100644
--- a/resources/js/clients/invoices/payment.js
+++ b/resources/js/clients/invoices/payment.js
@@ -25,7 +25,7 @@ class Payment {
 
         if (this.shouldDisplaySignature && !this.shouldDisplayTerms) {
 
-            if(this.signaturePad.isEmpty())
+            if(this.signaturePad && this.signaturePad.isEmpty())
                 alert("Please sign");
 
             this.displayTerms();
diff --git a/resources/lang/.DS_Store b/resources/lang/.DS_Store
deleted file mode 100644
index bd4eebb4312e..000000000000
Binary files a/resources/lang/.DS_Store and /dev/null differ
diff --git a/resources/lang/pt_BR/validation.php b/resources/lang/pt_BR/validation.php
deleted file mode 100644
index 33b3c73e3bba..000000000000
--- a/resources/lang/pt_BR/validation.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-return [
-
-/*
-|--------------------------------------------------------------------------
-| Validation Language Lines
-|--------------------------------------------------------------------------
-|
-| The following language lines contain the default error messages used by
-| the validator class. Some of these rules have multiple versions such
-| such as the size rules. Feel free to tweak each of these messages.
-|
-*/
-
-'accepted' => ':attribute deve ser aceito.',
-'active_url' => ':attribute não é uma URL válida.',
-'after' => ':attribute deve ser uma data maior que :date.',
-'alpha' => ':attribute deve conter apenas letras.',
-'alpha_dash' => ':attribute pode conter apenas letras, número e hífens',
-'alpha_num' => ':attribute pode conter apenas letras e números.',
-'array' => ':attribute deve ser uma lista.',
-'before' => ':attribute deve ser uma data anterior a :date.',
-'between' => [
-    'numeric' => ':attribute deve estar entre :min - :max.',
-    'file' => ':attribute deve estar entre :min - :max kilobytes.',
-    'string' => ':attribute deve estar entre :min - :max caracteres.',
-    'array' => ':attribute deve conter entre :min - :max itens.',
-    ],
-'confirmed' => ':attribute confirmação não corresponde.',
-'date' => ':attribute não é uma data válida.',
-'date_format' => ':attribute não satisfaz o formato :format.',
-'different' => ':attribute e :other devem ser diferentes.',
-'digits' => ':attribute deve conter :digits dígitos.',
-'digits_between' => ':attribute deve conter entre :min e :max dígitos.',
-'email' => ':attribute está em um formato inválido.',
-'exists' => 'A opção selecionada :attribute é inválida.',
-'image' => ':attribute deve ser uma imagem.',
-'in' => 'A opção selecionada :attribute é inválida.',
-'integer' => ':attribute deve ser um número inteiro.',
-'ip' => ':attribute deve ser um endereço IP válido.',
-'max' => [
-    'numeric' => ':attribute não pode ser maior que :max.',
-    'file' => ':attribute não pode ser maior que :max kilobytes.',
-    'string' => ':attribute não pode ser maior que :max caracteres.',
-    'array' => ':attribute não pode conter mais que :max itens.',
-    ],
-'mimes' => ':attribute deve ser um arquivo do tipo: :values.',
-'min' => [
-    'numeric' => ':attribute não deve ser menor que :min.',
-    'file' => ':attribute deve ter no mínimo :min kilobytes.',
-    'string' => ':attribute deve conter no mínimo :min caracteres.',
-    'array' => ':attribute deve conter ao menos :min itens.',
-    ],
-'not_in' => 'A opção selecionada :attribute é inválida.',
-'numeric' => ':attribute deve ser um número.',
-'regex' => ':attribute está em um formato inválido.',
-'required' => ':attribute é um campo obrigatório.',
-'required_if' => ':attribute é necessário quando :other é :value.',
-'required_with' => ':attribute é obrigatório quando :values está presente.',
-'required_without' => ':attribute é obrigatório quando :values não está presente.',
-'same' => ':attribute e :other devem corresponder.',
-'size' => [
-    'numeric' => ':attribute deve ter :size.',
-    'file' => ':attribute deve ter :size kilobytes.',
-    'string' => ':attribute deve conter :size caracteres.',
-    'array' => ':attribute deve conter :size itens.',
-    ],
-'unique' => ':attribute já está sendo utilizado.',
-'url' => ':attribute está num formato inválido.',
-
-'positive' => ':attribute deve ser maior que zero.',
-'has_credit' => 'O cliente não possui crédito suficiente.',
-'notmasked' => 'Os valores são mascarados',
-'less_than' => ':attribute deve ser menor que :value',
-'has_counter' => 'O valor deve conter {$counter}',
-'valid_contacts' => 'Todos os contatos devem conter um e-mail ou nome',
-'valid_invoice_items' => 'Esta fatura excedeu o número mximo de itens',
-
-/*
-|--------------------------------------------------------------------------
-| Custom Validation Language Lines
-|--------------------------------------------------------------------------
-|
-| Here you may specify custom validation messages for attributes using the
-| convention "attribute.rule" to name the lines. This makes it quick to
-| specify a specific custom language line for a given attribute rule.
-|
-*/
-
-'custom' => [],
-
-/*
-|--------------------------------------------------------------------------
-| Custom Validation Attributes
-|--------------------------------------------------------------------------
-|
-| The following language lines are used to swap attribute place-holders
-| with something more reader friendly such as E-Mail Address instead
-| of "email". This simply helps us make messages a little cleaner.
-|
-*/
-
-'attributes' => [],
-
-];
diff --git a/resources/lang/pt_PT/validation.php b/resources/lang/pt_PT/validation.php
deleted file mode 100644
index 1a741d05b6d3..000000000000
--- a/resources/lang/pt_PT/validation.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-return [
-
-/*
-|--------------------------------------------------------------------------
-| Validation Language Lines
-|--------------------------------------------------------------------------
-|
-| The following language lines contain the default error messages used by
-| the validator class. Some of these rules have multiple versions such
-| such as the size rules. Feel free to tweak each of these messages.
-|
-*/
-
-'accepted' => ':attribute deve ser aceite.',
-'active_url' => ':attribute não é um URL válido.',
-'after' => ':attribute deve ser uma data maior que :date.',
-'alpha' => ':attribute deve conter apenas letras.',
-'alpha_dash' => ':attribute pode conter apenas letras, número e hífens',
-'alpha_num' => ':attribute pode conter apenas letras e números.',
-'array' => ':attribute deve ser uma lista.',
-'before' => ':attribute deve ser uma data anterior a :date.',
-'between' => [
-    'numeric' => ':attribute deve estar entre :min - :max.',
-    'file' => ':attribute deve estar entre :min - :max kilobytes.',
-    'string' => ':attribute deve estar entre :min - :max caracteres.',
-    'array' => ':attribute deve conter entre :min - :max itens.',
-    ],
-'confirmed' => ':attribute confirmação não corresponde.',
-'date' => ':attribute não é uma data válida.',
-'date_format' => ':attribute não satisfaz o formato :format.',
-'different' => ':attribute e :other devem ser diferentes.',
-'digits' => ':attribute deve conter :digits dígitos.',
-'digits_between' => ':attribute deve conter entre :min e :max dígitos.',
-'email' => ':attribute está em um formato inválido.',
-'exists' => 'A opção selecionada :attribute é inválida.',
-'image' => ':attribute deve ser uma imagem.',
-'in' => 'A opção selecionada :attribute é inválida.',
-'integer' => ':attribute deve ser um número inteiro.',
-'ip' => ':attribute deve ser um endereço IP válido.',
-'max' => [
-    'numeric' => ':attribute não pode ser maior que :max.',
-    'file' => ':attribute não pode ser maior que :max kilobytes.',
-    'string' => ':attribute não pode ser maior que :max caracteres.',
-    'array' => ':attribute não pode conter mais que :max itens.',
-    ],
-'mimes' => ':attribute deve ser um arquivo do tipo: :values.',
-'min' => [
-    'numeric' => ':attribute não deve ser menor que :min.',
-    'file' => ':attribute deve ter no mínimo :min kilobytes.',
-    'string' => ':attribute deve conter no mínimo :min caracteres.',
-    'array' => ':attribute deve conter ao menos :min itens.',
-    ],
-'not_in' => 'A opção selecionada :attribute é inválida.',
-'numeric' => ':attribute deve ser um número.',
-'regex' => ':attribute está em um formato inválido.',
-'required' => ':attribute é um campo obrigatório.',
-'required_if' => ':attribute é necessário quando :other é :value.',
-'required_with' => ':attribute é obrigatório quando :values está presente.',
-'required_without' => ':attribute é obrigatório quando :values não está presente.',
-'same' => ':attribute e :other devem corresponder.',
-'size' => [
-    'numeric' => ':attribute deve ter :size.',
-    'file' => ':attribute deve ter :size kilobytes.',
-    'string' => ':attribute deve conter :size caracteres.',
-    'array' => ':attribute deve conter :size itens.',
-    ],
-'unique' => ':attribute já está sendo utilizado.',
-'url' => ':attribute está num formato inválido.',
-
-'positive' => ':attribute deve ser maior que zero.',
-'has_credit' => 'O cliente não possui crédito suficiente.',
-'notmasked' => 'Os valores são mascarados',
-'less_than' => ':attribute deve ser menor que :value',
-'has_counter' => 'O valor deve conter {$counter}',
-'valid_contacts' => 'Todos os contatos devem conter um email ou nome',
-'valid_invoice_items' => 'Esta fatura excedeu o número máximo de itens',
-
-/*
-|--------------------------------------------------------------------------
-| Custom Validation Language Lines
-|--------------------------------------------------------------------------
-|
-| Here you may specify custom validation messages for attributes using the
-| convention "attribute.rule" to name the lines. This makes it quick to
-| specify a specific custom language line for a given attribute rule.
-|
-*/
-
-'custom' => [],
-
-/*
-|--------------------------------------------------------------------------
-| Custom Validation Attributes
-|--------------------------------------------------------------------------
-|
-| The following language lines are used to swap attribute place-holders
-| with something more reader friendly such as E-Mail Address instead
-| of "email". This simply helps us make messages a little cleaner.
-|
-*/
-
-'attributes' => [],
-
-];
diff --git a/resources/lang/sr/validation.php b/resources/lang/sr/validation.php
deleted file mode 100644
index b163c4240e41..000000000000
--- a/resources/lang/sr/validation.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines contain the default error messages used by
-    | the validator class. Some of these rules have multiple versions such
-    | as the size rules. Feel free to tweak each of these messages here.
-    |
-    */
-
-    'accepted'             => 'The :attribute must be accepted.',
-    'active_url'           => 'The :attribute is not a valid URL.',
-    'after'                => 'The :attribute must be a date after :date.',
-    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
-    'alpha'                => 'The :attribute may only contain letters.',
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, dashes and underscores.',
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
-    'array'                => 'The :attribute must be an array.',
-    'before'               => 'The :attribute must be a date before :date.',
-    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
-    'between'              => [
-        'numeric' => 'The :attribute must be between :min and :max.',
-        'file'    => 'The :attribute must be between :min and :max kilobytes.',
-        'string'  => 'The :attribute must be between :min and :max characters.',
-        'array'   => 'The :attribute must have between :min and :max items.',
-    ],
-    'boolean'              => 'The :attribute field must be true or false.',
-    'confirmed'            => 'The :attribute confirmation does not match.',
-    'date'                 => 'The :attribute is not a valid date.',
-    'date_format'          => 'The :attribute does not match the format :format.',
-    'different'            => 'The :attribute and :other must be different.',
-    'digits'               => 'The :attribute must be :digits digits.',
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
-    'dimensions'           => 'The :attribute has invalid image dimensions.',
-    'distinct'             => 'The :attribute field has a duplicate value.',
-    'email'                => 'The :attribute must be a valid email address.',
-    'exists'               => 'The selected :attribute is invalid.',
-    'file'                 => 'The :attribute must be a file.',
-    'filled'               => 'The :attribute field must have a value.',
-    'gt'                   => [
-        'numeric' => 'The :attribute must be greater than :value.',
-        'file'    => 'The :attribute must be greater than :value kilobytes.',
-        'string'  => 'The :attribute must be greater than :value characters.',
-        'array'   => 'The :attribute must have more than :value items.',
-    ],
-    'gte'                  => [
-        'numeric' => 'The :attribute must be greater than or equal :value.',
-        'file'    => 'The :attribute must be greater than or equal :value kilobytes.',
-        'string'  => 'The :attribute must be greater than or equal :value characters.',
-        'array'   => 'The :attribute must have :value items or more.',
-    ],
-    'image'                => 'The :attribute must be an image.',
-    'in'                   => 'The selected :attribute is invalid.',
-    'in_array'             => 'The :attribute field does not exist in :other.',
-    'integer'              => 'The :attribute must be an integer.',
-    'ip'                   => 'The :attribute must be a valid IP address.',
-    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
-    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
-    'json'                 => 'The :attribute must be a valid JSON string.',
-    'lt'                   => [
-        'numeric' => 'The :attribute must be less than :value.',
-        'file'    => 'The :attribute must be less than :value kilobytes.',
-        'string'  => 'The :attribute must be less than :value characters.',
-        'array'   => 'The :attribute must have less than :value items.',
-    ],
-    'lte'                  => [
-        'numeric' => 'The :attribute must be less than or equal :value.',
-        'file'    => 'The :attribute must be less than or equal :value kilobytes.',
-        'string'  => 'The :attribute must be less than or equal :value characters.',
-        'array'   => 'The :attribute must not have more than :value items.',
-    ],
-    'max'                  => [
-        'numeric' => 'The :attribute may not be greater than :max.',
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
-        'string'  => 'The :attribute may not be greater than :max characters.',
-        'array'   => 'The :attribute may not have more than :max items.',
-    ],
-    'mimes'                => 'The :attribute must be a file of type: :values.',
-    'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'min'                  => [
-        'numeric' => 'The :attribute must be at least :min.',
-        'file'    => 'The :attribute must be at least :min kilobytes.',
-        'string'  => 'The :attribute must be at least :min characters.',
-        'array'   => 'The :attribute must have at least :min items.',
-    ],
-    'not_in'               => 'The selected :attribute is invalid.',
-    'not_regex'            => 'The :attribute format is invalid.',
-    'numeric'              => 'The :attribute must be a number.',
-    'present'              => 'The :attribute field must be present.',
-    'regex'                => 'The :attribute format is invalid.',
-    'required'             => 'The :attribute field is required.',
-    'required_if'          => 'The :attribute field is required when :other is :value.',
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
-    'required_with'        => 'The :attribute field is required when :values is present.',
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
-    'required_without'     => 'The :attribute field is required when :values is not present.',
-    'required_without_all' => 'The :attribute field is required when none of :values are present.',
-    'same'                 => 'The :attribute and :other must match.',
-    'size'                 => [
-        'numeric' => 'The :attribute must be :size.',
-        'file'    => 'The :attribute must be :size kilobytes.',
-        'string'  => 'The :attribute must be :size characters.',
-        'array'   => 'The :attribute must contain :size items.',
-    ],
-    'string'               => 'The :attribute must be a string.',
-    'timezone'             => 'The :attribute must be a valid zone.',
-    'unique'               => 'The :attribute has already been taken.',
-    'uploaded'             => 'The :attribute failed to upload.',
-    'url'                  => 'The :attribute format is invalid.',
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify custom validation messages for attributes using the
-    | convention "attribute.rule" to name the lines. This makes it quick to
-    | specify a specific custom language line for a given attribute rule.
-    |
-    */
-
-    'custom' => [
-        'attribute-name' => [
-            'rule-name' => 'custom-message',
-        ],
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Custom Validation Attributes
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used to swap attribute place-holders
-    | with something more reader friendly such as E-Mail Address instead
-    | of "email". This simply helps us make messages a little cleaner.
-    |
-    */
-
-    'attributes' => [],
-
-];
diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php
index 644a663e95d7..f66926c193c2 100644
--- a/resources/views/index/index.blade.php
+++ b/resources/views/index/index.blade.php
@@ -8,10 +8,22 @@
   <meta name="google-signin-client_id" content="{{ config('services.google.client_id') }}">
   <link rel="manifest" href="manifest.json?v={{ config('ninja.app_version') }}">
   <script src="{{ asset('js/pdf.min.js') }}"></script>
+  @if(\App\Utils\Ninja::isHosted())
   <script type="text/javascript" src="https://appleid.cdn-apple.com/appleauth/static/jsapi/appleid/1/en_US/appleid.auth.js"></script>
+  <script type="text/javascript" 
+    src="https://alcdn.msauth.net/browser/2.14.2/js/msal-browser.min.js"
+    integrity="sha384-ggh+EF1aSqm+Y4yvv2n17KpurNcZTeYtUZUvhPziElsstmIEubyEB6AIVpKLuZgr"
+    crossorigin="anonymous">
+  </script>
+  @endif
   <script type="text/javascript">
     pdfjsLib.GlobalWorkerOptions.workerSrc = "{{ asset('js/pdf.worker.min.js') }}";
   </script>
+   <script>
+    window.flutterConfiguration = {
+      canvasKitBaseUrl: "/canvaskit/"
+    };
+  </script>
 </head>
 <body style="background-color:#888888;">
 
@@ -153,12 +165,6 @@
 
   <script defer src="{{ $path }}?v={{ config('ninja.app_version') }}" type="application/javascript"></script>
 
-
-  <script type="text/javascript" 
-    src="https://alcdn.msauth.net/browser/2.14.2/js/msal-browser.min.js"
-    integrity="sha384-ggh+EF1aSqm+Y4yvv2n17KpurNcZTeYtUZUvhPziElsstmIEubyEB6AIVpKLuZgr"
-    crossorigin="anonymous">
-  </script>
   <center style="padding-top: 150px" id="loader">
     <div class="loader"></div>
   </center>
diff --git a/resources/views/portal/ninja2020/components/entity-documents.blade.php b/resources/views/portal/ninja2020/components/entity-documents.blade.php
index efe5e7415db5..b288e9c9209f 100644
--- a/resources/views/portal/ninja2020/components/entity-documents.blade.php
+++ b/resources/views/portal/ninja2020/components/entity-documents.blade.php
@@ -6,9 +6,13 @@
                     <p class="text-lg leading-6 font-medium text-gray-900">{{ ctrans('texts.attachments') }}:</p>
                     @foreach ($entity->documents as $document)
                         <div class="inline-flex items-center space-x-1">
-                            <a href="{{ route('client.documents.show', $document->hashed_id) }}" target="_blank"
+                            @if($entity instanceof App\Models\PurchaseOrder)
+                            <a href="{{ route('vendor.documents.show', $document->hashed_id) }}" target="_blank"
                                 class="block text-sm button-link text-primary">{{ Illuminate\Support\Str::limit($document->name, 40) }}</a>
-
+                            @else
+                            <a href="{{ route('client.documents.show', $document->hashed_id) }}" target="_blank"
+                                class="block text-sm button-link text-primary">{{ Illuminate\Support\Str::limit($document->name, 40) }}</a> 
+                            @endif
                             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none"
                                 stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
                                 class="text-primary h-6 w-4">
@@ -25,9 +29,13 @@
 
                     @foreach ($entity->company->documents as $document)
                         <div class="inline-flex items-center space-x-1">
+                            @if($entity instanceof App\Models\PurchaseOrder)
+                            <a href="{{ route('vendor.documents.show', $document->hashed_id) }}" target="_blank"
+                                class="block text-sm button-link text-primary">{{ Illuminate\Support\Str::limit($document->name, 40) }}</a>
+                            @else
                             <a href="{{ route('client.documents.show', $document->hashed_id) }}" target="_blank"
                                 class="block text-sm button-link text-primary">{{ Illuminate\Support\Str::limit($document->name, 40) }}</a>
-
+                            @endif
                             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none"
                                 stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"
                                 class="text-primary h-6 w-4">
diff --git a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchase.blade.php b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchase.blade.php
index da5fcadbe9be..51c34fd695e1 100644
--- a/resources/views/portal/ninja2020/components/livewire/billing-portal-purchase.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/billing-portal-purchase.blade.php
@@ -20,7 +20,7 @@
                     @foreach($subscription->service()->products() as $product)
                         <div class="flex items-center justify-between mb-4 bg-white rounded px-6 py-4 shadow-sm border">
                             <div>
-                                <p class="text-sm text-gray-800">{{ $product->notes }}</p>
+                                <p class="text-sm text-gray-800">{!! nl2br($product->notes) !!}</p>
                             </div>
                             <div data-ref="price-and-quantity-container">
                                 <span
@@ -40,7 +40,7 @@
 
                     @foreach($subscription->service()->recurring_products() as $product)
                         <div class="flex items-center justify-between mb-4 bg-white rounded px-6 py-4 shadow-sm border">
-                            <div class="text-sm">{!! $product->notes !!}</div>
+                            <div class="text-sm">{!! nl2br($product->notes) !!}</div>
                             <div data-ref="price-and-quantity-container">
                                 <span
                                     data-ref="price">{{ \App\Utils\Number::formatMoney($product->price, $subscription->company) }}</span>
diff --git a/resources/views/portal/ninja2020/components/livewire/payment-methods-table.blade.php b/resources/views/portal/ninja2020/components/livewire/payment-methods-table.blade.php
index 0faa5f515c48..0a7ff18fea53 100644
--- a/resources/views/portal/ninja2020/components/livewire/payment-methods-table.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/payment-methods-table.blade.php
@@ -70,7 +70,7 @@
                             {{ App\Models\GatewayType::getAlias($payment_method->gateway_type_id) }}
                         </td>
                         <td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500">
-                            {{ ucfirst(optional($payment_method->meta)->brand) }}
+                            {{ property_exists($payment_method->meta, 'brand') ? ucfirst($payment_method->meta?->brand) : '' }}
                         </td>
                         <td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500">
                             @if(isset($payment_method->meta->exp_month) && isset($payment_method->meta->exp_year))
diff --git a/resources/views/portal/ninja2020/components/livewire/tasks-table.blade.php b/resources/views/portal/ninja2020/components/livewire/tasks-table.blade.php
index cdb5df1d5efb..30e3b7b0e5d9 100644
--- a/resources/views/portal/ninja2020/components/livewire/tasks-table.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/tasks-table.blade.php
@@ -44,10 +44,10 @@
                             {{ \Illuminate\Support\Str::limit($task->description, 80) }}
                         </td>
                         <td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500">
-                            {{ optional($task->project)->name }}
+                            {{ $task->project?->name }}
                         </td>
                         <td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500">
-                            {{ optional($task->status)->name }}
+                            {{ $task->status?->name }}
                         </td>
                         <td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500">
                             {{ \Carbon\CarbonInterval::seconds($task->calcDuration())->cascade()->forHumans() }}
diff --git a/resources/views/portal/ninja2020/components/primary-color.blade.php b/resources/views/portal/ninja2020/components/primary-color.blade.php
index 550e2a8e8b48..d718edf2cd12 100644
--- a/resources/views/portal/ninja2020/components/primary-color.blade.php
+++ b/resources/views/portal/ninja2020/components/primary-color.blade.php
@@ -1,6 +1,6 @@
 <style>
     :root {
-        --primary-color: {{ isset($settings) ? optional($settings)->primary_color : '#1c64f2' }};
+        --primary-color: {{ isset($settings) ? $settings?->primary_color : '#1c64f2' }};
     }
 
     .bg-primary {
diff --git a/resources/views/portal/ninja2020/documents/vendor_show.blade.php b/resources/views/portal/ninja2020/documents/vendor_show.blade.php
new file mode 100644
index 000000000000..8fd433235af1
--- /dev/null
+++ b/resources/views/portal/ninja2020/documents/vendor_show.blade.php
@@ -0,0 +1,95 @@
+@extends('portal.ninja2020.layout.vendor_app')
+@section('meta_title', ctrans('texts.document'))
+
+@section('body')
+<div class="container mx-auto">
+    <div class="grid grid-cols-12">
+        <div class="col-span-12 lg:col-span-7 lg:col-start-3">
+            <div class="bg-white shadow overflow-hidden sm:rounded-lg">
+                <div class="px-4 py-5 border-b border-gray-200 sm:px-6">
+                    <h3 class="text-lg leading-6 font-medium text-gray-900">
+                        {{ ctrans('texts.document') }}
+                    </h3>
+                    <p class="mt-1 max-w-2xl text-sm leading-5 text-gray-500">
+                        {{ ctrans('texts.document_details') }}
+                    </p>
+                </div>
+                <div>
+                    <dl>
+                        <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                            <dt class="text-sm leading-5 font-medium text-gray-500">
+                                {{ ctrans('texts.name') }}
+                            </dt>
+                            <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2 flex items-center">
+                                {{ Illuminate\Support\Str::limit($document->name, 40) }}
+                            </dd>
+                        </div>
+                        <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                            <dt class="text-sm leading-5 font-medium text-gray-500">
+                                {{ ctrans('texts.type') }}
+                            </dt>
+                            <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                                {{ App\Models\Document::$types[$document->type]['mime'] }}
+                            </dd>
+                        </div>
+                        <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                            <dt class="text-sm leading-5 font-medium text-gray-500">
+                                {{ ctrans('texts.hash') }}
+                            </dt>
+                            <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                                {{ $document->hash }}
+                            </dd>
+                        </div>
+                        <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                            <dt class="text-sm leading-5 font-medium text-gray-500">
+                                {{ ctrans('texts.size') }}
+                            </dt>
+                            <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                                {{ $document->size / 1000 }} kB
+                            </dd>
+                        </div>
+                        <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                            <dt class="text-sm leading-5 font-medium text-gray-500">
+                                {{ ctrans('texts.width') }}
+                            </dt>
+                            <div class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                                {{ $document->width }}px
+                            </div>
+                        </div>
+                        <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                            <dt class="text-sm leading-5 font-medium text-gray-500">
+                                {{ ctrans('texts.height') }}
+                            </dt>
+                            <div class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
+                                {{ $document->height }}px
+                            </div>
+                        </div>
+                    </dl>
+                </div>
+            </div>
+
+            <div class="flex justify-end my-4">
+                <a href="{{ route('vendor.documents.download', $document->hashed_id) }}" class="button button-link bg-link text-gray-900 inline-flex items-center" download>
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-download-cloud">
+                        <polyline points="8 17 12 21 16 17"></polyline>
+                        <line x1="12" y1="12" x2="12" y2="21"></line>
+                        <path d="M20.88 18.09A5 5 0 0 0 18 9h-1.26A8 8 0 1 0 3 16.29"></path>
+                    </svg>
+
+                    <span class="ml-2">{{ ctrans('texts.download') }}</span>
+                </a>
+
+                <a href="{{ $document->generateUrl() }}" target="_blank" class="button button-primary bg-primary text-white inline-flex items-center">
+                    <svg xmlns="http://www.w3.org/2000/svg"  width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather">
+                        <path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path>
+                        <polyline points="15 3 21 3 21 9"></polyline>
+                        <line x1="10" y1="14" x2="21" y2="3"></line>
+                    </svg>
+
+                    <span class="ml-2">{{ ctrans('texts.open_in_new_tab') }}</span>
+                </a>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/portal/ninja2020/gateways/authorize/credit_card/pay.blade.php b/resources/views/portal/ninja2020/gateways/authorize/credit_card/pay.blade.php
index 486d045a33b3..a031130225f6 100644
--- a/resources/views/portal/ninja2020/gateways/authorize/credit_card/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/authorize/credit_card/pay.blade.php
@@ -41,7 +41,7 @@
                         data-token="{{ $token->hashed_id }}"
                         name="payment-type"
                         class="form-radio cursor-pointer toggle-payment-with-token"/>
-                    <span class="ml-1 cursor-pointer">**** {{ optional($token->meta)->last4 }}</span>
+                    <span class="ml-1 cursor-pointer">**** {{ $token->meta?->last4 }}</span>
                 </label>
             @endforeach
         @endisset
diff --git a/resources/views/portal/ninja2020/gateways/braintree/credit_card/pay.blade.php b/resources/views/portal/ninja2020/gateways/braintree/credit_card/pay.blade.php
index ea775a3016b3..c09226a95c20 100644
--- a/resources/views/portal/ninja2020/gateways/braintree/credit_card/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/braintree/credit_card/pay.blade.php
@@ -43,7 +43,7 @@
                         data-token="{{ $token->token }}"
                         name="payment-type"
                         class="form-radio cursor-pointer toggle-payment-with-token"/>
-                    <span class="ml-1 cursor-pointer">**** {{ optional($token->meta)->last4 }}</span>
+                    <span class="ml-1 cursor-pointer">**** {{ $token->meta?->last4 }}</span>
                 </label>
             @endforeach
         @endisset
diff --git a/resources/views/portal/ninja2020/gateways/braintree/paypal/pay.blade.php b/resources/views/portal/ninja2020/gateways/braintree/paypal/pay.blade.php
index 140ba3297339..cb967a2e6f5e 100644
--- a/resources/views/portal/ninja2020/gateways/braintree/paypal/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/braintree/paypal/pay.blade.php
@@ -39,7 +39,7 @@
                         data-token="{{ $token->token }}"
                         name="payment-type"
                         class="form-radio cursor-pointer toggle-payment-with-token"/>
-                    <span class="ml-1 cursor-pointer">{{ optional($token->meta)->email }}</span>
+                    <span class="ml-1 cursor-pointer">{{ property_exists($token->meta, 'email') ? $token->meta?->email : 'no email provided'}}</span>
                 </label>
             @endforeach
         @endisset
diff --git a/resources/views/portal/ninja2020/gateways/checkout/credit_card/pay.blade.php b/resources/views/portal/ninja2020/gateways/checkout/credit_card/pay.blade.php
index 4ac991261daa..acfe8c6921f7 100644
--- a/resources/views/portal/ninja2020/gateways/checkout/credit_card/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/checkout/credit_card/pay.blade.php
@@ -43,7 +43,7 @@
                         data-token="{{ $token->hashed_id }}"
                         name="payment-type"
                         class="form-radio cursor-pointer toggle-payment-with-token"/>
-                    <span class="ml-1 cursor-pointer">**** {{ optional($token->meta)->last4 }}</span>
+                    <span class="ml-1 cursor-pointer">**** {{ $token->meta?->last4 }}</span>
                 </label>
             @endforeach
         @endisset
diff --git a/resources/views/portal/ninja2020/gateways/eway/pay.blade.php b/resources/views/portal/ninja2020/gateways/eway/pay.blade.php
index a6b6aef31eab..fd4ce3573ab1 100644
--- a/resources/views/portal/ninja2020/gateways/eway/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/eway/pay.blade.php
@@ -35,7 +35,7 @@ ctrans('texts.credit_card')])
                 <label class="mr-4">
                     <input type="radio" data-token="{{ $token->token }}" name="payment-type"
                         class="form-radio cursor-pointer toggle-payment-with-token" />
-                    <span class="ml-1 cursor-pointer">**** {{ optional($token->meta)->last4 }}</span>
+                    <span class="ml-1 cursor-pointer">**** {{ $token->meta?->last4 }}</span>
                 </label>
             @endforeach
         @endisset
diff --git a/resources/views/portal/ninja2020/gateways/mollie/credit_card/pay.blade.php b/resources/views/portal/ninja2020/gateways/mollie/credit_card/pay.blade.php
index 5eebdca2f304..3b471f5ce119 100644
--- a/resources/views/portal/ninja2020/gateways/mollie/credit_card/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/mollie/credit_card/pay.blade.php
@@ -38,7 +38,7 @@ ctrans('texts.credit_card')])
                 <label class="mr-4">
                     <input type="radio" data-token="{{ $token->token }}" name="payment-type"
                         class="form-radio cursor-pointer toggle-payment-with-token" />
-                    <span class="ml-1 cursor-pointer">**** {{ optional($token->meta)->last4 }}</span>
+                    <span class="ml-1 cursor-pointer">**** {{ $token->meta?->last4 }}</span>
                 </label>
             @endforeach
         @endif
diff --git a/resources/views/portal/ninja2020/gateways/payfast/pay.blade.php b/resources/views/portal/ninja2020/gateways/payfast/pay.blade.php
index 5ed26bd27460..742622dff8a5 100644
--- a/resources/views/portal/ninja2020/gateways/payfast/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/payfast/pay.blade.php
@@ -36,7 +36,7 @@
                         data-token="{{ $token->token }}"
                         name="payment-type"
                         class="form-radio cursor-pointer toggle-payment-with-token"/>
-                    <span class="ml-1 cursor-pointer">**** {{ optional($token->meta)->last4 }}</span>
+                    <span class="ml-1 cursor-pointer">**** {{ $token->meta?->last4 }}</span>
                 </label>
             @endforeach
         @endisset
diff --git a/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php b/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php
index 0be3196b76b2..6d2933188b07 100644
--- a/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/paytrace/pay.blade.php
@@ -35,7 +35,7 @@
                 <label class="mr-4">
                     <input type="radio" data-token="{{ $token->hashed_id }}" name="payment-type"
                         class="form-radio cursor-pointer toggle-payment-with-token" />
-                    <span class="ml-1 cursor-pointer">{{ optional($token->meta)->last4 }}</span>
+                    <span class="ml-1 cursor-pointer">{{ $token->meta?->last4 }}</span>
                 </label>
             @endforeach
         @endisset
diff --git a/resources/views/portal/ninja2020/gateways/square/credit_card/pay.blade.php b/resources/views/portal/ninja2020/gateways/square/credit_card/pay.blade.php
index df3965b1a456..79b2627db1ea 100644
--- a/resources/views/portal/ninja2020/gateways/square/credit_card/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/square/credit_card/pay.blade.php
@@ -40,7 +40,7 @@
                 <label class="mr-4">
                     <input type="radio" data-token="{{ $token->token }}" name="payment-type"
                         class="form-radio cursor-pointer toggle-payment-with-token" />
-                    <span class="ml-1 cursor-pointer">**** {{ optional($token->meta)->last4 }}</span>
+                    <span class="ml-1 cursor-pointer">**** {{ $token->meta?->last4 }}</span>
                 </label>
             @endforeach
         @endisset
diff --git a/resources/views/portal/ninja2020/gateways/stripe/credit_card/pay.blade.php b/resources/views/portal/ninja2020/gateways/stripe/credit_card/pay.blade.php
index 8508977d1f48..a20313b7899d 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/credit_card/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/credit_card/pay.blade.php
@@ -57,7 +57,7 @@
                         data-token="{{ $token->token }}"
                         name="payment-type"
                         class="form-check-input text-indigo-600 rounded-full cursor-pointer toggle-payment-with-token toggle-payment-with-token"/>
-                    <span class="ml-1 cursor-pointer">**** {{ optional($token->meta)->last4 }}</span>
+                    <span class="ml-1 cursor-pointer">**** {{ $token->meta?->last4 }}</span>
                 </label>
             </li>
             @endforeach
diff --git a/resources/views/portal/ninja2020/gateways/stripe/sepa/pay.blade.php b/resources/views/portal/ninja2020/gateways/stripe/sepa/pay.blade.php
index 8fb3a7e1b8bd..1b73c9970cf2 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/sepa/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/sepa/pay.blade.php
@@ -45,7 +45,7 @@
                 <label class="mr-4">
                     <input type="radio" data-token="{{ $token->token }}" name="payment-type"
                         class="form-radio cursor-pointer toggle-payment-with-token" />
-                    <span class="ml-1 cursor-pointer">**** {{ optional($token->meta)->last4 }}</span>
+                    <span class="ml-1 cursor-pointer">**** {{ $token->meta?->last4 }}</span>
                 </label>
             @endforeach
         @endisset
diff --git a/resources/views/portal/ninja2020/gateways/wepay/credit_card/pay.blade.php b/resources/views/portal/ninja2020/gateways/wepay/credit_card/pay.blade.php
index 71cf7c91975e..88e91f1cb17e 100644
--- a/resources/views/portal/ninja2020/gateways/wepay/credit_card/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/wepay/credit_card/pay.blade.php
@@ -47,7 +47,7 @@
                         data-token="{{ $token->token }}"
                         name="payment-type"
                         class="form-radio cursor-pointer toggle-payment-with-token"/>
-                    <span class="ml-1 cursor-pointer">**** {{ optional($token->meta)->last4 }}</span>
+                    <span class="ml-1 cursor-pointer">**** {{ $token->meta?->last4 }}</span>
                 </label>
             @endforeach
         @endisset
diff --git a/resources/views/portal/ninja2020/payment_methods/show.blade.php b/resources/views/portal/ninja2020/payment_methods/show.blade.php
index 81d787efab17..f928bfbd530f 100644
--- a/resources/views/portal/ninja2020/payment_methods/show.blade.php
+++ b/resources/views/portal/ninja2020/payment_methods/show.blade.php
@@ -31,8 +31,8 @@
                                 {{ ctrans('texts.type') }}
                             </dt>
                             <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                                {{ optional($payment_method->meta)->brand }}
-                                {{ optional($payment_method->meta)->scheme }}
+                                {{ $payment_method->meta?->brand }}
+                                {{ property_exists($payment_method->meta, 'scheme') ? $payment_method->meta?->scheme : '' }}
                             </dd>
                         </div>
                     @endif
@@ -84,7 +84,7 @@
             </div>
         </div>
 
-        @if((optional($payment_method->meta)->state === 'unauthorized' || optional($payment_method->meta)->state === 'pending')  && $payment_method->gateway_type_id === \App\Models\GatewayType::BANK_TRANSFER)
+        @if(($payment_method->gateway_type_id == \App\Models\GatewayType::BANK_TRANSFER && property_exists($payment_method->meta, 'state') && ($payment_method->meta?->state === 'unauthorized' || $payment_method->meta?->state === 'pending')))
             <div class="mt-4 mb-4 bg-white shadow sm:rounded-lg">
                 <div class="px-4 py-5 sm:p-6">
                     <div class="sm:flex sm:items-start sm:justify-between">
diff --git a/resources/views/portal/ninja2020/payments/show.blade.php b/resources/views/portal/ninja2020/payments/show.blade.php
index f391cffe8199..86f67bafb354 100644
--- a/resources/views/portal/ninja2020/payments/show.blade.php
+++ b/resources/views/portal/ninja2020/payments/show.blade.php
@@ -49,13 +49,13 @@
                         </div>
                     @endif
 
-                    @if(!empty(optional($payment->type)->name) && !is_null(optional($payment->type)->name))
+                    @if(!empty($payment->type?->name) && !is_null($payment->type?->name))
                         <div class="px-4 py-5 bg-white sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
                             <dt class="text-sm font-medium leading-5 text-gray-500">
                                 {{ ctrans('texts.method') }}
                             </dt>
                             <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                                {{ optional($payment->type)->name }}
+                                {{ $payment->type?->name }}
                             </dd>
                         </div>
                     @endif
diff --git a/resources/views/portal/ninja2020/recurring_invoices/show.blade.php b/resources/views/portal/ninja2020/recurring_invoices/show.blade.php
index 5e9189751382..f88d93602cdd 100644
--- a/resources/views/portal/ninja2020/recurring_invoices/show.blade.php
+++ b/resources/views/portal/ninja2020/recurring_invoices/show.blade.php
@@ -76,7 +76,7 @@
             </div>
         @endif
 
-        @if($invoice->subscription && optional($invoice->subscription)->allow_cancellation)
+        @if($invoice->subscription && $invoice->subscription?->allow_cancellation)
         {{-- INV2-591 --}}
         {{-- @if(false) --}}
         <div class="bg-white shadow sm:rounded-lg mt-4">
diff --git a/routes/api.php b/routes/api.php
index 5954c7b9028d..41a10a732eeb 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -10,258 +10,340 @@
 | is assigned the "api" middleware group. Enjoy building your API!
 |
 */
-
+use App\Http\Controllers\AccountController;
+use App\Http\Controllers\ActivityController;
+use App\Http\Controllers\Auth\ForgotPasswordController;
+use App\Http\Controllers\Auth\LoginController;
+use App\Http\Controllers\BaseController;
+use App\Http\Controllers\ChartController;
+use App\Http\Controllers\ClientController;
+use App\Http\Controllers\ClientGatewayTokenController;
+use App\Http\Controllers\ClientStatementController;
+use App\Http\Controllers\CompanyController;
+use App\Http\Controllers\CompanyGatewayController;
+use App\Http\Controllers\CompanyLedgerController;
+use App\Http\Controllers\CompanyUserController;
+use App\Http\Controllers\ConnectedAccountController;
+use App\Http\Controllers\CreditController;
+use App\Http\Controllers\DesignController;
+use App\Http\Controllers\DocumentController;
+use App\Http\Controllers\EmailController;
+use App\Http\Controllers\ExpenseCategoryController;
+use App\Http\Controllers\ExpenseController;
+use App\Http\Controllers\ExportController;
+use App\Http\Controllers\FilterController;
+use App\Http\Controllers\GroupSettingController;
+use App\Http\Controllers\HostedMigrationController;
+use App\Http\Controllers\ImportController;
+use App\Http\Controllers\ImportJsonController;
+use App\Http\Controllers\InAppPurchase\AppleController;
+use App\Http\Controllers\InvoiceController;
+use App\Http\Controllers\LicenseController;
+use App\Http\Controllers\LogoutController;
+use App\Http\Controllers\MigrationController;
+use App\Http\Controllers\OneTimeTokenController;
+use App\Http\Controllers\PaymentController;
+use App\Http\Controllers\PaymentNotificationWebhookController;
+use App\Http\Controllers\PaymentTermController;
+use App\Http\Controllers\PaymentWebhookController;
+use App\Http\Controllers\PingController;
+use App\Http\Controllers\PostMarkController;
+use App\Http\Controllers\PreviewController;
+use App\Http\Controllers\PreviewPurchaseOrderController;
+use App\Http\Controllers\ProductController;
+use App\Http\Controllers\ProjectController;
+use App\Http\Controllers\PurchaseOrderController;
+use App\Http\Controllers\QuoteController;
+use App\Http\Controllers\RecurringExpenseController;
+use App\Http\Controllers\RecurringInvoiceController;
+use App\Http\Controllers\RecurringQuoteController;
+use App\Http\Controllers\Reports\ClientContactReportController;
+use App\Http\Controllers\Reports\ClientReportController;
+use App\Http\Controllers\Reports\CreditReportController;
+use App\Http\Controllers\Reports\DocumentReportController;
+use App\Http\Controllers\Reports\ExpenseReportController;
+use App\Http\Controllers\Reports\InvoiceItemReportController;
+use App\Http\Controllers\Reports\InvoiceReportController;
+use App\Http\Controllers\Reports\PaymentReportController;
+use App\Http\Controllers\Reports\ProductReportController;
+use App\Http\Controllers\Reports\ProfitAndLossController;
+use App\Http\Controllers\Reports\QuoteItemReportController;
+use App\Http\Controllers\Reports\QuoteReportController;
+use App\Http\Controllers\Reports\RecurringInvoiceReportController;
+use App\Http\Controllers\Reports\TaskReportController;
+use App\Http\Controllers\SchedulerController;
+use App\Http\Controllers\SelfUpdateController;
+use App\Http\Controllers\StaticController;
+use App\Http\Controllers\StripeController;
+use App\Http\Controllers\SubdomainController;
+use App\Http\Controllers\SubscriptionController;
+use App\Http\Controllers\Support\Messages\SendingController;
+use App\Http\Controllers\SystemLogController;
+use App\Http\Controllers\TaskController;
+use App\Http\Controllers\TaskSchedulerController;
+use App\Http\Controllers\TaskStatusController;
+use App\Http\Controllers\TaxRateController;
+use App\Http\Controllers\TemplateController;
+use App\Http\Controllers\TokenController;
+use App\Http\Controllers\TwilioController;
+use App\Http\Controllers\TwoFactorController;
+use App\Http\Controllers\UserController;
+use App\Http\Controllers\VendorController;
+use App\Http\Controllers\WebCronController;
+use App\Http\Controllers\WebhookController;
 use Illuminate\Support\Facades\Route;
 
 Route::group(['middleware' => ['throttle:300,1', 'api_secret_check']], function () {
-    Route::post('api/v1/signup', 'AccountController@store')->name('signup.submit');
-    Route::post('api/v1/oauth_login', 'Auth\LoginController@oauthApiLogin');
+    Route::post('api/v1/signup', [AccountController::class, 'store'])->name('signup.submit');
+    Route::post('api/v1/oauth_login', [LoginController::class, 'oauthApiLogin']);
 });
 
 Route::group(['middleware' => ['throttle:10,1','api_secret_check','email_db']], function () {
-    Route::post('api/v1/login', 'Auth\LoginController@apiLogin')->name('login.submit')->middleware('throttle:20,1');;
-    Route::post('api/v1/reset_password', 'Auth\ForgotPasswordController@sendResetLinkEmail');
+    Route::post('api/v1/login', [LoginController::class, 'apiLogin'])->name('login.submit')->middleware('throttle:20,1');
+    Route::post('api/v1/reset_password', [ForgotPasswordController::class, 'sendResetLinkEmail']);
 });
 
-Route::group(['middleware' => ['throttle:100,1', 'api_db', 'token_auth', 'locale'], 'prefix' => 'api/v1', 'as' => 'api.'], function () {
-    Route::put('accounts/{account}', 'AccountController@update')->name('account.update');
-    Route::post('check_subdomain', 'SubdomainController@index')->name('check_subdomain');
-    Route::get('ping', 'PingController@index')->name('ping');
-    Route::get('health_check', 'PingController@health')->name('health_check');
+Route::group(['middleware' => ['throttle:300,1', 'api_db', 'token_auth', 'locale'], 'prefix' => 'api/v1', 'as' => 'api.'], function () {
+    Route::put('accounts/{account}', [AccountController::class, 'update'])->name('account.update');
+    Route::post('check_subdomain', [SubdomainController::class, 'index'])->name('check_subdomain');
+    Route::get('ping', [PingController::class, 'index'])->name('ping');
+    Route::get('health_check', [PingController::class, 'health'])->name('health_check');
 
-    Route::get('activities', 'ActivityController@index');
-    Route::get('activities/download_entity/{activity}', 'ActivityController@downloadHistoricalEntity');
+    Route::get('activities', [ActivityController::class, 'index']);
+    Route::get('activities/download_entity/{activity}', [ActivityController::class, 'downloadHistoricalEntity']);
 
 
-    Route::post('charts/totals', 'ChartController@totals')->name('chart.totals');
-    Route::post('charts/chart_summary', 'ChartController@chart_summary')->name('chart.chart_summary');
+    Route::post('charts/totals', [ChartController::class, 'totals'])->name('chart.totals');
+    Route::post('charts/chart_summary', [ChartController::class, 'chart_summary'])->name('chart.chart_summary');
 
-    Route::post('claim_license', 'LicenseController@index')->name('license.index');
+    Route::post('claim_license', [LicenseController::class, 'index'])->name('license.index');
 
-    Route::resource('clients', 'ClientController'); // name = (clients. index / create / show / update / destroy / edit
-    Route::put('clients/{client}/adjust_ledger', 'ClientController@adjustLedger')->name('clients.adjust_ledger');
-    Route::put('clients/{client}/upload', 'ClientController@upload')->name('clients.upload');
-    Route::post('clients/{client}/purge', 'ClientController@purge')->name('clients.purge')->middleware('password_protected');
-    Route::post('clients/{client}/{mergeable_client}/merge', 'ClientController@merge')->name('clients.merge')->middleware('password_protected');
-    Route::post('clients/bulk', 'ClientController@bulk')->name('clients.bulk');
+    Route::resource('clients', ClientController::class); // name = (clients. index / create / show / update / destroy / edit
+    Route::put('clients/{client}/adjust_ledger', [ClientController::class, 'adjustLedger'])->name('clients.adjust_ledger');
+    Route::put('clients/{client}/upload', [ClientController::class, 'upload'])->name('clients.upload');
+    Route::post('clients/{client}/purge', [ClientController::class, 'purge'])->name('clients.purge')->middleware('password_protected');
+    Route::post('clients/{client}/{mergeable_client}/merge', [ClientController::class, 'merge'])->name('clients.merge')->middleware('password_protected');
+    Route::post('clients/bulk', [ClientController::class, 'bulk'])->name('clients.bulk');
 
-    Route::post('filters/{entity}', 'FilterController@index')->name('filters');
+    Route::post('filters/{entity}', [FilterController::class, 'index'])->name('filters');
 
-    Route::resource('client_gateway_tokens', 'ClientGatewayTokenController');
+    Route::resource('client_gateway_tokens', ClientGatewayTokenController::class);
 
-    Route::post('connected_account', 'ConnectedAccountController@index');
-    Route::post('connected_account/gmail', 'ConnectedAccountController@handleGmailOauth');
+    Route::post('connected_account', [ConnectedAccountController::class, 'index']);
+    Route::post('connected_account/gmail', [ConnectedAccountController::class, 'handleGmailOauth']);
 
-    Route::post('client_statement', 'ClientStatementController@statement')->name('client.statement');
+    Route::post('client_statement', [ClientStatementController::class, 'statement'])->name('client.statement');
 
-    Route::post('companies/purge/{company}', 'MigrationController@purgeCompany')->middleware('password_protected');
-    Route::post('companies/purge_save_settings/{company}', 'MigrationController@purgeCompanySaveSettings')->middleware('password_protected');
+    Route::post('companies/purge/{company}', [MigrationController::class, 'purgeCompany'])->middleware('password_protected');
+    Route::post('companies/purge_save_settings/{company}', [MigrationController::class, 'purgeCompanySaveSettings'])->middleware('password_protected');
 
-    Route::resource('companies', 'CompanyController'); // name = (companies. index / create / show / update / destroy / edit
+    Route::resource('companies', CompanyController::class); // name = (companies. index / create / show / update / destroy / edit
 
-    Route::put('companies/{company}/upload', 'CompanyController@upload');
-    Route::post('companies/{company}/default', 'CompanyController@default');
+    Route::put('companies/{company}/upload', [CompanyController::class, 'upload']);
+    Route::post('companies/{company}/default', [CompanyController::class, 'default']);
 
-    Route::get('company_ledger', 'CompanyLedgerController@index')->name('company_ledger.index');
+    Route::get('company_ledger', [CompanyLedgerController::class, 'index'])->name('company_ledger.index');
 
-    Route::resource('company_gateways', 'CompanyGatewayController');
-    Route::post('company_gateways/bulk', 'CompanyGatewayController@bulk')->name('company_gateways.bulk');
+    Route::resource('company_gateways', CompanyGatewayController::class);
+    Route::post('company_gateways/bulk', [CompanyGatewayController::class, 'bulk'])->name('company_gateways.bulk');
 
-    Route::put('company_users/{user}', 'CompanyUserController@update');
+    Route::put('company_users/{user}', [CompanyUserController::class, 'update']);
 
-    Route::resource('credits', 'CreditController'); // name = (credits. index / create / show / update / destroy / edit
-    Route::put('credits/{credit}/upload', 'CreditController@upload')->name('credits.upload');
-    Route::get('credits/{credit}/{action}', 'CreditController@action')->name('credits.action');
-    Route::post('credits/bulk', 'CreditController@bulk')->name('credits.bulk');
+    Route::resource('credits', CreditController::class); // name = (credits. index / create / show / update / destroy / edit
+    Route::put('credits/{credit}/upload', [CreditController::class, 'upload'])->name('credits.upload');
+    Route::get('credits/{credit}/{action}', [CreditController::class, 'action'])->name('credits.action');
+    Route::post('credits/bulk', [CreditController::class, 'bulk'])->name('credits.bulk');
 
-    Route::resource('designs', 'DesignController'); // name = (payments. index / create / show / update / destroy / edit
-    Route::post('designs/bulk', 'DesignController@bulk')->name('designs.bulk');
-    Route::post('designs/set/default', 'DesignController@default')->name('designs.default');
+    Route::resource('designs', DesignController::class); // name = (payments. index / create / show / update / destroy / edit
+    Route::post('designs/bulk', [DesignController::class, 'bulk'])->name('designs.bulk');
+    Route::post('designs/set/default', [DesignController::class, 'default'])->name('designs.default');
 
-    Route::resource('documents', 'DocumentController'); // name = (documents. index / create / show / update / destroy / edit
-    Route::get('documents/{document}/download', 'DocumentController@download')->name('documents.download');
-    Route::post('documents/bulk', 'DocumentController@bulk')->name('documents.bulk');
+    Route::resource('documents', DocumentController::class); // name = (documents. index / create / show / update / destroy / edit
+    Route::get('documents/{document}/download', [DocumentController::class, 'download'])->name('documents.download');
+    Route::post('documents/bulk', [DocumentController::class, 'bulk'])->name('documents.bulk');
 
-    Route::post('emails', 'EmailController@send')->name('email.send')->middleware('user_verified');
+    Route::post('emails', [EmailController::class, 'send'])->name('email.send')->middleware('user_verified');
 
-    Route::resource('expenses', 'ExpenseController'); // name = (expenses. index / create / show / update / destroy / edit
-    Route::put('expenses/{expense}/upload', 'ExpenseController@upload');
-    Route::post('expenses/bulk', 'ExpenseController@bulk')->name('expenses.bulk');
+    Route::resource('expenses', ExpenseController::class); // name = (expenses. index / create / show / update / destroy / edit
+    Route::put('expenses/{expense}/upload', [ExpenseController::class, 'upload']);
+    Route::post('expenses/bulk', [ExpenseController::class, 'bulk'])->name('expenses.bulk');
 
-    Route::post('export', 'ExportController@index')->name('export.index');
+    Route::post('export', [ExportController::class, 'index'])->name('export.index');
 
-    Route::resource('expense_categories', 'ExpenseCategoryController'); // name = (expense_categories. index / create / show / update / destroy / edit
-    Route::post('expense_categories/bulk', 'ExpenseCategoryController@bulk')->name('expense_categories.bulk');
+    Route::resource('expense_categories', ExpenseCategoryController::class); // name = (expense_categories. index / create / show / update / destroy / edit
+    Route::post('expense_categories/bulk', [ExpenseCategoryController::class, 'bulk'])->name('expense_categories.bulk');
 
-    Route::resource('group_settings', 'GroupSettingController');
-    Route::post('group_settings/bulk', 'GroupSettingController@bulk');
-    Route::put('group_settings/{group_setting}/upload', 'GroupSettingController@upload')->name('group_settings.upload');
+    Route::resource('group_settings', GroupSettingController::class);
+    Route::post('group_settings/bulk', [GroupSettingController::class, 'bulk']);
+    Route::put('group_settings/{group_setting}/upload', [GroupSettingController::class, 'upload'])->name('group_settings.upload');
 
-    Route::post('import', 'ImportController@import')->name('import.import');
-    Route::post('import_json', 'ImportJsonController@import')->name('import.import_json');
-    Route::post('preimport', 'ImportController@preimport')->name('import.preimport');
+    Route::post('import', [ImportController::class, 'import'])->name('import.import');
+    Route::post('import_json', [ImportJsonController::class, 'import'])->name('import.import_json');
+    Route::post('preimport', [ImportController::class, 'preimport'])->name('import.preimport');
 
-    Route::resource('invoices', 'InvoiceController'); // name = (invoices. index / create / show / update / destroy / edit
-    Route::get('invoices/{invoice}/delivery_note', 'InvoiceController@deliveryNote')->name('invoices.delivery_note');
-    Route::get('invoices/{invoice}/{action}', 'InvoiceController@action')->name('invoices.action');
-    Route::put('invoices/{invoice}/upload', 'InvoiceController@upload')->name('invoices.upload');
-    Route::get('invoice/{invitation_key}/download', 'InvoiceController@downloadPdf')->name('invoices.downloadPdf');
-    Route::post('invoices/bulk', 'InvoiceController@bulk')->name('invoices.bulk');
-    Route::post('invoices/update_reminders', 'InvoiceController@update_reminders')->name('invoices.update_reminders');
+    Route::resource('invoices', InvoiceController::class); // name = (invoices. index / create / show / update / destroy / edit
+    Route::get('invoices/{invoice}/delivery_note', [InvoiceController::class, 'deliveryNote'])->name('invoices.delivery_note');
+    Route::get('invoices/{invoice}/{action}', [InvoiceController::class, 'action'])->name('invoices.action');
+    Route::put('invoices/{invoice}/upload', [InvoiceController::class, 'upload'])->name('invoices.upload');
+    Route::get('invoice/{invitation_key}/download', [InvoiceController::class, 'downloadPdf'])->name('invoices.downloadPdf');
+    Route::post('invoices/bulk', [InvoiceController::class, 'bulk'])->name('invoices.bulk');
+    Route::post('invoices/update_reminders', [InvoiceController::class, 'update_reminders'])->name('invoices.update_reminders');
 
-    Route::post('logout', 'LogoutController@index')->name('logout');
+    Route::post('logout', [LogoutController::class, 'index'])->name('logout');
 
-    Route::post('migrate', 'MigrationController@index')->name('migrate.start');
+    Route::post('migrate', [MigrationController::class, 'index'])->name('migrate.start');
 
-    Route::post('migration/purge/{company}', 'MigrationController@purgeCompany')->middleware('password_protected');
-    Route::post('migration/purge_save_settings/{company}', 'MigrationController@purgeCompanySaveSettings')->middleware('password_protected');
-    Route::post('migration/start', 'MigrationController@startMigration');
+    Route::post('migration/purge/{company}', [MigrationController::class, 'purgeCompany'])->middleware('password_protected');
+    Route::post('migration/purge_save_settings/{company}', [MigrationController::class, 'purgeCompanySaveSettings'])->middleware('password_protected');
+    Route::post('migration/start', [MigrationController::class, 'startMigration']);
 
-    Route::post('one_time_token', 'OneTimeTokenController@create');
+    Route::post('one_time_token', [OneTimeTokenController::class, 'create']);
 
-    Route::resource('payments', 'PaymentController'); // name = (payments. index / create / show / update / destroy / edit
-    Route::post('payments/refund', 'PaymentController@refund')->name('payments.refund');
-    Route::post('payments/bulk', 'PaymentController@bulk')->name('payments.bulk');
-    Route::put('payments/{payment}/upload', 'PaymentController@upload');
+    Route::resource('payments', PaymentController::class); // name = (payments. index / create / show / update / destroy / edit
+    Route::post('payments/refund', [PaymentController::class, 'refund'])->name('payments.refund');
+    Route::post('payments/bulk', [PaymentController::class, 'bulk'])->name('payments.bulk');
+    Route::put('payments/{payment}/upload', [PaymentController::class, 'upload']);
 
-    Route::resource('payment_terms', 'PaymentTermController'); // name = (payments. index / create / show / update / destroy / edit
-    Route::post('payment_terms/bulk', 'PaymentTermController@bulk')->name('payment_terms.bulk');
+    Route::resource('payment_terms', PaymentTermController::class); // name = (payments. index / create / show / update / destroy / edit
+    Route::post('payment_terms/bulk', [PaymentTermController::class, 'bulk'])->name('payment_terms.bulk');
 
-    Route::post('preview', 'PreviewController@show')->name('preview.show');
-    Route::post('live_preview', 'PreviewController@live')->name('preview.live');
+    Route::post('preview', [PreviewController::class, 'show'])->name('preview.show');
+    Route::post('live_preview', [PreviewController::class, 'live'])->name('preview.live');
 
-    Route::post('preview/purchase_order', 'PreviewPurchaseOrderController@show')->name('preview_purchase_order.show');
-    Route::post('live_preview/purchase_order', 'PreviewPurchaseOrderController@live')->name('preview_purchase_order.live');
+    Route::post('preview/purchase_order', [PreviewPurchaseOrderController::class, 'show'])->name('preview_purchase_order.show');
+    Route::post('live_preview/purchase_order', [PreviewPurchaseOrderController::class, 'live'])->name('preview_purchase_order.live');
 
-    Route::resource('products', 'ProductController'); // name = (products. index / create / show / update / destroy / edit
-    Route::post('products/bulk', 'ProductController@bulk')->name('products.bulk');
-    Route::put('products/{product}/upload', 'ProductController@upload');
+    Route::resource('products', ProductController::class); // name = (products. index / create / show / update / destroy / edit
+    Route::post('products/bulk', [ProductController::class, 'bulk'])->name('products.bulk');
+    Route::put('products/{product}/upload', [ProductController::class, 'upload']);
 
-    Route::resource('projects', 'ProjectController'); // name = (projects. index / create / show / update / destroy / edit
-    Route::post('projects/bulk', 'ProjectController@bulk')->name('projects.bulk');
-    Route::put('projects/{project}/upload', 'ProjectController@upload')->name('projects.upload');
+    Route::resource('projects', ProjectController::class); // name = (projects. index / create / show / update / destroy / edit
+    Route::post('projects/bulk', [ProjectController::class, 'bulk'])->name('projects.bulk');
+    Route::put('projects/{project}/upload', [ProjectController::class, 'upload'])->name('projects.upload');
 
-    Route::resource('quotes', 'QuoteController'); // name = (quotes. index / create / show / update / destroy / edit
-    Route::get('quotes/{quote}/{action}', 'QuoteController@action')->name('quotes.action');
-    Route::post('quotes/bulk', 'QuoteController@bulk')->name('quotes.bulk');
-    Route::put('quotes/{quote}/upload', 'QuoteController@upload');
+    Route::resource('quotes', QuoteController::class); // name = (quotes. index / create / show / update / destroy / edit
+    Route::get('quotes/{quote}/{action}', [QuoteController::class, 'action'])->name('quotes.action');
+    Route::post('quotes/bulk', [QuoteController::class, 'bulk'])->name('quotes.bulk');
+    Route::put('quotes/{quote}/upload', [QuoteController::class, 'upload']);
 
-    Route::resource('recurring_expenses', 'RecurringExpenseController');
-    Route::post('recurring_expenses/bulk', 'RecurringExpenseController@bulk')->name('recurring_expenses.bulk');
-    Route::put('recurring_expenses/{recurring_expense}/upload', 'RecurringExpenseController@upload');
+    Route::resource('recurring_expenses', RecurringExpenseController::class);
+    Route::post('recurring_expenses/bulk', [RecurringExpenseController::class, 'bulk'])->name('recurring_expenses.bulk');
+    Route::put('recurring_expenses/{recurring_expense}/upload', [RecurringExpenseController::class, 'upload']);
 
 
-    Route::resource('recurring_invoices', 'RecurringInvoiceController'); // name = (recurring_invoices. index / create / show / update / destroy / edit
-    Route::post('recurring_invoices/bulk', 'RecurringInvoiceController@bulk')->name('recurring_invoices.bulk');
-    Route::put('recurring_invoices/{recurring_invoice}/upload', 'RecurringInvoiceController@upload');
-    Route::resource('recurring_quotes', 'RecurringQuoteController'); // name = (recurring_invoices. index / create / show / update / destroy / edit
-    Route::post('recurring_quotes/bulk', 'RecurringQuoteController@bulk')->name('recurring_quotes.bulk');
-    Route::put('recurring_quotes/{recurring_quote}/upload', 'RecurringQuoteController@upload');
+    Route::resource('recurring_invoices', RecurringInvoiceController::class); // name = (recurring_invoices. index / create / show / update / destroy / edit
+    Route::post('recurring_invoices/bulk', [RecurringInvoiceController::class, 'bulk'])->name('recurring_invoices.bulk');
+    Route::put('recurring_invoices/{recurring_invoice}/upload', [RecurringInvoiceController::class, 'upload']);
+    Route::resource('recurring_quotes', RecurringQuoteController::class); // name = (recurring_invoices. index / create / show / update / destroy / edit
+    Route::post('recurring_quotes/bulk', [RecurringQuoteController::class, 'bulk'])->name('recurring_quotes.bulk');
+    Route::put('recurring_quotes/{recurring_quote}/upload', [RecurringQuoteController::class, 'upload']);
 
-    Route::post('refresh', 'Auth\LoginController@refresh')->middleware('throttle:300,3');
+    Route::post('refresh', [LoginController::class, 'refresh'])->middleware('throttle:300,2');
 
-    Route::post('reports/clients', 'Reports\ClientReportController');
-    Route::post('reports/contacts', 'Reports\ClientContactReportController');
-    Route::post('reports/credits', 'Reports\CreditReportController');
-    Route::post('reports/documents', 'Reports\DocumentReportController');
-    Route::post('reports/expenses', 'Reports\ExpenseReportController');
-    Route::post('reports/invoices', 'Reports\InvoiceReportController');
-    Route::post('reports/invoice_items', 'Reports\InvoiceItemReportController');
-    Route::post('reports/quotes', 'Reports\QuoteReportController');
-    Route::post('reports/quote_items', 'Reports\QuoteItemReportController');
-    Route::post('reports/recurring_invoices', 'Reports\RecurringInvoiceReportController');
-    Route::post('reports/payments', 'Reports\PaymentReportController');
-    Route::post('reports/products', 'Reports\ProductReportController');
-    Route::post('reports/tasks', 'Reports\TaskReportController');
-    Route::post('reports/profitloss', 'Reports\ProfitAndLossController');
+    Route::post('reports/clients', ClientReportController::class);
+    Route::post('reports/contacts', ClientContactReportController::class);
+    Route::post('reports/credits', CreditReportController::class);
+    Route::post('reports/documents', DocumentReportController::class);
+    Route::post('reports/expenses', ExpenseReportController::class);
+    Route::post('reports/invoices', InvoiceReportController::class);
+    Route::post('reports/invoice_items', InvoiceItemReportController::class);
+    Route::post('reports/quotes', QuoteReportController::class);
+    Route::post('reports/quote_items', QuoteItemReportController::class);
+    Route::post('reports/recurring_invoices', RecurringInvoiceReportController::class);
+    Route::post('reports/payments', PaymentReportController::class);
+    Route::post('reports/products', ProductReportController::class);
+    Route::post('reports/tasks', TaskReportController::class);
+    Route::post('reports/profitloss', ProfitAndLossController::class);
+
+    Route::resource('task_scheduler', TaskSchedulerController::class)->except('edit')->parameters(['task_scheduler' => 'scheduler']);
+
+    Route::get('scheduler', [SchedulerController::class, 'index']);
+    Route::post('support/messages/send', SendingController::class);
+
+    Route::post('self-update', [SelfUpdateController::class, 'update'])->middleware('password_protected');
+    Route::post('self-update/check_version', [SelfUpdateController::class, 'checkVersion']);
+
+    Route::resource('system_logs', SystemLogController::class);
+
+    Route::resource('tasks', TaskController::class); // name = (tasks. index / create / show / update / destroy / edit
+    Route::post('tasks/bulk', [TaskController::class, 'bulk'])->name('tasks.bulk');
+    Route::put('tasks/{task}/upload', [TaskController::class, 'upload']);
+    Route::post('tasks/sort', [TaskController::class, 'sort']);
+
+    Route::resource('task_statuses', TaskStatusController::class); // name = (task_statuses. index / create / show / update / destroy / edit
+    Route::post('task_statuses/bulk', [TaskStatusController::class, 'bulk'])->name('task_statuses.bulk');
+
+    Route::resource('tax_rates', TaxRateController::class); // name = (tax_rates. index / create / show / update / destroy / edit
+    Route::post('tax_rates/bulk', [TaxRateController::class, 'bulk'])->name('tax_rates.bulk');
+
+    Route::post('templates', [TemplateController::class, 'show'])->name('templates.show');
+
+    Route::resource('tokens', TokenController::class); // name = (tokens. index / create / show / update / destroy / edit
+    Route::post('tokens/bulk', [TokenController::class, 'bulk'])->name('tokens.bulk');
+
+    Route::get('settings/enable_two_factor', [TwoFactorController::class, 'setupTwoFactor']);
+    Route::post('settings/enable_two_factor', [TwoFactorController::class, 'enableTwoFactor']);
+    Route::post('settings/disable_two_factor', [TwoFactorController::class, 'disableTwoFactor']);
 
 
-    Route::resource('task_scheduler', 'TaskSchedulerController')->except('edit')->parameters(['task_scheduler' => 'scheduler']);
+    Route::post('verify', [TwilioController::class, 'generate'])->name('verify.generate')->middleware('throttle:100,1');
+    Route::post('verify/confirm', [TwilioController::class, 'confirm'])->name('verify.confirm');
+    
+    Route::resource('vendors', VendorController::class); // name = (vendors. index / create / show / update / destroy / edit
+    Route::post('vendors/bulk', [VendorController::class, 'bulk'])->name('vendors.bulk');
+    Route::put('vendors/{vendor}/upload', [VendorController::class, 'upload']);
 
+    Route::resource('purchase_orders', PurchaseOrderController::class);
+    Route::post('purchase_orders/bulk', [PurchaseOrderController::class, 'bulk'])->name('purchase_orders.bulk');
+    Route::put('purchase_orders/{purchase_order}/upload', [PurchaseOrderController::class, 'upload']);
 
-    Route::get('scheduler', 'SchedulerController@index');
-    Route::post('support/messages/send', 'Support\Messages\SendingController');
+    Route::get('purchase_orders/{purchase_order}/{action}', [PurchaseOrderController::class, 'action'])->name('purchase_orders.action');
 
-    Route::post('self-update', 'SelfUpdateController@update')->middleware('password_protected');
-    Route::post('self-update/check_version', 'SelfUpdateController@checkVersion');
+    Route::get('users', [UserController::class, 'index']);
+    Route::get('users/create', [UserController::class, 'create'])->middleware('password_protected');
+    Route::get('users/{user}', [UserController::class, 'show'])->middleware('password_protected');
+    Route::put('users/{user}', [UserController::class, 'update'])->middleware('password_protected');
+    Route::post('users', [UserController::class, 'store'])->middleware('password_protected');
+    //Route::post('users/{user}/attach_to_company', [UserController::class, 'attach')->middleware('password_protected');
+    Route::delete('users/{user}/detach_from_company', [UserController::class, 'detach'])->middleware('password_protected');
 
-    Route::resource('system_logs', 'SystemLogController');
+    Route::post('users/bulk', [UserController::class, 'bulk'])->name('users.bulk')->middleware('password_protected');
+    Route::post('/users/{user}/invite', [UserController::class, 'invite'])->middleware('password_protected');
+    Route::post('/user/{user}/reconfirm', [UserController::class, 'reconfirm']);
 
-    Route::resource('tasks', 'TaskController'); // name = (tasks. index / create / show / update / destroy / edit
-    Route::post('tasks/bulk', 'TaskController@bulk')->name('tasks.bulk');
-    Route::put('tasks/{task}/upload', 'TaskController@upload');
-    Route::post('tasks/sort', 'TaskController@sort');
-
-    Route::resource('task_statuses', 'TaskStatusController'); // name = (task_statuses. index / create / show / update / destroy / edit
-    Route::post('task_statuses/bulk', 'TaskStatusController@bulk')->name('task_statuses.bulk');
-
-    Route::resource('tax_rates', 'TaxRateController'); // name = (tax_rates. index / create / show / update / destroy / edit
-    Route::post('tax_rates/bulk', 'TaxRateController@bulk')->name('tax_rates.bulk');
-
-    Route::post('templates', 'TemplateController@show')->name('templates.show');
-
-    Route::resource('tokens', 'TokenController'); // name = (tokens. index / create / show / update / destroy / edit
-    Route::post('tokens/bulk', 'TokenController@bulk')->name('tokens.bulk');
-
-    Route::get('settings/enable_two_factor', 'TwoFactorController@setupTwoFactor');
-    Route::post('settings/enable_two_factor', 'TwoFactorController@enableTwoFactor');
-    Route::post('settings/disable_two_factor', 'TwoFactorController@disableTwoFactor');
-
-    Route::resource('vendors', 'VendorController'); // name = (vendors. index / create / show / update / destroy / edit
-    Route::post('vendors/bulk', 'VendorController@bulk')->name('vendors.bulk');
-    Route::put('vendors/{vendor}/upload', 'VendorController@upload');
-
-    Route::resource('purchase_orders', 'PurchaseOrderController');
-    Route::post('purchase_orders/bulk', 'PurchaseOrderController@bulk')->name('purchase_orders.bulk');
-    Route::put('purchase_orders/{purchase_order}/upload', 'PurchaseOrderController@upload');
-
-    Route::get('purchase_orders/{purchase_order}/{action}', 'PurchaseOrderController@action')->name('purchase_orders.action');
-
-    Route::get('users', 'UserController@index');
-    Route::get('users/create', 'UserController@create')->middleware('password_protected');
-    Route::get('users/{user}', 'UserController@show')->middleware('password_protected');
-    Route::put('users/{user}', 'UserController@update')->middleware('password_protected');
-    Route::post('users', 'UserController@store')->middleware('password_protected');
-    //Route::post('users/{user}/attach_to_company', 'UserController@attach')->middleware('password_protected');
-    Route::delete('users/{user}/detach_from_company', 'UserController@detach')->middleware('password_protected');
-
-    Route::post('users/bulk', 'UserController@bulk')->name('users.bulk')->middleware('password_protected');
-    Route::post('/users/{user}/invite', 'UserController@invite')->middleware('password_protected');
-    Route::post('/user/{user}/reconfirm', 'UserController@reconfirm');
-
-    Route::resource('webhooks', 'WebhookController');
-    Route::post('webhooks/bulk', 'WebhookController@bulk')->name('webhooks.bulk');
+    Route::resource('webhooks', WebhookController::class);
+    Route::post('webhooks/bulk', [WebhookController::class, 'bulk'])->name('webhooks.bulk');
 
     /*Subscription and Webhook routes */
-    // Route::post('hooks', 'SubscriptionController@subscribe')->name('hooks.subscribe');
-    // Route::delete('hooks/{subscription_id}', 'SubscriptionController@unsubscribe')->name('hooks.unsubscribe');
+    // Route::post('hooks', [SubscriptionController::class, 'subscribe'])->name('hooks.subscribe');
+    // Route::delete('hooks/{subscription_id}', [SubscriptionController::class, 'unsubscribe'])->name('hooks.unsubscribe');
 
-    Route::post('stripe/update_payment_methods', 'StripeController@update')->middleware('password_protected')->name('stripe.update');
-    Route::post('stripe/import_customers', 'StripeController@import')->middleware('password_protected')->name('stripe.import');
+    Route::post('stripe/update_payment_methods', [StripeController::class, 'update'])->middleware('password_protected')->name('stripe.update');
+    Route::post('stripe/import_customers', [StripeController::class, 'import'])->middleware('password_protected')->name('stripe.import');
 
-    Route::post('stripe/verify', 'StripeController@verify')->middleware('password_protected')->name('stripe.verify');
-    Route::post('stripe/disconnect/{company_gateway_id}', 'StripeController@disconnect')->middleware('password_protected')->name('stripe.disconnect');
+    Route::post('stripe/verify', [StripeController::class, 'verify'])->middleware('password_protected')->name('stripe.verify');
+    Route::post('stripe/disconnect/{company_gateway_id}', [StripeController::class, 'disconnect'])->middleware('password_protected')->name('stripe.disconnect');
 
-    Route::resource('subscriptions', 'SubscriptionController');
-    Route::post('subscriptions/bulk', 'SubscriptionController@bulk')->name('subscriptions.bulk');
-    Route::get('statics', 'StaticController');
-    // Route::post('apple_pay/upload_file','ApplyPayController@upload');
+    Route::resource('subscriptions', SubscriptionController::class);
+    Route::post('subscriptions/bulk', [SubscriptionController::class, 'bulk'])->name('subscriptions.bulk');
+    Route::get('statics', StaticController::class);
+    // Route::post('apple_pay/upload_file','ApplyPayController::class, 'upload');
 
 });
 
-Route::match(['get', 'post'], 'payment_webhook/{company_key}/{company_gateway_id}', 'PaymentWebhookController')
-    ->middleware(['throttle:1000,1','guest'])
+Route::match(['get', 'post'], 'payment_webhook/{company_key}/{company_gateway_id}', PaymentWebhookController::class)
+    ->middleware('throttle:1000,1')
     ->name('payment_webhook');
 
-Route::match(['get', 'post'], 'payment_notification_webhook/{company_key}/{company_gateway_id}/{client}', 'PaymentNotificationWebhookController')
-    ->middleware(['throttle:1000,1', 'guest'])
+Route::match(['get', 'post'], 'payment_notification_webhook/{company_key}/{company_gateway_id}/{client}', PaymentNotificationWebhookController::class)
+    ->middleware('throttle:1000,1')
     ->name('payment_notification_webhook');
 
-Route::post('api/v1/postmark_webhook', 'PostMarkController@webhook')->middleware('throttle:1000,1');
-Route::get('token_hash_router', 'OneTimeTokenController@router')->middleware('throttle:100,1');
-Route::get('webcron', 'WebCronController@index')->middleware('throttle:100,1');
-Route::post('api/v1/get_migration_account', 'HostedMigrationController@getAccount')->middleware('guest')->middleware('throttle:100,1');
-Route::post('api/v1/confirm_forwarding', 'HostedMigrationController@confirmForwarding')->middleware('guest')->middleware('throttle:100,1');
-Route::post('api/v1/process_webhook', 'InAppPurchase\AppleController@process_webhook')->middleware('throttle:1000,1');
-Route::post('api/v1/confirm_purchase', 'InAppPurchase\AppleController@confirm_purchase')->middleware('throttle:1000,1');
-Route::fallback('BaseController@notFound');
+Route::post('api/v1/postmark_webhook', [PostMarkController::class, 'webhook'])->middleware('throttle:1000,1');
+Route::get('token_hash_router', [OneTimeTokenController::class, 'router'])->middleware('throttle:100,1');
+Route::get('webcron', [WebCronController::class, 'index'])->middleware('throttle:100,1');
+Route::post('api/v1/get_migration_account', [HostedMigrationController::class, 'getAccount'])->middleware('guest')->middleware('throttle:100,1');
+Route::post('api/v1/confirm_forwarding', [HostedMigrationController::class, 'confirmForwarding'])->middleware('guest')->middleware('throttle:100,1');
+Route::post('api/v1/process_webhook', [AppleController::class, 'process_webhook'])->middleware('throttle:1000,1');
+Route::post('api/v1/confirm_purchase', [AppleController::class, 'confirm_purchase'])->middleware('throttle:1000,1');
+Route::fallback([BaseController::class, 'notFound']);
\ No newline at end of file
diff --git a/routes/client.php b/routes/client.php
index db7a50434008..a7f134f77594 100644
--- a/routes/client.php
+++ b/routes/client.php
@@ -1,129 +1,138 @@
 <?php
 
+use App\Http\Controllers\Auth\ContactForgotPasswordController;
+use App\Http\Controllers\Auth\ContactLoginController;
+use App\Http\Controllers\Auth\ContactRegisterController;
+use App\Http\Controllers\Auth\ContactResetPasswordController;
+use App\Http\Controllers\BaseController;
+use App\Http\Controllers\ClientPortal\DocumentController;
+use App\Http\Controllers\ClientPortal\PaymentMethodController;
+use App\Http\Controllers\ClientPortal\SubscriptionController;
+use App\Http\Controllers\ClientPortal\TaskController;
+use App\Http\Controllers\CreditController;
+use App\Http\Controllers\InvoiceController;
+use App\Http\Controllers\QuoteController;
+use App\Http\Controllers\RecurringInvoiceController;
+use App\Utils\PhantomJS\Phantom;
 use Illuminate\Support\Facades\Route;
 
-Route::get('client', 'Auth\ContactLoginController@showLoginForm')->name('client.catchall')->middleware(['domain_db', 'contact_account','locale']); //catch all
+Route::get('client', [ContactLoginController::class, 'showLoginForm'])->name('client.catchall')->middleware(['domain_db', 'contact_account','locale']); //catch all
 
-Route::get('client/login', 'Auth\ContactLoginController@showLoginForm')->name('client.login')->middleware(['domain_db', 'contact_account','locale']);
-Route::post('client/login', 'Auth\ContactLoginController@login')->name('client.login.submit');
+Route::get('client/login/{company_key?}', [ContactLoginController::class, 'showLoginForm'])->name('client.login')->middleware(['domain_db', 'contact_account','locale']);
+Route::post('client/login/{company_key?}', [ContactLoginController::class, 'login'])->name('client.login.submit');
 
-Route::get('client/register/{company_key?}', 'Auth\ContactRegisterController@showRegisterForm')->name('client.register')->middleware(['domain_db', 'contact_account', 'contact_register','locale']);
-Route::post('client/register/{company_key?}', 'Auth\ContactRegisterController@register')->middleware(['domain_db', 'contact_account', 'contact_register', 'locale', 'throttle:10,1']);
+Route::get('client/register/{company_key?}', [ContactRegisterController::class, 'showRegisterForm'])->name('client.register')->middleware(['domain_db', 'contact_account', 'contact_register','locale']);
+Route::post('client/register/{company_key?}', [ContactRegisterController::class, 'register'])->middleware(['domain_db', 'contact_account', 'contact_register', 'locale', 'throttle:10,1']);
 
-Route::get('client/password/reset', 'Auth\ContactForgotPasswordController@showLinkRequestForm')->name('client.password.request')->middleware(['domain_db', 'contact_account','locale']);
-Route::post('client/password/email', 'Auth\ContactForgotPasswordController@sendResetLinkEmail')->name('client.password.email')->middleware('locale');
-Route::get('client/password/reset/{token}', 'Auth\ContactResetPasswordController@showResetForm')->name('client.password.reset')->middleware(['domain_db', 'contact_account','locale']);
-Route::post('client/password/reset', 'Auth\ContactResetPasswordController@reset')->name('client.password.update')->middleware(['domain_db', 'contact_account','locale']);
+Route::get('client/password/reset', [ContactForgotPasswordController::class, 'showLinkRequestForm'])->name('client.password.request')->middleware(['domain_db', 'contact_account','locale']);
+Route::post('client/password/email', [ContactForgotPasswordController::class, 'sendResetLinkEmail'])->name('client.password.email')->middleware('locale');
+Route::get('client/password/reset/{token}', [ContactResetPasswordController::class, 'showResetForm'])->name('client.password.reset')->middleware(['domain_db', 'contact_account','locale']);
+Route::post('client/password/reset', [ContactResetPasswordController::class, 'reset'])->name('client.password.update')->middleware(['domain_db', 'contact_account','locale']);
 
-Route::get('view/{entity_type}/{invitation_key}', 'ClientPortal\EntityViewController@index')->name('client.entity_view');
-Route::get('view/{entity_type}/{invitation_key}/password', 'ClientPortal\EntityViewController@password')->name('client.entity_view.password');
-Route::post('view/{entity_type}/{invitation_key}/password', 'ClientPortal\EntityViewController@handlePassword');
-Route::post('set_password', 'ClientPortal\EntityViewController@handlePasswordSet')->name('client.set_password')->middleware('domain_db');
+Route::get('view/{entity_type}/{invitation_key}', [App\Http\Controllers\ClientPortal\EntityViewController::class, 'index'])->name('client.entity_view');
+Route::get('view/{entity_type}/{invitation_key}/password', [App\Http\Controllers\ClientPortal\EntityViewController::class ,'password'])->name('client.entity_view.password');
+Route::post('view/{entity_type}/{invitation_key}/password', [App\Http\Controllers\ClientPortal\EntityViewController::class, 'handlePassword']);
+Route::post('set_password', [App\Http\Controllers\ClientPortal\EntityViewController::class, 'handlePasswordSet'])->name('client.set_password')->middleware('domain_db');
 
-Route::get('tmp_pdf/{hash}', 'ClientPortal\TempRouteController@index')->name('tmp_pdf');
+Route::get('tmp_pdf/{hash}', [App\Http\Controllers\ClientPortal\TempRouteController::class, 'index'])->name('tmp_pdf');
 
-Route::get('client/key_login/{contact_key}', 'ClientPortal\ContactHashLoginController@login')->name('client.contact_login')->middleware(['domain_db','contact_key_login']);
-Route::get('client/magic_link/{magic_link}', 'ClientPortal\ContactHashLoginController@magicLink')->name('client.contact_magic_link')->middleware(['domain_db','contact_key_login']);
-Route::get('documents/{document_hash}', 'ClientPortal\DocumentController@publicDownload')->name('documents.public_download')->middleware(['domain_db']);
-Route::get('error', 'ClientPortal\ContactHashLoginController@errorPage')->name('client.error');
-Route::get('client/payment/{contact_key}/{payment_id}', 'ClientPortal\InvitationController@paymentRouter')->middleware(['domain_db','contact_key_login']);
-Route::get('client/ninja/{contact_key}/{company_key}', 'ClientPortal\NinjaPlanController@index')->name('client.ninja_contact_login')->middleware(['domain_db']);
-Route::post('client/ninja/trial_confirmation', 'ClientPortal\NinjaPlanController@trial_confirmation')->name('client.trial.response')->middleware(['domain_db']);
+Route::get('client/key_login/{contact_key}', [App\Http\Controllers\ClientPortal\ContactHashLoginController::class, 'login'])->name('client.contact_login')->middleware(['domain_db','contact_key_login']);
+Route::get('client/magic_link/{magic_link}', [App\Http\Controllers\ClientPortal\ContactHashLoginController::class, 'magicLink'])->name('client.contact_magic_link')->middleware(['domain_db','contact_key_login']);
+Route::get('documents/{document_hash}', [App\Http\Controllers\ClientPortal\DocumentController::class, 'publicDownload'])->name('documents.public_download')->middleware(['domain_db']);
+Route::get('error', [App\Http\Controllers\ClientPortal\ContactHashLoginController::class, 'errorPage'])->name('client.error');
+Route::get('client/payment/{contact_key}/{payment_id}', [App\Http\Controllers\ClientPortal\InvitationController::class, 'paymentRouter'])->middleware(['domain_db','contact_key_login']);
+Route::get('client/ninja/{contact_key}/{company_key}', [App\Http\Controllers\ClientPortal\NinjaPlanController::class, 'index'])->name('client.ninja_contact_login')->middleware(['domain_db']);
+Route::post('client/ninja/trial_confirmation', [App\Http\Controllers\ClientPortal\NinjaPlanController::class, 'trial_confirmation'])->name('client.trial.response')->middleware(['domain_db']);
 
 Route::group(['middleware' => ['auth:contact', 'locale', 'domain_db','check_client_existence'], 'prefix' => 'client', 'as' => 'client.'], function () {
-    Route::get('dashboard', 'ClientPortal\DashboardController@index')->name('dashboard'); // name = (dashboard. index / create / show / update / destroy / edit
+    
+    Route::get('dashboard', [App\Http\Controllers\ClientPortal\DashboardController::class, 'index'])->name('dashboard'); // name = (dashboard. index / create / show / update / destroy / edit
 
-    Route::get('plan', 'ClientPortal\NinjaPlanController@plan')->name('plan'); // name = (dashboard. index / create / show / update / destroy / edit
+    Route::get('plan', [App\Http\Controllers\ClientPortal\NinjaPlanController::class, 'plan'])->name('plan'); // name = (dashboard. index / create / show / update / destroy / edit
 
-    Route::get('invoices', 'ClientPortal\InvoiceController@index')->name('invoices.index')->middleware('portal_enabled');
-    Route::post('invoices/payment', 'ClientPortal\InvoiceController@bulk')->name('invoices.bulk');
-    Route::get('invoices/payment', 'ClientPortal\InvoiceController@catch_bulk')->name('invoices.catch_bulk');
-    Route::post('invoices/download', 'ClientPortal\InvoiceController@download')->name('invoices.download');
-    Route::get('invoices/{invoice}', 'ClientPortal\InvoiceController@show')->name('invoice.show');
-    Route::get('invoices/{invoice_invitation}', 'ClientPortal\InvoiceController@show')->name('invoice.show_invitation');
+    Route::get('invoices', [App\Http\Controllers\ClientPortal\InvoiceController::class, 'index'])->name('invoices.index')->middleware('portal_enabled');
+    Route::post('invoices/payment', [App\Http\Controllers\ClientPortal\InvoiceController::class, 'bulk'])->name('invoices.bulk');
+    Route::get('invoices/payment', [App\Http\Controllers\ClientPortal\InvoiceController::class, 'catch_bulk'])->name('invoices.catch_bulk');
+    Route::post('invoices/download', [App\Http\Controllers\ClientPortal\InvoiceController::class, 'download'])->name('invoices.download');
+    Route::get('invoices/{invoice}', [App\Http\Controllers\ClientPortal\InvoiceController::class, 'show'])->name('invoice.show');
+    Route::get('invoices/{invoice_invitation}', [App\Http\Controllers\ClientPortal\InvoiceController::class, 'show'])->name('invoice.show_invitation');
 
-    Route::get('recurring_invoices', 'ClientPortal\RecurringInvoiceController@index')->name('recurring_invoices.index')->middleware('portal_enabled');
-    Route::get('recurring_invoices/{recurring_invoice}', 'ClientPortal\RecurringInvoiceController@show')->name('recurring_invoice.show');
-    Route::get('recurring_invoices/{recurring_invoice}/request_cancellation', 'ClientPortal\RecurringInvoiceController@requestCancellation')->name('recurring_invoices.request_cancellation');
+    Route::get('recurring_invoices', [App\Http\Controllers\ClientPortal\RecurringInvoiceController::class, 'index'])->name('recurring_invoices.index')->middleware('portal_enabled');
+    Route::get('recurring_invoices/{recurring_invoice}', [App\Http\Controllers\ClientPortal\RecurringInvoiceController::class, 'show'])->name('recurring_invoice.show');
+    Route::get('recurring_invoices/{recurring_invoice}/request_cancellation', [App\Http\Controllers\ClientPortal\RecurringInvoiceController::class, 'requestCancellation'])->name('recurring_invoices.request_cancellation');
+    Route::post('payments/process', [App\Http\Controllers\ClientPortal\PaymentController::class, 'process'])->name('payments.process');
+    Route::get('payments/process', [App\Http\Controllers\ClientPortal\PaymentController::class, 'catch_process'])->name('payments.catch_process');
 
-    Route::post('payments/process', 'ClientPortal\PaymentController@process')->name('payments.process');
-    Route::get('payments/process', 'ClientPortal\PaymentController@catch_process')->name('payments.catch_process');
+    Route::post('payments/credit_response', [App\Http\Controllers\ClientPortal\PaymentController::class, 'credit_response'])->name('payments.credit_response');
 
-    Route::post('payments/credit_response', 'ClientPortal\PaymentController@credit_response')->name('payments.credit_response');
+    Route::get('payments', [App\Http\Controllers\ClientPortal\PaymentController::class, 'index'])->name('payments.index')->middleware('portal_enabled');
+    Route::get('payments/{payment}', [App\Http\Controllers\ClientPortal\PaymentController::class, 'show'])->name('payments.show');
 
-    Route::get('payments', 'ClientPortal\PaymentController@index')->name('payments.index')->middleware('portal_enabled');
-    Route::get('payments/{payment}', 'ClientPortal\PaymentController@show')->name('payments.show');
+    Route::get('profile/{client_contact}/edit', [App\Http\Controllers\ClientPortal\ProfileController::class, 'edit'])->name('profile.edit');
+    Route::put('profile/{client_contact}/edit', [App\Http\Controllers\ClientPortal\ProfileController::class, 'update'])->name('profile.update');
+    Route::put('profile/{client_contact}/edit_client', [App\Http\Controllers\ClientPortal\ProfileController::class, 'updateClient'])->name('profile.edit_client');
+    Route::put('profile/{client_contact}/localization', [App\Http\Controllers\ClientPortal\ProfileController::class, 'updateClientLocalization'])->name('profile.edit_localization');
 
-    // Route::post('payments/process/response', 'ClientPortal\PaymentController@response')->name('payments.response');
-    // Route::get('payments/process/response', 'ClientPortal\PaymentController@response')->name('payments.response.get');
+    Route::get('payment_methods/{payment_method}/verification', [App\Http\Controllers\ClientPortal\PaymentMethodController::class, 'verify'])->name('payment_methods.verification');
+    Route::post('payment_methods/{payment_method}/verification', [App\Http\Controllers\ClientPortal\PaymentMethodController::class, 'processVerification'])->middleware(['throttle:10,1']);
 
-    Route::get('profile/{client_contact}/edit', 'ClientPortal\ProfileController@edit')->name('profile.edit');
-    Route::put('profile/{client_contact}/edit', 'ClientPortal\ProfileController@update')->name('profile.update');
-    Route::put('profile/{client_contact}/edit_client', 'ClientPortal\ProfileController@updateClient')->name('profile.edit_client');
-    Route::put('profile/{client_contact}/localization', 'ClientPortal\ProfileController@updateClientLocalization')->name('profile.edit_localization');
+    Route::get('payment_methods/confirm', [App\Http\Controllers\ClientPortal\PaymentMethodController::class, 'store'])->name('payment_methods.confirm');
 
-    Route::get('payment_methods/{payment_method}/verification', 'ClientPortal\PaymentMethodController@verify')->name('payment_methods.verification');
-    Route::post('payment_methods/{payment_method}/verification', 'ClientPortal\PaymentMethodController@processVerification')->middleware(['throttle:10,1']);
+    Route::resource('payment_methods', PaymentMethodController::class)->except(['edit', 'update']);
 
-    Route::get('payment_methods/confirm', 'ClientPortal\PaymentMethodController@store')->name('payment_methods.confirm');
+    Route::match(['GET', 'POST'], 'quotes/approve', [App\Http\Controllers\ClientPortal\QuoteController::class, 'bulk'])->name('quotes.bulk');
+    Route::get('quotes', [App\Http\Controllers\ClientPortal\QuoteController::class, 'index'])->name('quotes.index')->middleware('portal_enabled');
+    Route::get('quotes/{quote}', [App\Http\Controllers\ClientPortal\QuoteController::class, 'show'])->name('quote.show');
+    Route::get('quotes/{quote_invitation}', [App\Http\Controllers\ClientPortal\QuoteController::class, 'show'])->name('quote.show_invitation');
+    Route::post('quotes/download', [App\Http\Controllers\ClientPortal\QuoteController::class, 'download'])->name('quotes.download');
 
-    Route::resource('payment_methods', 'ClientPortal\PaymentMethodController')->except(['edit', 'update']);
+    Route::get('credits', [App\Http\Controllers\ClientPortal\CreditController::class, 'index'])->name('credits.index');
+    Route::get('credits/{credit}', [App\Http\Controllers\ClientPortal\CreditController::class, 'show'])->name('credit.show');
 
-    Route::match(['GET', 'POST'], 'quotes/approve', 'ClientPortal\QuoteController@bulk')->name('quotes.bulk');
-    Route::get('quotes', 'ClientPortal\QuoteController@index')->name('quotes.index')->middleware('portal_enabled');
-    Route::get('quotes/{quote}', 'ClientPortal\QuoteController@show')->name('quote.show');
-    Route::get('quotes/{quote_invitation}', 'ClientPortal\QuoteController@show')->name('quote.show_invitation');
-    Route::post('quotes/download', 'ClientPortal\QuoteController@download')->name('quotes.download');
+    Route::get('credits/{credit_invitation}', [App\Http\Controllers\ClientPortal\CreditController::class,'show'])->name('credits.show_invitation');
 
-    Route::get('credits', 'ClientPortal\CreditController@index')->name('credits.index');
-    Route::get('credits/{credit}', 'ClientPortal\CreditController@show')->name('credit.show');
+    Route::get('client/switch_company/{contact}', App\Http\Controllers\ClientPortal\SwitchCompanyController::class)->name('switch_company');
 
-    Route::get('credits/{credit_invitation}', 'ClientPortal\CreditController@show')->name('credits.show_invitation');
+    Route::post('documents/download_multiple', [App\Http\Controllers\ClientPortal\DocumentController::class, 'downloadMultiple'])->name('documents.download_multiple');
+    Route::get('documents/{document}/download', [App\Http\Controllers\ClientPortal\DocumentController::class, 'download'])->name('documents.download');
+    Route::resource('documents', App\Http\Controllers\ClientPortal\DocumentController::class)->only(['index', 'show']);
 
-    Route::get('client/switch_company/{contact}', 'ClientPortal\SwitchCompanyController')->name('switch_company');
+    Route::get('subscriptions/{recurring_invoice}/plan_switch/{target}', [App\Http\Controllers\ClientPortal\SubscriptionPlanSwitchController::class, 'index'])->name('subscription.plan_switch');
 
-    Route::post('documents/download_multiple', 'ClientPortal\DocumentController@downloadMultiple')->name('documents.download_multiple');
-    Route::get('documents/{document}/download', 'ClientPortal\DocumentController@download')->name('documents.download');
-    Route::resource('documents', 'ClientPortal\DocumentController')->only(['index', 'show']);
+    Route::resource('subscriptions', SubscriptionController::class)->middleware('portal_enabled')->only(['index']);
 
-    Route::get('subscriptions/{recurring_invoice}/plan_switch/{target}', 'ClientPortal\SubscriptionPlanSwitchController@index')->name('subscription.plan_switch');
+    Route::resource('tasks', TaskController::class)->only(['index']);
 
-    Route::resource('subscriptions', 'ClientPortal\SubscriptionController')->middleware('portal_enabled')->only(['index']);
+    Route::get('statement', [App\Http\Controllers\ClientPortal\StatementController::class, 'index'])->name('statement');
+    Route::get('statement/raw', [App\Http\Controllers\ClientPortal\StatementController::class, 'raw'])->name('statement.raw');
 
-    Route::resource('tasks', 'ClientPortal\TaskController')->only(['index']);
-
-    Route::get('statement', 'ClientPortal\StatementController@index')->name('statement');
-    Route::get('statement/raw', 'ClientPortal\StatementController@raw')->name('statement.raw');
-
-    Route::post('upload', 'ClientPortal\UploadController')->name('upload.store');
-    Route::get('logout', 'Auth\ContactLoginController@logout')->name('logout');
+    Route::post('upload', App\Http\Controllers\ClientPortal\UploadController::class)->name('upload.store');
+    Route::get('logout', [ContactLoginController::class, 'logout'])->name('logout');
 
 });
 
-Route::post('payments/process/response', 'ClientPortal\PaymentController@response')->name('client.payments.response')->middleware(['locale', 'domain_db', 'verify_hash']);
-Route::get('payments/process/response', 'ClientPortal\PaymentController@response')->name('client.payments.response.get')->middleware(['locale', 'domain_db', 'verify_hash']);
+Route::post('payments/process/response', [App\Http\Controllers\ClientPortal\PaymentController::class, 'response'])->name('client.payments.response')->middleware(['locale', 'domain_db', 'verify_hash']);
+Route::get('payments/process/response', [App\Http\Controllers\ClientPortal\PaymentController::class, 'response'])->name('client.payments.response.get')->middleware(['locale', 'domain_db', 'verify_hash']);
 
-Route::get('client/subscriptions/{subscription}/purchase', 'ClientPortal\SubscriptionPurchaseController@index')->name('client.subscription.purchase')->middleware('domain_db');
+Route::get('client/subscriptions/{subscription}/purchase', [App\Http\Controllers\ClientPortal\SubscriptionPurchaseController::class, 'index'])->name('client.subscription.purchase')->middleware('domain_db');
 
 Route::group(['middleware' => ['invite_db'], 'prefix' => 'client', 'as' => 'client.'], function () {
     /*Invitation catches*/
-    Route::get('recurring_invoice/{invitation_key}', 'ClientPortal\InvitationController@recurringRouter');
-    Route::get('invoice/{invitation_key}', 'ClientPortal\InvitationController@invoiceRouter');
-    Route::get('quote/{invitation_key}', 'ClientPortal\InvitationController@quoteRouter');
-    Route::get('credit/{invitation_key}', 'ClientPortal\InvitationController@creditRouter');
-    Route::get('recurring_invoice/{invitation_key}/download_pdf', 'RecurringInvoiceController@downloadPdf')->name('recurring_invoice.download_invitation_key');
-    Route::get('invoice/{invitation_key}/download_pdf', 'InvoiceController@downloadPdf')->name('invoice.download_invitation_key');
-    Route::get('quote/{invitation_key}/download_pdf', 'QuoteController@downloadPdf')->name('quote.download_invitation_key');
-    Route::get('credit/{invitation_key}/download_pdf', 'CreditController@downloadPdf')->name('credit.download_invitation_key');
-    Route::get('{entity}/{invitation_key}/download', 'ClientPortal\InvitationController@routerForDownload');
-    Route::get('pay/{invitation_key}', 'ClientPortal\InvitationController@payInvoice')->name('pay.invoice');
+    Route::get('recurring_invoice/{invitation_key}', [App\Http\Controllers\ClientPortal\InvitationController::class, 'recurringRouter']);
+    Route::get('invoice/{invitation_key}', [App\Http\Controllers\ClientPortal\InvitationController::class, 'invoiceRouter']);
+    Route::get('quote/{invitation_key}', [App\Http\Controllers\ClientPortal\InvitationController::class, 'quoteRouter']);
+    Route::get('credit/{invitation_key}', [App\Http\Controllers\ClientPortal\InvitationController::class, 'creditRouter']);
+    Route::get('recurring_invoice/{invitation_key}/download_pdf', [RecurringInvoiceController::class, 'downloadPdf'])->name('recurring_invoice.download_invitation_key');
+    Route::get('invoice/{invitation_key}/download_pdf', [InvoiceController::class, 'downloadPdf'])->name('invoice.download_invitation_key');
+    Route::get('quote/{invitation_key}/download_pdf', [QuoteController::class, 'downloadPdf'])->name('quote.download_invitation_key');
+    Route::get('credit/{invitation_key}/download_pdf', [CreditController::class, 'downloadPdf'])->name('credit.download_invitation_key');
+    Route::get('{entity}/{invitation_key}/download', [App\Http\Controllers\ClientPortal\InvitationController::class, 'routerForDownload']);
+    Route::get('pay/{invitation_key}', [App\Http\Controllers\ClientPortal\InvitationController::class, 'payInvoice'])->name('pay.invoice');
 
-    Route::get('unsubscribe/{entity}/{invitation_key}', 'ClientPortal\InvitationController@unsubscribe')->name('unsubscribe');
-
-    // Route::get('{entity}/{client_hash}/{invitation_key}', 'ClientPortal\InvitationController@routerForIframe')->name('invoice.client_hash_and_invitation_key'); //should never need this
+    Route::get('unsubscribe/{entity}/{invitation_key}', [App\Http\Controllers\ClientPortal\InvitationController::class, 'unsubscribe'])->name('unsubscribe');
 
 });
 
-Route::get('phantom/{entity}/{invitation_key}', '\App\Utils\PhantomJS\Phantom@displayInvitation')->middleware(['invite_db', 'phantom_secret'])->name('phantom_view');
+Route::get('phantom/{entity}/{invitation_key}', [Phantom::class, 'displayInvitation'])->middleware(['invite_db', 'phantom_secret'])->name('phantom_view');
 
-Route::fallback('BaseController@notFoundClient');
+Route::fallback([BaseController::class, 'notFoundClient']);
\ No newline at end of file
diff --git a/routes/contact.php b/routes/contact.php
index d1b7d13625a0..a0a586f9d3bd 100644
--- a/routes/contact.php
+++ b/routes/contact.php
@@ -1,5 +1,7 @@
 <?php
 
+use App\Http\Controllers\Contact;
+use Illuminate\Support\Facades\Route;
 
 /*
 |--------------------------------------------------------------------------
@@ -12,10 +14,10 @@
 |
 */
 
-Route::group(['middleware' => ['api_secret_check']], function () {
-    Route::post('api/v1/contact/login', 'Contact\LoginController@apiLogin');
+Route::middleware('api_secret_check')->group(function () {
+    Route::post('api/v1/contact/login', [Contact\LoginController::class, 'apiLogin']);
 });
 
-Route::group(['middleware' => ['contact_db', 'api_secret_check', 'contact_token_auth'], 'prefix' =>'api/v1/contact', 'as' => 'api.contact.'], function () {
-    Route::get('invoices', 'Contact\InvoiceController@index'); // name = (clients. index / create / show / update / destroy / edit
+Route::middleware('contact_db', 'api_secret_check', 'contact_token_auth')->prefix('api/v1/contact')->name('api.contact.')->group(function () {
+    Route::get('invoices', [Contact\InvoiceController::class, 'index']); // name = (clients. index / create / show / update / destroy / edit
 });
diff --git a/routes/shop.php b/routes/shop.php
index a522eecb1276..126510b7f674 100644
--- a/routes/shop.php
+++ b/routes/shop.php
@@ -1,13 +1,14 @@
 <?php
 
+use App\Http\Controllers\Shop;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['middleware' => ['company_key_db', 'locale'], 'prefix' => 'api/v1'], function () {
-    Route::get('shop/products', 'Shop\ProductController@index');
-    Route::post('shop/clients', 'Shop\ClientController@store');
-    Route::post('shop/invoices', 'Shop\InvoiceController@store');
-    Route::get('shop/client/{contact_key}', 'Shop\ClientController@show');
-    Route::get('shop/invoice/{invitation_key}', 'Shop\InvoiceController@show');
-    Route::get('shop/product/{product_key}', 'Shop\ProductController@show');
-    Route::get('shop/profile', 'Shop\ProfileController@show');
+Route::middleware('company_key_db', 'locale')->prefix('api/v1')->group(function () {
+    Route::get('shop/products', [Shop\ProductController::class, 'index']);
+    Route::post('shop/clients', [Shop\ClientController::class, 'store']);
+    Route::post('shop/invoices', [Shop\InvoiceController::class, 'store']);
+    Route::get('shop/client/{contact_key}', [Shop\ClientController::class, 'show']);
+    Route::get('shop/invoice/{invitation_key}', [Shop\InvoiceController::class, 'show']);
+    Route::get('shop/product/{product_key}', [Shop\ProductController::class, 'show']);
+    Route::get('shop/profile', [Shop\ProfileController::class, 'show']);
 });
diff --git a/routes/vendor.php b/routes/vendor.php
index b4b501391c33..b44e1b10c491 100644
--- a/routes/vendor.php
+++ b/routes/vendor.php
@@ -10,13 +10,16 @@
 |
 */
 use App\Http\Controllers\Auth\VendorContactLoginController;
+use App\Http\Controllers\BaseController;
 use App\Http\Controllers\VendorPortal\InvitationController;
 use App\Http\Controllers\VendorPortal\PurchaseOrderController;
 use App\Http\Controllers\VendorPortal\UploadController;
 use App\Http\Controllers\VendorPortal\VendorContactController;
+use App\Http\Controllers\VendorPortal\VendorContactHashLoginController;
 use Illuminate\Support\Facades\Route;
 
 Route::get('vendors', [VendorContactLoginController::class, 'catch'])->name('vendor.catchall')->middleware(['domain_db', 'contact_account','vendor_locale']); //catch all
+Route::get('vendor/key_login/{contact_key}', [VendorContactHashLoginController::class, 'login'])->name('contact_login')->middleware(['domain_db','vendor_contact_key_login']);
 
 Route::group(['middleware' => ['invite_db'], 'prefix' => 'vendor', 'as' => 'vendor.'], function () {
     /*Invitation catches*/
@@ -28,7 +31,6 @@ Route::group(['middleware' => ['invite_db'], 'prefix' => 'vendor', 'as' => 'vend
 
 });
 
-
 Route::group(['middleware' => ['auth:vendor', 'vendor_locale', 'domain_db'], 'prefix' => 'vendor', 'as' => 'vendor.'], function () {
 
     Route::get('dashboard', [PurchaseOrderController::class, 'index'])->name('dashboard');
@@ -42,9 +44,11 @@ Route::group(['middleware' => ['auth:vendor', 'vendor_locale', 'domain_db'], 'pr
     Route::get('logout', [VendorContactLoginController::class, 'logout'])->name('logout');
     Route::post('purchase_order/upload/{purchase_order}', [UploadController::class,'upload'])->name('upload.store');
 
+    Route::post('documents/download_multiple', [App\Http\Controllers\VendorPortal\DocumentController::class, 'downloadMultiple'])->name('documents.download_multiple');
+    Route::get('documents/{document}/download', [App\Http\Controllers\VendorPortal\DocumentController::class, 'download'])->name('documents.download');
+    Route::resource('documents', App\Http\Controllers\VendorPortal\DocumentController::class)->only(['index', 'show']);
+
 });
 
 
-
-
-Route::fallback('BaseController@notFoundVendor');
\ No newline at end of file
+Route::fallback([BaseController::class, 'notFoundVendor']);
diff --git a/routes/web.php b/routes/web.php
index 7ce739e80735..83ad812b4f1b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,47 +1,58 @@
 <?php
 
+use App\Http\Controllers\Auth\ForgotPasswordController;
+use App\Http\Controllers\Auth\LoginController;
+use App\Http\Controllers\Auth\ResetPasswordController;
+use App\Http\Controllers\BaseController;
+use App\Http\Controllers\ClientPortal\ApplePayDomainController;
+use App\Http\Controllers\Gateways\Checkout3dsController;
+use App\Http\Controllers\Gateways\GoCardlessController;
+use App\Http\Controllers\Gateways\Mollie3dsController;
+use App\Http\Controllers\SetupController;
+use App\Http\Controllers\StripeConnectController;
+use App\Http\Controllers\UserController;
+use App\Http\Controllers\WePayController;
 use Illuminate\Support\Facades\Route;
 
 //Auth::routes(['password.reset' => false]);
 
-Route::get('/', 'BaseController@flutterRoute')->middleware('guest');
-    // Route::get('self-update', 'SelfUpdateController@update')->middleware('guest');
+Route::get('/', [BaseController::class, 'flutterRoute'])->middleware('guest');
+    // Route::get('self-update', [SelfUpdateController::class, 'update'])->middleware('guest');
 
-Route::get('setup', 'SetupController@index')->middleware('guest');
-Route::post('setup', 'SetupController@doSetup')->middleware('guest');
-Route::get('update', 'SetupController@update')->middleware('guest');
+Route::get('setup', [SetupController::class, 'index'])->middleware('guest');
+Route::post('setup', [SetupController::class, 'doSetup'])->middleware('guest');
+Route::get('update', [SetupController::class, 'update'])->middleware('guest');
 
-Route::post('setup/check_db', 'SetupController@checkDB')->middleware('guest');
-Route::post('setup/check_mail', 'SetupController@checkMail')->middleware('guest');
-Route::post('setup/check_pdf', 'SetupController@checkPdf')->middleware('guest');
+Route::post('setup/check_db', [SetupController::class, 'checkDB'])->middleware('guest');
+Route::post('setup/check_mail', [SetupController::class, 'checkMail'])->middleware('guest');
+Route::post('setup/check_pdf', [SetupController::class, 'checkPdf'])->middleware('guest');
 
-Route::get('password/reset', 'Auth\ForgotPasswordController@showLinkRequestForm')->middleware('domain_db')->name('password.request');
-Route::post('password/email', 'Auth\ForgotPasswordController@sendResetLinkEmail')->name('password.email');
-Route::get('password/reset/{token}', 'Auth\ResetPasswordController@showResetForm')->middleware(['domain_db','email_db'])->name('password.reset');
-Route::post('password/reset', 'Auth\ResetPasswordController@reset')->middleware('email_db')->name('password.update');
+Route::get('password/reset', [ForgotPasswordController::class, 'showLinkRequestForm'])->middleware('domain_db')->name('password.request');
+Route::post('password/email', [ForgotPasswordController::class, 'sendResetLinkEmail'])->name('password.email');
+Route::get('password/reset/{token}', [ResetPasswordController::class, 'showResetForm'])->middleware(['domain_db', 'email_db'])->name('password.reset');
+Route::post('password/reset', [ResetPasswordController::class, 'reset'])->middleware('email_db')->name('password.update');
 
-Route::get('wepay/signup/{token}', 'WePayController@signup')->name('wepay.signup');
-Route::get('wepay/finished', 'WePayController@finished')->name('wepay.finished');
+Route::get('wepay/signup/{token}', [WePayController::class, 'signup'])->name('wepay.signup');
+Route::get('wepay/finished', [WePayController::class, 'finished'])->name('wepay.finished');
 
 /*
  * Social authentication
  */
 
-Route::get('auth/{provider}', 'Auth\LoginController@redirectToProvider');
-// Route::get('auth/{provider}/create', 'Auth\LoginController@redirectToProviderAndCreate');
+Route::get('auth/{provider}', [LoginController::class, 'redirectToProvider']);
 
 /*
  * Inbound routes requiring DB Lookup
  */
-Route::group(['middleware' => ['url_db']], function () {
-    Route::get('/user/confirm/{confirmation_code}', 'UserController@confirm');
-    Route::post('/user/confirm/{confirmation_code}', 'UserController@confirmWithPassword');
+Route::middleware('url_db')->group(function () {
+    Route::get('/user/confirm/{confirmation_code}', [UserController::class, 'confirm']);
+    Route::post('/user/confirm/{confirmation_code}', [UserController::class, 'confirmWithPassword']);
 });
 
-Route::get('stripe/signup/{token}', 'StripeConnectController@initialize')->name('stripe_connect.initialization');
-Route::get('stripe/completed', 'StripeConnectController@completed')->name('stripe_connect.return');
+Route::get('stripe/signup/{token}', [StripeConnectController::class, 'initialize'])->name('stripe_connect.initialization');
+Route::get('stripe/completed', [StripeConnectController::class, 'completed'])->name('stripe_connect.return');
 
-Route::get('checkout/3ds_redirect/{company_key}/{company_gateway_id}/{hash}', 'Gateways\Checkout3dsController@index')->middleware('domain_db')->name('checkout.3ds_redirect');
-Route::get('mollie/3ds_redirect/{company_key}/{company_gateway_id}/{hash}', 'Gateways\Mollie3dsController@index')->middleware('domain_db')->name('mollie.3ds_redirect');
-Route::get('gocardless/ibp_redirect/{company_key}/{company_gateway_id}/{hash}', 'Gateways\GoCardlessController@ibpRedirect')->middleware('domain_db')->name('gocardless.ibp_redirect');
-Route::get('.well-known/apple-developer-merchantid-domain-association', 'ClientPortal\ApplePayDomainController@showAppleMerchantId');
\ No newline at end of file
+Route::get('checkout/3ds_redirect/{company_key}/{company_gateway_id}/{hash}', [Checkout3dsController::class, 'index'])->middleware('domain_db')->name('checkout.3ds_redirect');
+Route::get('mollie/3ds_redirect/{company_key}/{company_gateway_id}/{hash}', [Mollie3dsController::class, 'index'])->middleware('domain_db')->name('mollie.3ds_redirect');
+Route::get('gocardless/ibp_redirect/{company_key}/{company_gateway_id}/{hash}', [GoCardlessController::class, 'ibpRedirect'])->middleware('domain_db')->name('gocardless.ibp_redirect');
+Route::get('.well-known/apple-developer-merchantid-domain-association', [ApplePayDomainController::class, 'showAppleMerchantId']);
diff --git a/server.php b/server.php
deleted file mode 100644
index 5fb6379e71f2..000000000000
--- a/server.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Laravel - A PHP Framework For Web Artisans
- *
- * @package  Laravel
- * @author   Taylor Otwell <taylor@laravel.com>
- */
-
-$uri = urldecode(
-    parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
-);
-
-// This file allows us to emulate Apache's "mod_rewrite" functionality from the
-// built-in PHP web server. This provides a convenient way to test a Laravel
-// application without having installed a "real" web server software here.
-if ($uri !== '/' && file_exists(__DIR__.'/public'.$uri)) {
-    return false;
-}
-
-require_once __DIR__.'/public/index.php';
diff --git a/tests/Browser/ClientPortal/Gateways/CheckoutCom/CreditCardTest.php b/tests/Browser/ClientPortal/Gateways/CheckoutCom/CreditCardTest.php
index b4a242719b56..214fe4bdd76d 100644
--- a/tests/Browser/ClientPortal/Gateways/CheckoutCom/CreditCardTest.php
+++ b/tests/Browser/ClientPortal/Gateways/CheckoutCom/CreditCardTest.php
@@ -106,8 +106,8 @@ class CreditCardTest extends DuskTestCase
                 ->assertSee('Payment method has been successfully removed.');
         });
     }
-    
-    public function testAddingCreditCardStandalone() 
+
+    public function testAddingCreditCardStandalone()
     {
         $this->browse(function (Browser $browser) {
             $browser
diff --git a/tests/Browser/ClientPortal/Gateways/Mollie/BancontactTest.php b/tests/Browser/ClientPortal/Gateways/Mollie/BancontactTest.php
index 659a8cae6594..417d8b8b4d53 100644
--- a/tests/Browser/ClientPortal/Gateways/Mollie/BancontactTest.php
+++ b/tests/Browser/ClientPortal/Gateways/Mollie/BancontactTest.php
@@ -14,8 +14,8 @@ namespace Tests\Browser\ClientPortal\Gateways\Mollie;
 
 use App\Models\CompanyGateway;
 use Laravel\Dusk\Browser;
-use Tests\DuskTestCase;
 use Tests\Browser\Pages\ClientPortal\Login;
+use Tests\DuskTestCase;
 
 class BancontactTest extends DuskTestCase
 {
diff --git a/tests/Browser/ClientPortal/Gateways/Mollie/BankTransferTest.php b/tests/Browser/ClientPortal/Gateways/Mollie/BankTransferTest.php
index 8feb940e928f..7aed496ea069 100644
--- a/tests/Browser/ClientPortal/Gateways/Mollie/BankTransferTest.php
+++ b/tests/Browser/ClientPortal/Gateways/Mollie/BankTransferTest.php
@@ -14,8 +14,8 @@ namespace Tests\Browser\ClientPortal\Gateways\Mollie;
 
 use App\Models\CompanyGateway;
 use Laravel\Dusk\Browser;
-use Tests\DuskTestCase;
 use Tests\Browser\Pages\ClientPortal\Login;
+use Tests\DuskTestCase;
 
 class BankTransferTest extends DuskTestCase
 {
diff --git a/tests/Browser/ClientPortal/Gateways/Mollie/IDEALTest.php b/tests/Browser/ClientPortal/Gateways/Mollie/IDEALTest.php
index b369fc30248f..07afa9443d6e 100644
--- a/tests/Browser/ClientPortal/Gateways/Mollie/IDEALTest.php
+++ b/tests/Browser/ClientPortal/Gateways/Mollie/IDEALTest.php
@@ -14,8 +14,8 @@ namespace Tests\Browser\ClientPortal\Gateways\Mollie;
 
 use App\Models\CompanyGateway;
 use Laravel\Dusk\Browser;
-use Tests\DuskTestCase;
 use Tests\Browser\Pages\ClientPortal\Login;
+use Tests\DuskTestCase;
 
 class IDEALTest extends DuskTestCase
 {
@@ -103,4 +103,4 @@ class IDEALTest extends DuskTestCase
                 ->waitForText('Cancelled.');
         });
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Browser/ClientPortal/Gateways/Mollie/KBCTest.php b/tests/Browser/ClientPortal/Gateways/Mollie/KBCTest.php
index a8be7b6cbf9f..286d421b93c1 100644
--- a/tests/Browser/ClientPortal/Gateways/Mollie/KBCTest.php
+++ b/tests/Browser/ClientPortal/Gateways/Mollie/KBCTest.php
@@ -14,8 +14,8 @@ namespace Tests\Browser\ClientPortal\Gateways\Mollie;
 
 use App\Models\CompanyGateway;
 use Laravel\Dusk\Browser;
-use Tests\DuskTestCase;
 use Tests\Browser\Pages\ClientPortal\Login;
+use Tests\DuskTestCase;
 
 class KBCTest extends DuskTestCase
 {
@@ -86,4 +86,4 @@ class KBCTest extends DuskTestCase
                 ->waitForText('Cancelled.');
         });
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Browser/ClientPortal/Gateways/Stripe/AlipayTest.php b/tests/Browser/ClientPortal/Gateways/Stripe/AlipayTest.php
index 7a6a4630b8e2..68f7435ce425 100644
--- a/tests/Browser/ClientPortal/Gateways/Stripe/AlipayTest.php
+++ b/tests/Browser/ClientPortal/Gateways/Stripe/AlipayTest.php
@@ -67,6 +67,6 @@ class AlipayTest extends DuskTestCase
                 ->waitForText('Alipay test payment page', 120)
                 ->press('.common-Button.common-Button--default')
                 ->waitForText('Details of the payment', 60);
-      });
+        });
     }
 }
diff --git a/tests/Browser/ClientPortal/Gateways/Stripe/BancontactTest.php b/tests/Browser/ClientPortal/Gateways/Stripe/BancontactTest.php
index 8a517cd0d29a..52cf83069422 100644
--- a/tests/Browser/ClientPortal/Gateways/Stripe/BancontactTest.php
+++ b/tests/Browser/ClientPortal/Gateways/Stripe/BancontactTest.php
@@ -67,4 +67,5 @@ class BancontactTest extends DuskTestCase
                 ->press('.common-Button.common-Button--default')
                 ->waitForText('Details of the payment', 60);
         });
-}}
+    }
+}
diff --git a/tests/Browser/ClientPortal/Gateways/Stripe/SEPATest.php b/tests/Browser/ClientPortal/Gateways/Stripe/SEPATest.php
index 3bc617bc7eba..bf30be28cae0 100644
--- a/tests/Browser/ClientPortal/Gateways/Stripe/SEPATest.php
+++ b/tests/Browser/ClientPortal/Gateways/Stripe/SEPATest.php
@@ -7,7 +7,7 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace Tests\Browser\ClientPortal\Gateways\Stripe;
@@ -53,7 +53,7 @@ class SEPATest extends DuskTestCase
         $client->country_id = 276;
 
         $settings = $client->settings;
-        $settings->currency_id = "3";
+        $settings->currency_id = '3';
 
         $client->settings = $settings;
         $client->save();
diff --git a/tests/Browser/ClientPortal/Gateways/Stripe/SofortTest.php b/tests/Browser/ClientPortal/Gateways/Stripe/SofortTest.php
index a8a0fe88d548..d892cc4cc879 100644
--- a/tests/Browser/ClientPortal/Gateways/Stripe/SofortTest.php
+++ b/tests/Browser/ClientPortal/Gateways/Stripe/SofortTest.php
@@ -67,6 +67,6 @@ class SofortTest extends DuskTestCase
                 ->waitForText('Sofort test payment page', 120)
                 ->press('.common-Button.common-Button--default')
                 ->waitForText('Details of the payment', 60);
-      });
+        });
     }
 }
diff --git a/tests/Browser/ClientPortal/Gateways/WePay/ACHTest.php b/tests/Browser/ClientPortal/Gateways/WePay/ACHTest.php
index 25e405429747..a043a483f0b6 100644
--- a/tests/Browser/ClientPortal/Gateways/WePay/ACHTest.php
+++ b/tests/Browser/ClientPortal/Gateways/WePay/ACHTest.php
@@ -40,7 +40,7 @@ class ACHTest extends DuskTestCase
 
         $cg->fees_and_limits = $fees_and_limits;
         $cg->save();
-        
+
         $this->browse(function (Browser $browser) {
             $browser
                 ->visit(new Login())
@@ -59,4 +59,4 @@ class ACHTest extends DuskTestCase
                 ->assertSee('To pay with a bank account, first you have to add it as payment method.');
         });
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Browser/ClientPortal/ProfileSettingsTest.php b/tests/Browser/ClientPortal/ProfileSettingsTest.php
index ff567c60dfbb..7ef244eaf73b 100644
--- a/tests/Browser/ClientPortal/ProfileSettingsTest.php
+++ b/tests/Browser/ClientPortal/ProfileSettingsTest.php
@@ -46,10 +46,10 @@ class ProfileSettingsTest extends DuskTestCase
     public function testClientDetailsUpdate()
     {
         $original = [
-            'name' => $this->faker->name,
-            'vat_number' => (string)$this->faker->randomNumber(6),
-            'phone' => $this->faker->phoneNumber,
-            'website' => $this->faker->url,
+            'name' => $this->faker->name(),
+            'vat_number' => (string) $this->faker->randomNumber(6),
+            'phone' => $this->faker->phoneNumber(),
+            'website' => $this->faker->url(),
         ];
 
         $this->browse(function (Browser $browser) use ($original) {
@@ -75,7 +75,7 @@ class ProfileSettingsTest extends DuskTestCase
                 'name' => $browser->value('#client_name'),
                 'vat_number' => $browser->value('#client_vat_number'),
                 'phone' => $browser->value('#client_phone'),
-                'website' => $browser->value('#client_website')
+                'website' => $browser->value('#client_website'),
             ];
 
             $this->assertSame($original, $updated);
@@ -85,10 +85,10 @@ class ProfileSettingsTest extends DuskTestCase
     public function testContactDetailsUpdate()
     {
         $original = [
-            'first_name' => $this->faker->firstName,
-            'last_name' => $this->faker->lastName,
+            'first_name' => $this->faker->firstName(),
+            'last_name' => $this->faker->lastName(),
             'email_address' => 'user@example.com',
-            'phone' => $this->faker->phoneNumber,
+            'phone' => $this->faker->phoneNumber(),
         ];
 
         $this->browse(function (Browser $browser) use ($original) {
@@ -125,11 +125,11 @@ class ProfileSettingsTest extends DuskTestCase
     public function testBillingAddressUpdate()
     {
         $original = [
-            'street' => $this->faker->streetName,
-            'apt' => $this->faker->streetAddress,
-            'city' => $this->faker->city,
-            'state' => $this->faker->state,
-            'postal_code' => $this->faker->postcode,
+            'street' => $this->faker->streetName(),
+            'apt' => $this->faker->streetAddress(),
+            'city' => $this->faker->city(),
+            'state' => $this->faker->state(),
+            'postal_code' => $this->faker->postcode(),
         ];
 
         $this->browse(function (Browser $browser) use ($original) {
@@ -168,11 +168,11 @@ class ProfileSettingsTest extends DuskTestCase
     public function testShippingAddressUpdate()
     {
         $original = [
-            'street' => $this->faker->streetName,
-            'apt' => $this->faker->streetAddress,
-            'city' => $this->faker->city,
-            'state' => $this->faker->state,
-            'postal_code' => $this->faker->postcode,
+            'street' => $this->faker->streetName(),
+            'apt' => $this->faker->streetAddress(),
+            'city' => $this->faker->city(),
+            'state' => $this->faker->state(),
+            'postal_code' => $this->faker->postcode(),
         ];
 
         $this->browse(function (Browser $browser) use ($original) {
diff --git a/tests/DuskTestCase.php b/tests/DuskTestCase.php
index a7cdfe734de8..7521085d9880 100644
--- a/tests/DuskTestCase.php
+++ b/tests/DuskTestCase.php
@@ -20,7 +20,7 @@ abstract class DuskTestCase extends BaseTestCase
      */
     public static function prepare()
     {
-        if (!static::runningInSail()) {
+        if (! static::runningInSail()) {
             static::startChromeDriver();
         }
     }
diff --git a/tests/Feature/Account/AccountEmailQuotaTest.php b/tests/Feature/Account/AccountEmailQuotaTest.php
index efd89b9190fa..ddd4dfaa298a 100644
--- a/tests/Feature/Account/AccountEmailQuotaTest.php
+++ b/tests/Feature/Account/AccountEmailQuotaTest.php
@@ -24,10 +24,10 @@ use App\Models\User;
 use App\Utils\Traits\AppSetup;
 use Faker\Factory;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Cache;
 use Livewire\Livewire;
 use Tests\MockAccountData;
 use Tests\TestCase;
-use Illuminate\Support\Facades\Cache;
 
 class AccountEmailQuotaTest extends TestCase
 {
@@ -35,7 +35,7 @@ class AccountEmailQuotaTest extends TestCase
     use AppSetup;
     use MockAccountData;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -51,12 +51,10 @@ class AccountEmailQuotaTest extends TestCase
         $this->assertFalse($this->account->emailQuotaExceeded());
     }
 
-
     public function testQuotaInValidRule()
     {
         Cache::increment($this->account->key, 3000);
 
         $this->assertTrue($this->account->emailQuotaExceeded());
     }
-
 }
diff --git a/tests/Feature/ActivityApiTest.php b/tests/Feature/ActivityApiTest.php
index fcc47f0b48cf..c5e6c6cbaaa1 100644
--- a/tests/Feature/ActivityApiTest.php
+++ b/tests/Feature/ActivityApiTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -24,7 +25,7 @@ class ActivityApiTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -38,9 +39,9 @@ class ActivityApiTest extends TestCase
     public function testActivityGet()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/activities/');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/activities/');
 
         $response->assertStatus(200);
     }
diff --git a/tests/Feature/ApplePayDomainMerchantUrlTest.php b/tests/Feature/ApplePayDomainMerchantUrlTest.php
index 78959d964f31..8082bd3f131a 100644
--- a/tests/Feature/ApplePayDomainMerchantUrlTest.php
+++ b/tests/Feature/ApplePayDomainMerchantUrlTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Models\CompanyGateway;
@@ -25,7 +26,7 @@ class ApplePayDomainMerchantUrlTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -38,15 +39,14 @@ class ApplePayDomainMerchantUrlTest extends TestCase
 
     public function testMerchantFieldGet()
     {
-        
-        if (! config('ninja.testvars.stripe')) {
+        // if (! config('ninja.testvars.stripe')) {
             $this->markTestSkipped('Skip test no company gateways installed');
-        }
+        // }
 
         $config = new \stdClass;
-        $config->publishableKey = "pk_test";
-        $config->apiKey = "sk_test";
-        $config->appleDomainVerification = "merchant_id";
+        $config->publishableKey = 'pk_test';
+        $config->apiKey = 'sk_test';
+        $config->appleDomainVerification = 'merchant_id';
 
         $cg = new CompanyGateway;
         $cg->company_id = $this->company->id;
@@ -56,7 +56,7 @@ class ApplePayDomainMerchantUrlTest extends TestCase
         $cg->require_billing_address = true;
         $cg->require_shipping_address = true;
         $cg->update_details = true;
-        $cg->config = encrypt(json_encode($config));
+        $cg->setConfig($config);
         $cg->fees_and_limits = '';
         $cg->save();
 
@@ -64,7 +64,7 @@ class ApplePayDomainMerchantUrlTest extends TestCase
 
         $arr = $response->getContent();
         $response->assertStatus(200);
-        $this->assertEquals("merchant_id", $arr);
+        $this->assertEquals('merchant_id', $arr);
     }
 
     public function testDomainParsing()
@@ -86,7 +86,5 @@ class ApplePayDomainMerchantUrlTest extends TestCase
         $parsed = parse_url($domain);
 
         $this->assertEquals('ninja.test', $parsed['host']);
-
-
     }
 }
diff --git a/tests/Feature/CancelInvoiceTest.php b/tests/Feature/CancelInvoiceTest.php
index 44a6eef682ef..d895ac3926ce 100644
--- a/tests/Feature/CancelInvoiceTest.php
+++ b/tests/Feature/CancelInvoiceTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Models\Invoice;
@@ -28,7 +29,7 @@ class CancelInvoiceTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Feature/Client/ClientMergeTest.php b/tests/Feature/Client/ClientMergeTest.php
index c990b2013375..dc6f1806c43c 100644
--- a/tests/Feature/Client/ClientMergeTest.php
+++ b/tests/Feature/Client/ClientMergeTest.php
@@ -31,7 +31,7 @@ class ClientMergeTest extends TestCase
 {
     use DatabaseTransactions;
     use AppSetup;
-    
+
     private $user;
 
     private $company;
@@ -42,7 +42,7 @@ class ClientMergeTest extends TestCase
 
     private $primary_contact;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -52,23 +52,22 @@ class ClientMergeTest extends TestCase
 
     public function testSearchingForContacts()
     {
-
         $account = Account::factory()->create();
 
         $this->user = User::factory()->create([
-            'account_id' => $account->id, 
-            'email' => $this->faker->safeEmail
+            'account_id' => $account->id,
+            'email' => $this->faker->safeEmail(),
         ]);
 
         $this->company = Company::factory()->create([
-            'account_id' => $account->id
+            'account_id' => $account->id,
         ]);
 
         $this->client = Client::factory()->create([
-            'user_id' => $this->user->id, 
-            'company_id' => $this->company->id
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
         ]);
-            
+
         $this->primary_contact = ClientContact::factory()->create([
             'user_id' => $this->user->id,
             'client_id' => $this->client->id,
@@ -86,40 +85,37 @@ class ClientMergeTest extends TestCase
             'user_id' => $this->user->id,
             'client_id' => $this->client->id,
             'company_id' => $this->company->id,
-            'email' => 'search@gmail.com'
+            'email' => 'search@gmail.com',
         ]);
 
-
         $this->assertEquals(4, $this->client->contacts->count());
         $this->assertTrue($this->client->contacts->contains(function ($contact) {
             return $contact->email == 'search@gmail.com';
         }));
-        
+
         $this->assertFalse($this->client->contacts->contains(function ($contact) {
             return $contact->email == 'false@gmail.com';
         }));
-
     }
 
     public function testMergeClients()
     {
-
         $account = Account::factory()->create();
 
         $user = User::factory()->create([
-            'account_id' => $account->id, 
-            'email' => $this->faker->safeEmail
+            'account_id' => $account->id,
+            'email' => $this->faker->safeEmail(),
         ]);
 
         $company = Company::factory()->create([
-            'account_id' => $account->id
+            'account_id' => $account->id,
         ]);
 
         $client = Client::factory()->create([
-            'user_id' => $user->id, 
-            'company_id' => $company->id
+            'user_id' => $user->id,
+            'company_id' => $company->id,
         ]);
-            
+
         $primary_contact = ClientContact::factory()->create([
             'user_id' => $user->id,
             'client_id' => $client->id,
@@ -137,15 +133,15 @@ class ClientMergeTest extends TestCase
             'user_id' => $user->id,
             'client_id' => $client->id,
             'company_id' => $company->id,
-            'email' => 'search@gmail.com'
+            'email' => 'search@gmail.com',
         ]);
         //4contacts
 
         $mergable_client = Client::factory()->create([
-            'user_id' => $user->id, 
-            'company_id' => $company->id
+            'user_id' => $user->id,
+            'company_id' => $company->id,
         ]);
-            
+
         $primary_contact = ClientContact::factory()->create([
             'user_id' => $user->id,
             'client_id' => $mergable_client->id,
@@ -163,7 +159,7 @@ class ClientMergeTest extends TestCase
             'user_id' => $user->id,
             'client_id' => $mergable_client->id,
             'company_id' => $company->id,
-            'email' => 'search@gmail.com'
+            'email' => 'search@gmail.com',
         ]);
         //4 contacts
 
@@ -171,10 +167,8 @@ class ClientMergeTest extends TestCase
         $this->assertEquals(4, $mergable_client->contacts->count());
 
         $client = $client->service()->merge($mergable_client)->save();
-        
+
         // nlog($client->contacts->fresh()->toArray());
         // $this->assertEquals(7, $client->fresh()->contacts->count());
-
     }
-
 }
diff --git a/tests/Feature/ClientApiTest.php b/tests/Feature/ClientApiTest.php
index aad629878fd5..6ea5af053c29 100644
--- a/tests/Feature/ClientApiTest.php
+++ b/tests/Feature/ClientApiTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Models\Country;
@@ -29,7 +30,7 @@ class ClientApiTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -45,24 +46,24 @@ class ClientApiTest extends TestCase
     public function testIllegalPropertiesInClientSettings()
     {
         $settings = [
-            'currency_id' => "1",
+            'currency_id' => '1',
             'translations' => [
-                'email' => 'legal@eagle.com'
+                'email' => 'legal@eagle.com',
             ],
         ];
 
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'settings' => $settings,
         ];
 
         $response = false;
 
-        try{
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/clients/', $data);
+        try {
+            $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
@@ -70,26 +71,25 @@ class ClientApiTest extends TestCase
 
         $response->assertStatus(200);
         $arr = $response->json();
-        $this->assertFalse(array_key_exists('translations', $arr['data']['settings']));
 
+        $this->assertFalse(array_key_exists('translations', $arr['data']['settings']));
     }
 
     public function testClientLanguageCodeIllegal()
     {
-
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'id_number' => 'Coolio',
-            'language_code' => 'not_really_a_VALID-locale'
+            'language_code' => 'not_really_a_VALID-locale',
         ];
 
         $response = false;
 
-        try{
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/clients/', $data);
+        try {
+            $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
@@ -100,26 +100,23 @@ class ClientApiTest extends TestCase
         $arr = $response->json();
 
         $this->assertFalse(array_key_exists('language_id', $arr['data']['settings']));
-
     }
 
-
     public function testClientLanguageCodeValidationTrue()
     {
-
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'id_number' => 'Coolio',
-            'language_code' => 'de'
+            'language_code' => 'de',
         ];
 
         $response = false;
 
-        try{
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/clients/', $data);
+        try {
+            $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
@@ -129,121 +126,105 @@ class ClientApiTest extends TestCase
 
         $arr = $response->json();
 
-        $this->assertEquals("3", $arr['data']['settings']['language_id']);
-
+        $this->assertEquals('3', $arr['data']['settings']['language_id']);
     }
 
-
     public function testClientCountryCodeValidationTrue()
     {
-
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'id_number' => 'Coolio',
-            'country_code' => 'AM'
+            'country_code' => 'AM',
         ];
 
         $response = false;
 
-        try{
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/clients/', $data);
+        try {
+            $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
         }
 
         $response->assertStatus(200);
-
     }
 
-
     public function testClientNoneValidation()
     {
-
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'number' => '',
         ];
 
         $response = false;
 
-        try{
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/clients/', $data);
+        try {
+            $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
         }
 
         $response->assertStatus(200);
-
     }
 
-
     public function testClientNullValidation()
     {
-
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'number' => null,
         ];
 
         $response = false;
 
-        try{
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/clients/', $data);
+        try {
+            $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
         }
 
         $response->assertStatus(200);
-
     }
 
-
     public function testClientCountryCodeValidationTrueIso3()
     {
-
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'id_number' => 'Coolio',
-            'country_code' => 'ARM'
+            'country_code' => 'ARM',
         ];
 
         $response = false;
 
-        try{
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/clients/', $data);
+        try {
+            $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
         }
 
         $response->assertStatus(200);
-
     }
 
-
-
     public function testClientCountryCodeValidationFalse()
     {
-
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'id_number' => 'Coolio',
-            'country_code' => 'AdfdfdfM'
+            'country_code' => 'AdfdfdfM',
         ];
 
         $response = $this->withHeaders([
@@ -252,19 +233,18 @@ class ClientApiTest extends TestCase
         ])->post('/api/v1/clients/', $data);
 
         $response->assertStatus(302);
-
     }
 
     public function testClientPost()
     {
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/clients', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/clients', $data);
 
         $response->assertStatus(200);
     }
@@ -272,43 +252,43 @@ class ClientApiTest extends TestCase
     public function testDuplicateNumberCatch()
     {
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'number' => 'iamaduplicate',
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/clients', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/clients', $data);
 
-        $response->assertStatus(200);   
+        $response->assertStatus(200);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/clients', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/clients', $data);
 
-        $response->assertStatus(302);       
+        $response->assertStatus(302);
     }
 
     public function testClientPut()
     {
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'id_number' => 'Coolio',
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/clients/'.$this->encodePrimaryKey($this->client->id), $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/clients/'.$this->encodePrimaryKey($this->client->id), $data);
 
         $response->assertStatus(200);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/clients/'.$this->encodePrimaryKey($this->client->id), $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/clients/'.$this->encodePrimaryKey($this->client->id), $data);
 
         $response->assertStatus(200);
 
@@ -323,9 +303,9 @@ class ClientApiTest extends TestCase
     public function testClientGet()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/clients/'.$this->encodePrimaryKey($this->client->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/clients/'.$this->encodePrimaryKey($this->client->id));
 
         $response->assertStatus(200);
     }
@@ -333,9 +313,9 @@ class ClientApiTest extends TestCase
     public function testClientNotArchived()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/clients/'.$this->encodePrimaryKey($this->client->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/clients/'.$this->encodePrimaryKey($this->client->id));
 
         $arr = $response->json();
 
@@ -349,9 +329,9 @@ class ClientApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/clients/bulk?action=archive', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/clients/bulk?action=archive', $data);
 
         $arr = $response->json();
 
@@ -365,9 +345,9 @@ class ClientApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/clients/bulk?action=restore', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/clients/bulk?action=restore', $data);
 
         $arr = $response->json();
 
@@ -381,9 +361,9 @@ class ClientApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/clients/bulk?action=delete', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/clients/bulk?action=delete', $data);
 
         $arr = $response->json();
 
@@ -392,42 +372,33 @@ class ClientApiTest extends TestCase
 
     public function testClientCurrencyCodeValidationTrue()
     {
-
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'id_number' => 'Coolio',
-            'currency_code' => 'USD'
+            'currency_code' => 'USD',
         ];
 
-
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
         ])->post('/api/v1/clients/', $data);
 
         $response->assertStatus(200);
-
     }
 
     public function testClientCurrencyCodeValidationFalse()
     {
-
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'id_number' => 'Coolio',
-            'currency_code' => 'R'
+            'currency_code' => 'R',
         ];
 
-
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
         ])->post('/api/v1/clients/', $data);
 
         $response->assertStatus(302);
-
     }
-
-
-
 }
diff --git a/tests/Feature/ClientDeletedInvoiceCreationTest.php b/tests/Feature/ClientDeletedInvoiceCreationTest.php
index ee6fa3865812..4d8f0ef6fa45 100644
--- a/tests/Feature/ClientDeletedInvoiceCreationTest.php
+++ b/tests/Feature/ClientDeletedInvoiceCreationTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Models\Client;
@@ -30,7 +31,7 @@ class ClientDeletedInvoiceCreationTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -45,7 +46,7 @@ class ClientDeletedInvoiceCreationTest extends TestCase
 
     public function testClientedDeletedAttemptingToCreateInvoice()
     {
-                /* Test fire new invoice */
+        /* Test fire new invoice */
         $data = [
             'client_id' => $this->client->hashed_id,
             'number' => 'dude',
@@ -60,7 +61,6 @@ class ClientDeletedInvoiceCreationTest extends TestCase
         $this->client->is_deleted = true;
         $this->client->save();
 
-
         $data = [
             'client_id' => $this->client->hashed_id,
             'number' => 'dude2',
@@ -71,8 +71,5 @@ class ClientDeletedInvoiceCreationTest extends TestCase
             'X-API-TOKEN' => $this->token,
         ])->post('/api/v1/invoices/', $data)
         ->assertStatus(302);
-
-
     }
-
 }
diff --git a/tests/Feature/ClientGatewayTokenApiTest.php b/tests/Feature/ClientGatewayTokenApiTest.php
index 4d396a370321..196424e7272b 100644
--- a/tests/Feature/ClientGatewayTokenApiTest.php
+++ b/tests/Feature/ClientGatewayTokenApiTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Models\CompanyGateway;
@@ -29,7 +30,7 @@ class ClientGatewayTokenApiTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -106,21 +107,18 @@ class ClientGatewayTokenApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/client_gateway_tokens', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/client_gateway_tokens', $data);
 
         $response->assertStatus(200);
         $arr = $response->json();
 
         $this->assertNotNull($arr['data']['token']);
-
     }
 
     public function testClientPut()
     {
-
-
         $data = [
             'client_id' => $this->client->hashed_id,
             'company_gateway_id' => $this->cg->hashed_id,
@@ -129,9 +127,9 @@ class ClientGatewayTokenApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/client_gateway_tokens', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/client_gateway_tokens', $data);
 
         $arr = $response->json();
 
@@ -142,9 +140,9 @@ class ClientGatewayTokenApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/client_gateway_tokens/'.$arr['data']['id'], $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/client_gateway_tokens/'.$arr['data']['id'], $data);
 
         $response->assertStatus(200);
 
@@ -155,7 +153,6 @@ class ClientGatewayTokenApiTest extends TestCase
 
     public function testClientGet()
     {
-
         $data = [
             'client_id' => $this->client->hashed_id,
             'company_gateway_id' => $this->cg->hashed_id,
@@ -164,18 +161,17 @@ class ClientGatewayTokenApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/client_gateway_tokens', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/client_gateway_tokens', $data);
 
         $arr = $response->json();
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/client_gateway_tokens/'.$arr['data']['id']);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/client_gateway_tokens/'.$arr['data']['id']);
 
         $response->assertStatus(200);
     }
-
 }
diff --git a/tests/Feature/ClientModelTest.php b/tests/Feature/ClientModelTest.php
index 4566c8959ad9..246e7b27f23e 100644
--- a/tests/Feature/ClientModelTest.php
+++ b/tests/Feature/ClientModelTest.php
@@ -6,7 +6,7 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace Tests\Feature;
@@ -26,7 +26,7 @@ class ClientModelTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -50,7 +50,5 @@ class ClientModelTest extends TestCase
         $this->assertGreaterThan(0, CompanyGateway::count());
 
         $this->assertEquals(1, count($payment_methods));
-
     }
-
 }
diff --git a/tests/Feature/ClientPortal/CreditsTest.php b/tests/Feature/ClientPortal/CreditsTest.php
index 4846883d7809..178a766b6b2e 100644
--- a/tests/Feature/ClientPortal/CreditsTest.php
+++ b/tests/Feature/ClientPortal/CreditsTest.php
@@ -25,15 +25,15 @@ use App\Utils\Traits\AppSetup;
 use Faker\Factory;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Livewire\Livewire;
-use Tests\TestCase;
 use function now;
+use Tests\TestCase;
 
 class CreditsTest extends TestCase
 {
     use DatabaseTransactions;
     use AppSetup;
-    
-    public function setUp(): void
+
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -46,18 +46,18 @@ class CreditsTest extends TestCase
         $account = Account::factory()->create();
 
         $user = User::factory()->create(
-            ['account_id' => $account->id, 'email' => $this->faker->safeEmail]
+            ['account_id' => $account->id, 'email' => $this->faker->safeEmail()]
         );
 
         $company = Company::factory()->create(['account_id' => $account->id]);
         $company->settings = CompanySettings::defaults();
-        $company->settings->language_id = "1";
+        $company->settings->language_id = '1';
         $company->save();
 
         $client = Client::factory()->create(['company_id' => $company->id, 'user_id' => $user->id]);
         $client->settings = ClientSettings::defaults();
         $settings = $client->settings;
-        $settings->language_id = "1";
+        $settings->language_id = '1';
         $client->settings = $settings;
         $client->save();
 
@@ -111,16 +111,15 @@ class CreditsTest extends TestCase
         $account = Account::factory()->create();
 
         $user = User::factory()->create(
-            ['account_id' => $account->id, 'email' => $this->faker->safeEmail]
+            ['account_id' => $account->id, 'email' => $this->faker->safeEmail()]
         );
 
         $company = Company::factory()->create(['account_id' => $account->id]);
 
-
         $client = Client::factory()->create(['company_id' => $company->id, 'user_id' => $user->id]);
         $client->settings = ClientSettings::defaults();
         $settings = $client->settings;
-        $settings->language_id = "1";
+        $settings->language_id = '1';
         $client->settings = $settings;
         $client->save();
 
@@ -173,5 +172,4 @@ class CreditsTest extends TestCase
             ->assertSee('testing-number-02')
             ->assertSee('testing-number-03');
     }
-
 }
diff --git a/tests/Feature/ClientPortal/InvoicesTest.php b/tests/Feature/ClientPortal/InvoicesTest.php
index 01a45444c23f..084961223df3 100644
--- a/tests/Feature/ClientPortal/InvoicesTest.php
+++ b/tests/Feature/ClientPortal/InvoicesTest.php
@@ -12,7 +12,6 @@
 
 namespace Tests\Feature\ClientPortal;
 
-
 use App\DataMapper\ClientSettings;
 use App\Http\Livewire\InvoicesTable;
 use App\Models\Account;
@@ -31,14 +30,13 @@ class InvoicesTest extends TestCase
 {
     use DatabaseTransactions;
     use AppSetup;
-    
-    public function setUp(): void
+
+    protected function setUp(): void
     {
         parent::setUp();
 
         $this->faker = Factory::create();
         $this->buildCache(true);
-
     }
 
     public function testInvoiceTableFilters()
@@ -46,16 +44,16 @@ class InvoicesTest extends TestCase
         $account = Account::factory()->create();
 
         $user = User::factory()->create(
-            ['account_id' => $account->id, 'email' => $this->faker->safeEmail]
+            ['account_id' => $account->id, 'email' => $this->faker->safeEmail()]
         );
 
         $company = Company::factory()->create(['account_id' => $account->id]);
-        $company->settings->language_id = "1";
+        $company->settings->language_id = '1';
         $company->save();
 
         $client = Client::factory()->create(['company_id' => $company->id, 'user_id' => $user->id]);
         $settings = $client->settings;
-        $settings->language_id = "1";
+        $settings->language_id = '1';
         $client->settings = $settings;
         $client->save();
 
diff --git a/tests/Feature/ClientPresenterTest.php b/tests/Feature/ClientPresenterTest.php
index 5b340de61c5f..22e6d132ef68 100644
--- a/tests/Feature/ClientPresenterTest.php
+++ b/tests/Feature/ClientPresenterTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -23,7 +24,7 @@ class ClientPresenterTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Feature/ClientTest.php b/tests/Feature/ClientTest.php
index f93bb3bf3c25..934bd32418e2 100644
--- a/tests/Feature/ClientTest.php
+++ b/tests/Feature/ClientTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\DataMapper\CompanySettings;
@@ -38,7 +39,7 @@ class ClientTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -117,9 +118,9 @@ class ClientTest extends TestCase
     public function testClientList()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/clients');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/clients');
 
         $response->assertStatus(200);
     }
@@ -145,16 +146,16 @@ class ClientTest extends TestCase
         });
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/clients/'.$this->encodePrimaryKey($this->client->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/clients/'.$this->encodePrimaryKey($this->client->id));
 
         $response->assertStatus(200);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/clients/'.$this->encodePrimaryKey($this->client->id).'/edit');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/clients/'.$this->encodePrimaryKey($this->client->id).'/edit');
 
         $response->assertStatus(200);
 
@@ -163,15 +164,15 @@ class ClientTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/clients/'.$this->encodePrimaryKey($this->client->id), $client_update)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/clients/'.$this->encodePrimaryKey($this->client->id), $client_update)
             ->assertStatus(200);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->delete('/api/v1/clients/'.$this->encodePrimaryKey($this->client->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->delete('/api/v1/clients/'.$this->encodePrimaryKey($this->client->id));
 
         $response->assertStatus(200);
 
@@ -191,9 +192,9 @@ class ClientTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/clients/'.$this->encodePrimaryKey($this->client->id), $client_update)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/clients/'.$this->encodePrimaryKey($this->client->id), $client_update)
             ->assertStatus(400);
     }
 
@@ -201,8 +202,8 @@ class ClientTest extends TestCase
     {
         $account = Account::factory()->create();
         $company = Company::factory()->create([
-                    'account_id' => $account->id,
-                     ]);
+            'account_id' => $account->id,
+        ]);
 
         $account->default_company_id = $company->id;
         $account->save();
@@ -214,13 +215,13 @@ class ClientTest extends TestCase
         ]);
 
         $userPermissions = collect([
-                                    'view_invoice',
-                                    'view_client',
-                                    'edit_client',
-                                    'edit_invoice',
-                                    'create_invoice',
-                                    'create_client',
-                                ]);
+            'view_invoice',
+            'view_client',
+            'edit_client',
+            'edit_invoice',
+            'create_invoice',
+            'create_client',
+        ]);
 
         $userSettings = DefaultSettings::userSettings();
 
@@ -236,17 +237,17 @@ class ClientTest extends TestCase
 
         Client::factory()->count(3)->create(['user_id' => $user->id, 'company_id' => $company->id])->each(function ($c) use ($user, $company) {
             ClientContact::factory()->create([
-                    'user_id' => $user->id,
-                    'client_id' => $c->id,
-                    'company_id' => $company->id,
-                    'is_primary' => 1,
-                ]);
+                'user_id' => $user->id,
+                'client_id' => $c->id,
+                'company_id' => $company->id,
+                'is_primary' => 1,
+            ]);
 
             ClientContact::factory()->count(2)->create([
-                    'user_id' => $user->id,
-                    'client_id' => $c->id,
-                    'company_id' => $company->id,
-                ]);
+                'user_id' => $user->id,
+                'client_id' => $c->id,
+                'company_id' => $company->id,
+            ]);
         });
 
         $this->client = Client::whereUserId($user->id)->whereCompanyId($company->id)->first();
@@ -265,31 +266,30 @@ class ClientTest extends TestCase
 
     public function testClientCreationWithIllegalContactObject()
     {
-
         $account = Account::factory()->create();
         $company = Company::factory()->create([
-                    'account_id' => $account->id,
-                     ]);
+            'account_id' => $account->id,
+        ]);
 
         $account->default_company_id = $company->id;
         $account->save();
 
         $user = User::factory()->create([
-                'account_id' => $account->id,
-                'confirmation_code' => $this->createDbHash(config('database.default')),
-                'email' => 'whiz@gmail.com',
+            'account_id' => $account->id,
+            'confirmation_code' => $this->createDbHash(config('database.default')),
+            'email' => 'whiz@gmail.com',
 
-            ]);
+        ]);
 
         $user->companies()->attach($company->id, [
-                'account_id' => $account->id,
-                'is_owner' => 1,
-                'is_admin' => 1,
-                'notifications' => CompanySettings::notificationDefaults(),
-                'permissions' => '',
-                'settings' => '',
-                'is_locked' => 0,
-            ]);
+            'account_id' => $account->id,
+            'is_owner' => 1,
+            'is_admin' => 1,
+            'notifications' => CompanySettings::notificationDefaults(),
+            'permissions' => '',
+            'settings' => '',
+            'is_locked' => 0,
+        ]);
 
         $company_token = new CompanyToken;
         $company_token->user_id = $user->id;
@@ -298,56 +298,53 @@ class ClientTest extends TestCase
         $company_token->name = $user->first_name.' '.$user->last_name;
         $company_token->token = Str::random(64);
         $company_token->is_system = true;
-        
+
         $company_token->save();
 
         $this->token = $company_token->token;
 
-
         $data = [
-                'name' => 'A loyal Client',
-                'contacts' => $this->faker->unique()->safeEmail,
-            ];
+            'name' => 'A loyal Client',
+            'contacts' => $this->faker->unique()->safeEmail(),
+        ];
 
-        try{
+        try {
             $response = $this->withHeaders([
-                    'X-API-SECRET' => config('ninja.api_secret'),
-                    'X-API-TOKEN' => $this->token,
-                ])->post('/api/v1/clients/', $data);
-        }catch (ValidationException $e) {
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
+        } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             $this->assertNotNull($message);
         }
-
-
     }
 
     public function testCreatingClientAndContacts()
     {
         $account = Account::factory()->create();
         $company = Company::factory()->create([
-                    'account_id' => $account->id,
-                     ]);
+            'account_id' => $account->id,
+        ]);
 
         $account->default_company_id = $company->id;
         $account->save();
 
         $user = User::factory()->create([
-                'account_id' => $account->id,
-                'confirmation_code' => $this->createDbHash(config('database.default')),
-                'email' => 'whiz@gmail.com',
+            'account_id' => $account->id,
+            'confirmation_code' => $this->createDbHash(config('database.default')),
+            'email' => 'whiz@gmail.com',
 
-            ]);
+        ]);
 
         $user->companies()->attach($company->id, [
-                'account_id' => $account->id,
-                'is_owner' => 1,
-                'is_admin' => 1,
-                'notifications' => CompanySettings::notificationDefaults(),
-                'permissions' => '',
-                'settings' => '',
-                'is_locked' => 0,
-            ]);
+            'account_id' => $account->id,
+            'is_owner' => 1,
+            'is_admin' => 1,
+            'notifications' => CompanySettings::notificationDefaults(),
+            'permissions' => '',
+            'settings' => '',
+            'is_locked' => 0,
+        ]);
 
         $company_token = new CompanyToken;
         $company_token->user_id = $user->id;
@@ -361,75 +358,75 @@ class ClientTest extends TestCase
         $this->token = $company_token->token;
 
         $data = [
-                'name' => 'A loyal Client',
-                'contacts' => [
-                    ['email' => $this->faker->unique()->safeEmail],
-                ],
-            ];
+            'name' => 'A loyal Client',
+            'contacts' => [
+                ['email' => $this->faker->unique()->safeEmail()],
+            ],
+        ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/clients/', $data)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/clients/', $data)
                 ->assertStatus(200);
 
         // $arr = $response->json();
 
         $data = [
-                'name' => 'A loyal Client',
-                'contacts' => [
-                    [
-                        'email' => $this->faker->unique()->safeEmail,
-                        'password' => '*****',
-                    ],
+            'name' => 'A loyal Client',
+            'contacts' => [
+                [
+                    'email' => $this->faker->unique()->safeEmail(),
+                    'password' => '*****',
                 ],
-            ];
+            ],
+        ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/clients/', $data)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/clients/', $data)
                 ->assertStatus(200);
 
         $data = [
-                'name' => 'A loyal Client',
-                'contacts' => [
-                    [
-                        'email' => $this->faker->unique()->safeEmail,
-                        'password' => '1',
-                    ],
+            'name' => 'A loyal Client',
+            'contacts' => [
+                [
+                    'email' => $this->faker->unique()->safeEmail(),
+                    'password' => '1',
                 ],
-            ];
+            ],
+        ];
 
         $response = null;
 
         try {
             $response = $this->withHeaders([
-                    'X-API-SECRET' => config('ninja.api_secret'),
-                    'X-API-TOKEN' => $this->token,
-                ])->post('/api/v1/clients/', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             $this->assertNotNull($message);
         }
 
         $data = [
-                'name' => 'A loyal Client',
-                'contacts' => [
-                    [
-                        'email' => $this->faker->unique()->safeEmail,
-                        'password' => '1Qajsj...33',
-                    ],
+            'name' => 'A loyal Client',
+            'contacts' => [
+                [
+                    'email' => $this->faker->unique()->safeEmail(),
+                    'password' => '1Qajsj...33',
                 ],
-            ];
+            ],
+        ];
 
         $response = null;
 
         try {
             $response = $this->withHeaders([
-                    'X-API-SECRET' => config('ninja.api_secret'),
-                    'X-API-TOKEN' => $this->token,
-                ])->post('/api/v1/clients/', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
         }
@@ -437,26 +434,26 @@ class ClientTest extends TestCase
         $response->assertStatus(200);
 
         $data = [
-                'name' => 'A loyal Client',
-                'contacts' => [
-                    [
-                        'email' => $this->faker->unique()->safeEmail,
-                        'password' => '1Qajsj...33',
-                    ],
-                    [
-                        'email' => $this->faker->unique()->safeEmail,
-                        'password' => '1234AAAAAaaaaa',
-                    ],
+            'name' => 'A loyal Client',
+            'contacts' => [
+                [
+                    'email' => $this->faker->unique()->safeEmail(),
+                    'password' => '1Qajsj...33',
                 ],
-            ];
+                [
+                    'email' => $this->faker->unique()->safeEmail(),
+                    'password' => '1234AAAAAaaaaa',
+                ],
+            ],
+        ];
 
         $response = null;
 
         try {
             $response = $this->withHeaders([
-                    'X-API-SECRET' => config('ninja.api_secret'),
-                    'X-API-TOKEN' => $this->token,
-                ])->post('/api/v1/clients/', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             $this->assertNotNull($message);
@@ -469,31 +466,31 @@ class ClientTest extends TestCase
         $this->client_id = $arr['data']['id'];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/clients/'.$this->client_id, $data)->assertStatus(200);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/clients/'.$this->client_id, $data)->assertStatus(200);
 
         $arr = $response->json();
 
-        $safe_email = $this->faker->unique()->safeEmail;
+        $safe_email = $this->faker->unique()->safeEmail();
 
         $data = [
-                'name' => 'A loyal Client',
-                'contacts' => [
-                    [
-                        'email' => $safe_email,
-                        'password' => '',
-                    ],
+            'name' => 'A loyal Client',
+            'contacts' => [
+                [
+                    'email' => $safe_email,
+                    'password' => '',
                 ],
-            ];
+            ],
+        ];
 
         $response = null;
 
         try {
             $response = $this->withHeaders([
-                    'X-API-SECRET' => config('ninja.api_secret'),
-                    'X-API-TOKEN' => $this->token,
-                ])->post('/api/v1/clients/', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             $this->assertNotNull($message);
@@ -509,25 +506,25 @@ class ClientTest extends TestCase
 
         $this->assertEquals(0, strlen($contact->password));
 
-        $safe_email = $this->faker->unique()->safeEmail;
+        $safe_email = $this->faker->unique()->safeEmail();
 
         $data = [
-                'name' => 'A loyal Client',
-                'contacts' => [
-                    [
-                        'email' => $safe_email,
-                        'password' => 'AFancyDancy191$Password',
-                    ],
+            'name' => 'A loyal Client',
+            'contacts' => [
+                [
+                    'email' => $safe_email,
+                    'password' => 'AFancyDancy191$Password',
                 ],
-            ];
+            ],
+        ];
 
         $response = null;
 
         try {
             $response = $this->withHeaders([
-                    'X-API-SECRET' => config('ninja.api_secret'),
-                    'X-API-TOKEN' => $this->token,
-                ])->post('/api/v1/clients/', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             $this->assertNotNull($message);
@@ -546,23 +543,23 @@ class ClientTest extends TestCase
         $password = $contact->password;
 
         $data = [
-                'name' => 'A Stary eyed client',
-                'contacts' => [
-                    [
-                        'id' => $contact->hashed_id,
-                        'email' => $safe_email,
-                        'password' => '*****',
-                    ],
+            'name' => 'A Stary eyed client',
+            'contacts' => [
+                [
+                    'id' => $contact->hashed_id,
+                    'email' => $safe_email,
+                    'password' => '*****',
                 ],
-            ];
+            ],
+        ];
 
         $response = null;
 
         try {
             $response = $this->withHeaders([
-                    'X-API-SECRET' => config('ninja.api_secret'),
-                    'X-API-TOKEN' => $this->token,
-                ])->put('/api/v1/clients/'.$this->client->hashed_id, $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->put('/api/v1/clients/'.$this->client->hashed_id, $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             $this->assertNotNull($message);
@@ -572,7 +569,6 @@ class ClientTest extends TestCase
 
         $arr = $response->json();
 
-
         $this->client = Client::find($this->decodePrimaryKey($arr['data']['id']));
         $this->client->fresh();
 
diff --git a/tests/Feature/CompanyGatewayApiTest.php b/tests/Feature/CompanyGatewayApiTest.php
index e2f9e40a48da..5b6bbf9e4b2f 100644
--- a/tests/Feature/CompanyGatewayApiTest.php
+++ b/tests/Feature/CompanyGatewayApiTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\DataMapper\FeesAndLimits;
@@ -32,7 +33,7 @@ class CompanyGatewayApiTest extends TestCase
     use MockAccountData;
     use CompanyGatewayFeesAndLimitsSaver;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -54,15 +55,13 @@ class CompanyGatewayApiTest extends TestCase
 
         /* POST */
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/company_gateways', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/company_gateways', $data);
 
         $response->assertStatus(302);
-
     }
 
-
     public function testCompanyGatewayEndPointsWithInvalidFields()
     {
         $data = [
@@ -72,16 +71,13 @@ class CompanyGatewayApiTest extends TestCase
 
         /* POST */
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/company_gateways', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/company_gateways', $data);
 
         $response->assertStatus(302);
-
     }
 
-
-
     public function testCompanyGatewayEndPoints()
     {
         $data = [
@@ -91,9 +87,9 @@ class CompanyGatewayApiTest extends TestCase
 
         /* POST */
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/company_gateways', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/company_gateways', $data);
 
         $cg = $response->json();
 
@@ -109,16 +105,16 @@ class CompanyGatewayApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/company_gateways/'.$cg_id, $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/company_gateways/'.$cg_id, $data);
 
         $response->assertStatus(200);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->delete("/api/v1/company_gateways/{$cg_id}", $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->delete("/api/v1/company_gateways/{$cg_id}", $data);
 
         $response->assertStatus(200);
     }
@@ -143,9 +139,9 @@ class CompanyGatewayApiTest extends TestCase
 
         /* POST */
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/company_gateways', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/company_gateways', $data);
 
         $cg = $response->json();
 
@@ -160,9 +156,9 @@ class CompanyGatewayApiTest extends TestCase
         $response->assertStatus(200);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/company_gateways/'.$this->encodePrimaryKey($cg['data']['id']));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/company_gateways/'.$this->encodePrimaryKey($cg['data']['id']));
 
         $cg = $response->json();
 
@@ -181,7 +177,6 @@ class CompanyGatewayApiTest extends TestCase
         ])->get('/api/v1/company_gateways?filter=x');
 
         $response->assertStatus(200);
-
     }
 
     public function testCompanyGatewayFeesAndLimitsFails()
@@ -198,9 +193,9 @@ class CompanyGatewayApiTest extends TestCase
 
         /* POST */
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/company_gateways', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/company_gateways', $data);
 
         $response->assertStatus(200);
     }
@@ -239,9 +234,9 @@ class CompanyGatewayApiTest extends TestCase
 
         /* POST */
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/company_gateways', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/company_gateways', $data);
 
         $response->assertStatus(200);
 
@@ -272,9 +267,9 @@ class CompanyGatewayApiTest extends TestCase
 
         /* POST */
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/company_gateways', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/company_gateways', $data);
 
         $response->assertStatus(200);
 
@@ -305,9 +300,9 @@ class CompanyGatewayApiTest extends TestCase
 
         /* POST */
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/company_gateways', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/company_gateways', $data);
 
         $response->assertStatus(200);
 
@@ -319,7 +314,6 @@ class CompanyGatewayApiTest extends TestCase
         $this->assertEquals(10.2, $company_gateway->calcGatewayFee(10, GatewayType::CREDIT_CARD));
     }
 
-
     public function testFeesAndLimitsFeePercentAndAmountCalcuationOneHundredPercent()
     {
         //{"1":{"min_limit":1,"max_limit":1000000,"fee_amount":10,"fee_percent":2,"fee_tax_name1":"","fee_tax_name2":"","fee_tax_name3":"","fee_tax_rate1":0,"fee_tax_rate2":0,"fee_tax_rate3":0,"fee_cap":10,"adjust_fee_percent":true}}
@@ -340,9 +334,9 @@ class CompanyGatewayApiTest extends TestCase
 
         /* POST */
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/company_gateways', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/company_gateways', $data);
 
         $response->assertStatus(200);
 
@@ -370,9 +364,9 @@ class CompanyGatewayApiTest extends TestCase
 
         /* POST */
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/company_gateways', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/company_gateways', $data);
 
         $response->assertStatus(200);
 
@@ -384,7 +378,6 @@ class CompanyGatewayApiTest extends TestCase
         $this->assertEquals(1, $company_gateway->calcGatewayFee(10, GatewayType::CREDIT_CARD));
     }
 
-
     public function testFeesAndLimitsFeePercentAndAmountAndTaxCalcuation()
     {
         //{"1":{"min_limit":1,"max_limit":1000000,"fee_amount":10,"fee_percent":2,"fee_tax_name1":"","fee_tax_name2":"","fee_tax_name3":"","fee_tax_rate1":0,"fee_tax_rate2":0,"fee_tax_rate3":0,"fee_cap":10,"adjust_fee_percent":true}}
@@ -404,9 +397,9 @@ class CompanyGatewayApiTest extends TestCase
 
         /* POST */
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/company_gateways', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/company_gateways', $data);
 
         $response->assertStatus(200);
 
@@ -437,9 +430,9 @@ class CompanyGatewayApiTest extends TestCase
 
         /* POST */
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/company_gateways', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/company_gateways', $data);
 
         $response->assertStatus(200);
 
@@ -472,9 +465,9 @@ class CompanyGatewayApiTest extends TestCase
 
         /* POST */
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/company_gateways', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/company_gateways', $data);
 
         $response->assertStatus(200);
 
@@ -508,9 +501,9 @@ class CompanyGatewayApiTest extends TestCase
 
         /* POST */
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/company_gateways', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/company_gateways', $data);
 
         $response->assertStatus(200);
 
diff --git a/tests/Feature/CompanyGatewayResolutionTest.php b/tests/Feature/CompanyGatewayResolutionTest.php
index 7b9d3872fb3b..72f34e63b79c 100644
--- a/tests/Feature/CompanyGatewayResolutionTest.php
+++ b/tests/Feature/CompanyGatewayResolutionTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Models\Client;
@@ -33,7 +34,7 @@ class CompanyGatewayResolutionTest extends TestCase
 
     public $cg1;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -112,7 +113,6 @@ class CompanyGatewayResolutionTest extends TestCase
     /**
      * @covers \App|Models\Client::validGatewayForAmount()
      */
-
     public function testValidationForGatewayAmount()
     {
         $this->assertTrue($this->client->validGatewayForAmount($this->cg->fees_and_limits->{1}, 10));
@@ -123,7 +123,7 @@ class CompanyGatewayResolutionTest extends TestCase
     {
         $amount = 10;
 
-        $this->assertInstanceOf("\\stdClass", $this->cg->fees_and_limits);
+        $this->assertInstanceOf('\\stdClass', $this->cg->fees_and_limits);
         $this->assertObjectHasAttribute('min_limit', $this->cg->fees_and_limits->{1});
 
         $payment_methods = $this->client->service()->getPaymentMethods($amount);
@@ -134,7 +134,7 @@ class CompanyGatewayResolutionTest extends TestCase
     public function testRemoveMethods()
     {
         $amount = 10;
-        
+
         CompanyGateway::whereNotNull('id')->delete();
 
         $data = [];
@@ -184,13 +184,10 @@ class CompanyGatewayResolutionTest extends TestCase
         // nlog($this->client->service()->getPaymentMethods($amount));
 
         $this->assertEquals(2, count($this->client->service()->getPaymentMethods($amount)));
-
     }
 
-
     public function testEnableFeeAdjustment()
     {
-
         $data = [];
         $data[1]['min_limit'] = -1;
         $data[1]['max_limit'] = -1;
@@ -235,9 +232,7 @@ class CompanyGatewayResolutionTest extends TestCase
         $this->cg->fees_and_limits = $data;
         $this->cg->save();
 
-
         $fee = $this->cg->calcGatewayFee(89, GatewayType::CREDIT_CARD, false);
         $this->assertEquals(1.89, $fee);
-
     }
 }
diff --git a/tests/Feature/CompanyGatewayTest.php b/tests/Feature/CompanyGatewayTest.php
index 379d7b10fa7a..eb1d2648a656 100644
--- a/tests/Feature/CompanyGatewayTest.php
+++ b/tests/Feature/CompanyGatewayTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Models\CompanyGateway;
@@ -25,7 +26,7 @@ class CompanyGatewayTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -190,6 +191,5 @@ class CompanyGatewayTest extends TestCase
 
         /*simple pro rata*/
         $fees_and_limits = $cg->getFeesAndLimits(GatewayType::CREDIT_CARD);
-
     }
 }
diff --git a/tests/Feature/CompanyTest.php b/tests/Feature/CompanyTest.php
index 2afc847ac512..255d51bdff76 100644
--- a/tests/Feature/CompanyTest.php
+++ b/tests/Feature/CompanyTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\DataMapper\CompanySettings;
@@ -33,7 +34,7 @@ class CompanyTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -54,9 +55,9 @@ class CompanyTest extends TestCase
         // $cc->delete();
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/companies');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/companies');
 
         $response->assertStatus(200);
 
@@ -92,13 +93,13 @@ class CompanyTest extends TestCase
 
         $company_update = [
             'name' => 'CHANGE NAME',
-         //   'logo' => UploadedFile::fake()->image('avatar.jpg')
+            //   'logo' => UploadedFile::fake()->image('avatar.jpg')
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/companies/'.$this->encodePrimaryKey($company->id), $company_update)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->putJson('/api/v1/companies/'.$this->encodePrimaryKey($company->id), $company_update)
             ->assertStatus(200);
 
         $settings = CompanySettings::defaults();
@@ -111,7 +112,7 @@ class CompanyTest extends TestCase
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->put('/api/v1/companies/'.$this->encodePrimaryKey($company->id), $company->toArray())
+        ])->putJson('/api/v1/companies/'.$this->encodePrimaryKey($company->id), $company->toArray())
         ->assertStatus(200)->decodeResponseJson();
 
         $response = $this->withHeaders([
diff --git a/tests/Feature/CompanyTokenApiTest.php b/tests/Feature/CompanyTokenApiTest.php
index fd96fb833d95..4e5c6717665a 100644
--- a/tests/Feature/CompanyTokenApiTest.php
+++ b/tests/Feature/CompanyTokenApiTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Http\Middleware\PasswordProtection;
@@ -30,7 +31,7 @@ class CompanyTokenApiTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -65,14 +66,14 @@ class CompanyTokenApiTest extends TestCase
         $this->withoutMiddleware(PasswordProtection::class);
 
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-PASSWORD' => 'ALongAndBriliantPassword',
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/tokens', $data);
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/tokens', $data);
 
         $response->assertStatus(200);
     }
@@ -88,10 +89,10 @@ class CompanyTokenApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-PASSWORD' => 'ALongAndBriliantPassword',
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/tokens/'.$this->encodePrimaryKey($company_token->id), $data);
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/tokens/'.$this->encodePrimaryKey($company_token->id), $data);
 
         $response->assertStatus(200);
         $arr = $response->json();
@@ -106,10 +107,10 @@ class CompanyTokenApiTest extends TestCase
         $company_token = CompanyToken::whereCompanyId($this->company->id)->first();
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-PASSWORD' => 'ALongAndBriliantPassword',
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/tokens/'.$this->encodePrimaryKey($company_token->id));
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/tokens/'.$this->encodePrimaryKey($company_token->id));
 
         $response->assertStatus(200);
     }
@@ -121,10 +122,10 @@ class CompanyTokenApiTest extends TestCase
         $company_token = CompanyToken::whereCompanyId($this->company->id)->first();
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-PASSWORD' => 'ALongAndBriliantPassword',
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/tokens/'.$this->encodePrimaryKey($company_token->id));
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/tokens/'.$this->encodePrimaryKey($company_token->id));
 
         $arr = $response->json();
 
diff --git a/tests/Feature/CreditTest.php b/tests/Feature/CreditTest.php
index 789ecd3f3bb7..7fd47b8e5f7f 100644
--- a/tests/Feature/CreditTest.php
+++ b/tests/Feature/CreditTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Models\Client;
@@ -26,7 +27,7 @@ class CreditTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -71,7 +72,7 @@ class CreditTest extends TestCase
     public function testCreditRESTEndPoints()
     {
         $response = $this->withHeaders([
-        'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
         ])->get('/api/v1/credits/'.$this->encodePrimaryKey($this->credit->id));
 
@@ -125,9 +126,9 @@ class CreditTest extends TestCase
     public function testDeleteCredit()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->delete('/api/v1/credits/'.$this->encodePrimaryKey($this->credit->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->delete('/api/v1/credits/'.$this->encodePrimaryKey($this->credit->id));
 
         $response->assertStatus(200);
     }
@@ -151,18 +152,18 @@ class CreditTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/credits', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/credits', $data);
 
-        $response->assertStatus(200);   
+        $response->assertStatus(200);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/credits', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/credits', $data);
 
-        $response->assertStatus(302);       
+        $response->assertStatus(302);
     }
 
     public function testCreditPut()
@@ -184,16 +185,16 @@ class CreditTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/credits/'.$this->encodePrimaryKey($this->credit->id), $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/credits/'.$this->encodePrimaryKey($this->credit->id), $data);
 
         $response->assertStatus(200);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/credits/'.$this->encodePrimaryKey($this->credit->id), $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/credits/'.$this->encodePrimaryKey($this->credit->id), $data);
 
         $response->assertStatus(200);
 
@@ -204,7 +205,4 @@ class CreditTest extends TestCase
 
         $response->assertStatus(302);
     }
-
-
-
 }
diff --git a/tests/Feature/DeleteInvoiceTest.php b/tests/Feature/DeleteInvoiceTest.php
index 7318899ef60a..4ee19d377858 100644
--- a/tests/Feature/DeleteInvoiceTest.php
+++ b/tests/Feature/DeleteInvoiceTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Factory\InvoiceItemFactory;
@@ -28,8 +29,8 @@ class DeleteInvoiceTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
     use MakesHash;
-    
-    public function setUp() :void
+
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -47,9 +48,9 @@ class DeleteInvoiceTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/clients', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/clients', $data);
 
         $response->assertStatus(200);
 
@@ -57,7 +58,7 @@ class DeleteInvoiceTest extends TestCase
 
         $client_hash_id = $arr['data']['id'];
         $client = Client::find($this->decodePrimaryKey($client_hash_id));
-        
+
         $this->assertEquals($client->balance, 0);
         $this->assertEquals($client->paid_to_date, 0);
         //create new invoice.
@@ -68,13 +69,13 @@ class DeleteInvoiceTest extends TestCase
         $item->quantity = 1;
         $item->cost = 10;
 
-        $line_items[] = (array)$item;
+        $line_items[] = (array) $item;
 
         $item = InvoiceItemFactory::create();
         $item->quantity = 1;
         $item->cost = 10;
 
-        $line_items[] = (array)$item;
+        $line_items[] = (array) $item;
 
         $invoice = [
             'status_id' => 1,
@@ -89,17 +90,17 @@ class DeleteInvoiceTest extends TestCase
             'custom_value3' => 0,
             'custom_value4' => 0,
             'client_id' => $client_hash_id,
-            'line_items' => (array)$line_items,
+            'line_items' => (array) $line_items,
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/invoices/', $invoice)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/invoices/', $invoice)
             ->assertStatus(200);
 
         $arr = $response->json();
-    
+
         $invoice_one_hashed_id = $arr['data']['id'];
 
         $invoice = Invoice::find($this->decodePrimaryKey($invoice_one_hashed_id));
@@ -115,7 +116,6 @@ class DeleteInvoiceTest extends TestCase
         $this->assertEquals(0, $invoice->client->balance);
         $this->assertEquals(20, $invoice->client->paid_to_date);
 
-
         //partially refund payment
         $payment = $invoice->fresh()->payments()->first();
 
@@ -124,12 +124,12 @@ class DeleteInvoiceTest extends TestCase
             'amount' => 10,
             'invoices' => [
                 [
-                'invoice_id' => $invoice->id,
-                'amount' => 10,
+                    'invoice_id' => $invoice->id,
+                    'amount' => 10,
                 ],
             ],
             'date' => '2020/12/12',
-            'gateway_refund' => false
+            'gateway_refund' => false,
         ];
 
         $payment->refund($data);
@@ -154,23 +154,21 @@ class DeleteInvoiceTest extends TestCase
         $this->assertEquals(0, $invoice->fresh()->balance);
         $this->assertEquals(0, $invoice->client->fresh()->balance);
         $this->assertEquals(0, $invoice->client->fresh()->paid_to_date);
-
     }
 
-
     /**
      * @covers App\Services\Invoice\MarkInvoiceDeleted
      */
     public function testInvoiceDeletion()
     {
         $data = [
-                    'name' => 'A Nice Client',
-                ];
+            'name' => 'A Nice Client',
+        ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/clients', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/clients', $data);
 
         $response->assertStatus(200);
 
@@ -178,7 +176,7 @@ class DeleteInvoiceTest extends TestCase
 
         $client_hash_id = $arr['data']['id'];
         $client = Client::find($this->decodePrimaryKey($client_hash_id));
-        
+
         $this->assertEquals($client->balance, 0);
         $this->assertEquals($client->paid_to_date, 0);
         //create new invoice.
@@ -189,13 +187,13 @@ class DeleteInvoiceTest extends TestCase
         $item->quantity = 1;
         $item->cost = 10;
 
-        $line_items[] = (array)$item;
+        $line_items[] = (array) $item;
 
         $item = InvoiceItemFactory::create();
         $item->quantity = 1;
         $item->cost = 10;
 
-        $line_items[] = (array)$item;
+        $line_items[] = (array) $item;
 
         $invoice = [
             'status_id' => 1,
@@ -210,17 +208,17 @@ class DeleteInvoiceTest extends TestCase
             'custom_value3' => 0,
             'custom_value4' => 0,
             'client_id' => $client_hash_id,
-            'line_items' => (array)$line_items,
+            'line_items' => (array) $line_items,
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/invoices/', $invoice)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/invoices/', $invoice)
             ->assertStatus(200);
 
         $arr = $response->json();
-    
+
         $invoice_one_hashed_id = $arr['data']['id'];
 
         $invoice = Invoice::find($this->decodePrimaryKey($invoice_one_hashed_id));
@@ -236,16 +234,15 @@ class DeleteInvoiceTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/invoices/bulk?action=delete', $data)->assertStatus(200);
-
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/invoices/bulk?action=delete', $data)->assertStatus(200);
 
         $invoice = $invoice->fresh();
 
         $this->assertEquals(20, $invoice->balance);
         $this->assertEquals(0, $invoice->client->balance);
-        $this->assertTrue((bool)$invoice->is_deleted);
+        $this->assertTrue((bool) $invoice->is_deleted);
         $this->assertNotNull($invoice->deleted_at);
 
         //delete invoice
@@ -262,7 +259,7 @@ class DeleteInvoiceTest extends TestCase
         $invoice = $invoice->fresh();
 
         $this->assertEquals(20, $invoice->balance);
-        $this->assertFalse((bool)$invoice->is_deleted);
+        $this->assertFalse((bool) $invoice->is_deleted);
         $this->assertNull($invoice->deleted_at);
         $this->assertEquals(20, $invoice->client->fresh()->balance);
     }
@@ -273,15 +270,15 @@ class DeleteInvoiceTest extends TestCase
     public function testInvoiceDeletionAndRestoration()
     {
         //create new client
-        
+
         $data = [
             'name' => 'A Nice Client',
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/clients', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/clients', $data);
 
         $response->assertStatus(200);
 
@@ -289,7 +286,7 @@ class DeleteInvoiceTest extends TestCase
 
         $client_hash_id = $arr['data']['id'];
         $client = Client::find($this->decodePrimaryKey($client_hash_id));
-        
+
         //new client
         $this->assertEquals($client->balance, 0);
         $this->assertEquals($client->paid_to_date, 0);
@@ -301,13 +298,13 @@ class DeleteInvoiceTest extends TestCase
         $item->quantity = 1;
         $item->cost = 10;
 
-        $line_items[] = (array)$item;
+        $line_items[] = (array) $item;
 
         $item = InvoiceItemFactory::create();
         $item->quantity = 1;
         $item->cost = 10;
 
-        $line_items[] = (array)$item;
+        $line_items[] = (array) $item;
 
         $invoice = [
             'status_id' => 1,
@@ -322,23 +319,23 @@ class DeleteInvoiceTest extends TestCase
             'custom_value3' => 0,
             'custom_value4' => 0,
             'client_id' => $client_hash_id,
-            'line_items' => (array)$line_items,
+            'line_items' => (array) $line_items,
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/invoices/', $invoice)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/invoices/', $invoice)
             ->assertStatus(200);
 
         $arr = $response->json();
-    
+
         $invoice_one_hashed_id = $arr['data']['id'];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/invoices/', $invoice)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/invoices/', $invoice)
             ->assertStatus(200);
 
         $arr = $response->json();
@@ -352,12 +349,12 @@ class DeleteInvoiceTest extends TestCase
             'client_id' => $client_hash_id,
             'invoices' => [
                 [
-                'invoice_id' => $invoice_one_hashed_id,
-                'amount' => 20.0,
+                    'invoice_id' => $invoice_one_hashed_id,
+                    'amount' => 20.0,
                 ],
                 [
-                'invoice_id' => $invoice_two_hashed_id,
-                'amount' => 20.0,
+                    'invoice_id' => $invoice_two_hashed_id,
+                    'amount' => 20.0,
                 ],
             ],
             'date' => '2020/12/01',
@@ -384,7 +381,7 @@ class DeleteInvoiceTest extends TestCase
         $payment = Payment::find($this->decodePrimaryKey($payment_hashed_id));
 
         // $this->assertEquals(20, $invoice_one->company_ledger->sortByDesc('id')->first()->balance);
-        
+
         //test balance
         $this->assertEquals($invoice_one->amount, 20);
         $this->assertEquals($invoice_one->balance, 0);
@@ -397,16 +394,16 @@ class DeleteInvoiceTest extends TestCase
         //hydrate associated payment
         $this->assertEquals($payment->amount, 40);
         $this->assertEquals($payment->applied, 40);
-        
+
         //delete invoice
         $data = [
             'ids' => [$invoice_one_hashed_id],
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/invoices/bulk?action=delete', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/invoices/bulk?action=delete', $data);
 
         $arr = $response->json();
 
@@ -418,10 +415,10 @@ class DeleteInvoiceTest extends TestCase
         $this->assertEquals(20, $payment->fresh()->amount);
 
         $invoice_one = $invoice_one->fresh();
-        
-        $this->assertTrue((bool)$invoice_one->is_deleted);
+
+        $this->assertTrue((bool) $invoice_one->is_deleted);
         $this->assertNotNull($invoice_one->deleted_at);
-        
+
         //restore invoice
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
@@ -433,7 +430,7 @@ class DeleteInvoiceTest extends TestCase
         $this->assertFalse($arr['data'][0]['is_deleted']);
 
         $invoice_one = $invoice_one->fresh();
-        $this->assertFalse((bool)$invoice_one->is_deleted);
+        $this->assertFalse((bool) $invoice_one->is_deleted);
         $this->assertNull($invoice_one->deleted_at);
 
         // $payment = $payment->fresh();
@@ -442,16 +439,4 @@ class DeleteInvoiceTest extends TestCase
         // $this->assertEquals(40, $payment->fresh()->amount);
         // $this->assertEquals(40, $client->fresh()->paid_to_date);
     }
-
-
-
-
-
-
-
-
-
-
-
-
 }
diff --git a/tests/Feature/DesignApiTest.php b/tests/Feature/DesignApiTest.php
index 3dc630f33e02..dec0cc00bed7 100644
--- a/tests/Feature/DesignApiTest.php
+++ b/tests/Feature/DesignApiTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Models\Design;
@@ -30,7 +31,7 @@ class DesignApiTest extends TestCase
 
     public $id;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -55,14 +56,14 @@ class DesignApiTest extends TestCase
         ];
 
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'design' => $design,
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/designs', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/designs', $data);
 
         $response->assertStatus(200);
 
@@ -73,18 +74,18 @@ class DesignApiTest extends TestCase
         $this->assertEquals($data['name'], $arr['data']['name']);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/designs');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/designs');
 
         $response->assertStatus(200);
 
         $arr = $response->json();
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/designs/'.$this->id);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/designs/'.$this->id);
 
         $response->assertStatus(200);
 
@@ -93,14 +94,14 @@ class DesignApiTest extends TestCase
         $this->assertEquals($this->id, $arr['data']['id']);
 
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'design' => $design,
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/designs/'.$this->id, $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/designs/'.$this->id, $data);
 
         $response->assertStatus(200);
 
@@ -136,14 +137,14 @@ class DesignApiTest extends TestCase
         ];
 
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'design' => $design,
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/designs', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/designs', $data);
 
         $response->assertStatus(200);
 
diff --git a/tests/Feature/DocumentsApiTest.php b/tests/Feature/DocumentsApiTest.php
index 2686d715185a..a7ad93e5a67b 100644
--- a/tests/Feature/DocumentsApiTest.php
+++ b/tests/Feature/DocumentsApiTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Utils\Traits\MakesHash;
@@ -27,7 +28,7 @@ class DocumentsApiTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -43,74 +44,69 @@ class DocumentsApiTest extends TestCase
     public function testClientDocuments()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/clients');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/clients');
 
         $response->assertStatus(200);
         $arr = $response->json();
         $this->assertArrayHasKey('documents', $arr['data'][0]);
     }
 
-
     public function testInvoiceDocuments()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/invoices');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/invoices');
 
         $response->assertStatus(200);
         $arr = $response->json();
         $this->assertArrayHasKey('documents', $arr['data'][0]);
     }
 
-
     public function testProjectsDocuments()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/projects');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/projects');
 
         $response->assertStatus(200);
         $arr = $response->json();
         $this->assertArrayHasKey('documents', $arr['data'][0]);
     }
 
-
     public function testExpenseDocuments()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/expenses');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/expenses');
 
         $response->assertStatus(200);
         $arr = $response->json();
         $this->assertArrayHasKey('documents', $arr['data'][0]);
     }
 
-
     public function testVendorDocuments()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/vendors');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/vendors');
 
         $response->assertStatus(200);
         $arr = $response->json();
         $this->assertArrayHasKey('documents', $arr['data'][0]);
     }
 
-
     public function testProductDocuments()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/products');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/products');
 
         $response->assertStatus(200);
         $arr = $response->json();
@@ -120,9 +116,9 @@ class DocumentsApiTest extends TestCase
     public function testTaskDocuments()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/tasks');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/tasks');
 
         $response->assertStatus(200);
         $arr = $response->json();
diff --git a/tests/Feature/EntityPaidToDateTest.php b/tests/Feature/EntityPaidToDateTest.php
index 0e9bb2f760f5..842806131c36 100644
--- a/tests/Feature/EntityPaidToDateTest.php
+++ b/tests/Feature/EntityPaidToDateTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\DataMapper\ClientSettings;
@@ -42,7 +43,7 @@ class EntityPaidToDateTest extends TestCase
     use MockAccountData;
     use WithoutEvents;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -62,7 +63,6 @@ class EntityPaidToDateTest extends TestCase
 
     public function testPaidToDateWithMarkPaidAction()
     {
-
         $invoice = $this->bootNewInvoice();
 
         $this->assertEquals($invoice->balance, 0);
@@ -79,7 +79,6 @@ class EntityPaidToDateTest extends TestCase
 
     public function testPaidToDateWithInvoiceCancellation()
     {
-
         $invoice = $this->bootNewInvoice();
 
         $invoice->service()->markPaid()->save();
@@ -89,21 +88,18 @@ class EntityPaidToDateTest extends TestCase
         $invoice->service()->handleReversal()->save();
 
         $this->assertEquals(0, $invoice->paid_to_date);
-
-
     }
 
     private function bootNewInvoice()
     {
-        
         $data = [
             'name' => 'A Nice Client',
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/clients', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/clients', $data);
 
         $response->assertStatus(200);
 
@@ -111,7 +107,7 @@ class EntityPaidToDateTest extends TestCase
 
         $client_hash_id = $arr['data']['id'];
         $client = Client::find($this->decodePrimaryKey($client_hash_id));
-        
+
         $this->assertEquals($client->balance, 0);
         $this->assertEquals($client->paid_to_date, 0);
         //create new invoice.
@@ -122,13 +118,13 @@ class EntityPaidToDateTest extends TestCase
         $item->quantity = 1;
         $item->cost = 10;
 
-        $line_items[] = (array)$item;
+        $line_items[] = (array) $item;
 
         $item = InvoiceItemFactory::create();
         $item->quantity = 1;
         $item->cost = 10;
 
-        $line_items[] = (array)$item;
+        $line_items[] = (array) $item;
 
         $invoice = [
             'status_id' => 1,
@@ -143,17 +139,17 @@ class EntityPaidToDateTest extends TestCase
             'custom_value3' => 0,
             'custom_value4' => 0,
             'client_id' => $client_hash_id,
-            'line_items' => (array)$line_items,
+            'line_items' => (array) $line_items,
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/invoices/', $invoice)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/invoices/', $invoice)
             ->assertStatus(200);
 
         $arr = $response->json();
-    
+
         $invoice_one_hashed_id = $arr['data']['id'];
 
         return Invoice::find($this->decodePrimaryKey($invoice_one_hashed_id));
diff --git a/tests/Feature/ExpenseApiTest.php b/tests/Feature/ExpenseApiTest.php
index 45825b6e154c..d0a4dc80f802 100644
--- a/tests/Feature/ExpenseApiTest.php
+++ b/tests/Feature/ExpenseApiTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Utils\Traits\MakesHash;
@@ -27,7 +28,7 @@ class ExpenseApiTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -43,13 +44,13 @@ class ExpenseApiTest extends TestCase
     public function testExpensePost()
     {
         $data = [
-            'public_notes' => $this->faker->firstName,
+            'public_notes' => $this->faker->firstName(),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/expenses', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/expenses', $data);
 
         $arr = $response->json();
         $response->assertStatus(200);
@@ -60,44 +61,43 @@ class ExpenseApiTest extends TestCase
     public function testDuplicateNumberCatch()
     {
         $data = [
-            'public_notes' => $this->faker->firstName,
+            'public_notes' => $this->faker->firstName(),
             'number' => 'iamaduplicate',
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/expenses', $data);
-
-        $response->assertStatus(200);   
-
-        $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/expenses', $data);
-
-        $response->assertStatus(302);       
-    }
-
-
-    public function testExpensePut()
-    {
-        $data = [
-            'public_notes' => $this->faker->firstName,
-            'number' => 'Coolio',
-        ];
-
-        $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/expenses/'.$this->encodePrimaryKey($this->expense->id), $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/expenses', $data);
 
         $response->assertStatus(200);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/expenses/'.$this->encodePrimaryKey($this->expense->id), $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/expenses', $data);
+
+        $response->assertStatus(302);
+    }
+
+    public function testExpensePut()
+    {
+        $data = [
+            'public_notes' => $this->faker->firstName(),
+            'number' => 'Coolio',
+        ];
+
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/expenses/'.$this->encodePrimaryKey($this->expense->id), $data);
+
+        $response->assertStatus(200);
+
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/expenses/'.$this->encodePrimaryKey($this->expense->id), $data);
 
         $response->assertStatus(200);
 
@@ -107,16 +107,14 @@ class ExpenseApiTest extends TestCase
         ])->post('/api/v1/expenses/', $data);
 
         $response->assertStatus(302);
-
-
     }
 
     public function testExpenseGet()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/expenses/'.$this->encodePrimaryKey($this->expense->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/expenses/'.$this->encodePrimaryKey($this->expense->id));
 
         $response->assertStatus(200);
     }
@@ -124,20 +122,19 @@ class ExpenseApiTest extends TestCase
     public function testExpenseGetSort()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/expenses?sort=public_notes|desc');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/expenses?sort=public_notes|desc');
 
         $response->assertStatus(200);
     }
 
-
     public function testExpenseNotArchived()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/expenses/'.$this->encodePrimaryKey($this->expense->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/expenses/'.$this->encodePrimaryKey($this->expense->id));
 
         $arr = $response->json();
 
@@ -151,9 +148,9 @@ class ExpenseApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/expenses/bulk?action=archive', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/expenses/bulk?action=archive', $data);
 
         $arr = $response->json();
 
@@ -167,9 +164,9 @@ class ExpenseApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/expenses/bulk?action=restore', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/expenses/bulk?action=restore', $data);
 
         $arr = $response->json();
 
@@ -183,9 +180,9 @@ class ExpenseApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/expenses/bulk?action=delete', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/expenses/bulk?action=delete', $data);
 
         $arr = $response->json();
 
@@ -194,38 +191,34 @@ class ExpenseApiTest extends TestCase
 
     public function testAddingExpense()
     {
-
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/expense_categories', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/expense_categories', $data);
 
         $response->assertStatus(200);
 
         $arr = $response->json();
         $category_id = $arr['data']['id'];
 
-        $data = 
+        $data =
         [
-            "vendor_id" => $this->vendor->hashed_id,
-            "category_id" => $category_id,
-            "amount" => 10,
-            "date" => "2021-10-01"
+            'vendor_id' => $this->vendor->hashed_id,
+            'category_id' => $category_id,
+            'amount' => 10,
+            'date' => '2021-10-01',
         ];
 
-
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/expenses', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/expenses', $data);
 
         $arr = $response->json();
         $response->assertStatus(200);
-
-
     }
 }
diff --git a/tests/Feature/ExpenseCategoryApiTest.php b/tests/Feature/ExpenseCategoryApiTest.php
index d7eac1aef330..4a8d4f63ece2 100644
--- a/tests/Feature/ExpenseCategoryApiTest.php
+++ b/tests/Feature/ExpenseCategoryApiTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Utils\Traits\MakesHash;
@@ -27,7 +28,7 @@ class ExpenseCategoryApiTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -43,13 +44,13 @@ class ExpenseCategoryApiTest extends TestCase
     public function testExpenseCategoryPost()
     {
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/expense_categories', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/expense_categories', $data);
 
         $response->assertStatus(200);
     }
@@ -57,13 +58,13 @@ class ExpenseCategoryApiTest extends TestCase
     public function testExpenseCategoryPut()
     {
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/expense_categories/'.$this->encodePrimaryKey($this->expense_category->id), $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/expense_categories/'.$this->encodePrimaryKey($this->expense_category->id), $data);
 
         $response->assertStatus(200);
     }
@@ -71,9 +72,9 @@ class ExpenseCategoryApiTest extends TestCase
     public function testExpenseCategoryGet()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/expense_categories/'.$this->encodePrimaryKey($this->expense_category->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/expense_categories/'.$this->encodePrimaryKey($this->expense_category->id));
 
         $response->assertStatus(200);
     }
@@ -81,9 +82,9 @@ class ExpenseCategoryApiTest extends TestCase
     public function testExpenseCategoryNotArchived()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/expense_categories/'.$this->encodePrimaryKey($this->expense_category->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/expense_categories/'.$this->encodePrimaryKey($this->expense_category->id));
 
         $arr = $response->json();
 
@@ -97,9 +98,9 @@ class ExpenseCategoryApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/expense_categories/bulk?action=archive', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/expense_categories/bulk?action=archive', $data);
 
         $arr = $response->json();
 
@@ -113,9 +114,9 @@ class ExpenseCategoryApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/expense_categories/bulk?action=restore', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/expense_categories/bulk?action=restore', $data);
 
         $arr = $response->json();
 
@@ -129,9 +130,9 @@ class ExpenseCategoryApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/expense_categories/bulk?action=delete', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/expense_categories/bulk?action=delete', $data);
 
         $arr = $response->json();
 
diff --git a/tests/Feature/Export/ClientCsvTest.php b/tests/Feature/Export/ClientCsvTest.php
index 0b0828c8eca5..bc59900ae5ff 100644
--- a/tests/Feature/Export/ClientCsvTest.php
+++ b/tests/Feature/Export/ClientCsvTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature\Export;
 
 use App\Models\Invoice;
@@ -26,7 +27,7 @@ class ClientCsvTest extends TestCase
     use MakesHash;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -41,38 +42,33 @@ class ClientCsvTest extends TestCase
 
     public function testClientExportCsv()
     {
-
         $data = [
-            "date_range" => "this_year",
-            "report_keys" => [],
-            "send_email" => false
+            'date_range' => 'this_year',
+            'report_keys' => [],
+            'send_email' => false,
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/reports/clients' , $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/reports/clients', $data);
 
         $response->assertStatus(200);
-    
     }
 
     public function testContactExportCsv()
     {
-
         $data = [
-            "date_range" => "this_year",
-            "report_keys" => [],
-            "send_email" => false
+            'date_range' => 'this_year',
+            'report_keys' => [],
+            'send_email' => false,
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/reports/contacts' , $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/reports/contacts', $data);
 
         $response->assertStatus(200);
-    
     }
-
 }
diff --git a/tests/Feature/Export/ExportCompanyTest.php b/tests/Feature/Export/ExportCompanyTest.php
index 2d022e081668..307d45f917b8 100644
--- a/tests/Feature/Export/ExportCompanyTest.php
+++ b/tests/Feature/Export/ExportCompanyTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature\Export;
 
 use App\Jobs\Company\CompanyExport;
@@ -27,7 +28,7 @@ class ExportCompanyTest extends TestCase
     use MakesHash;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -41,14 +42,14 @@ class ExportCompanyTest extends TestCase
 
         $this->withoutExceptionHandling();
 
-        if (! config('ninja.testvars.stripe')) {
+        if (!config('ninja.testvars.stripe')) {
             $this->markTestSkipped('Cannot write to TMP - skipping');
         }
     }
 
     public function testCompanyExport()
     {
-        $res = CompanyExport::dispatchNow($this->company, $this->company->users->first());
+        $res = (new CompanyExport($this->company, $this->company->users->first()))->handle();
 
         $this->assertTrue($res);
     }
diff --git a/tests/Feature/Export/ExportCsvTest.php b/tests/Feature/Export/ExportCsvTest.php
index a9f629305555..ef2c268fd7d6 100644
--- a/tests/Feature/Export/ExportCsvTest.php
+++ b/tests/Feature/Export/ExportCsvTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature\Export;
 
 use App\Models\Invoice;
@@ -26,7 +27,7 @@ class ExportCsvTest extends TestCase
     use MakesHash;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -48,13 +49,13 @@ class ExportCsvTest extends TestCase
         unset($header_invoice[0]['line_items']);
 
         $header_invoice_keys = array_keys($header_invoice[0]);
-        $header_item_keys = array_keys((array)$header_item);
+        $header_item_keys = array_keys((array) $header_item);
 
         $header_invoice_values = array_values($header_invoice[0]);
-        $header_item_values = array_values((array)$header_item);
+        $header_item_values = array_values((array) $header_item);
 
-        $merged_values = array_merge($header_invoice_values, (array)$header_item_values);
-        $merged_keys = array_merge($header_invoice_keys, (array)$header_item_keys);
+        $merged_values = array_merge($header_invoice_values, (array) $header_item_values);
+        $merged_keys = array_merge($header_invoice_keys, (array) $header_item_keys);
 
         // nlog(print_r($merged_keys, 1));
         // nlog(print_r($merged_values, 1));
@@ -69,7 +70,7 @@ class ExportCsvTest extends TestCase
             foreach ($invoice->line_items as $item) {
                 unset($invoice->line_items);
 
-                $csv->insertOne(array_merge($invoice->toArray(), (array)$item));
+                $csv->insertOne(array_merge($invoice->toArray(), (array) $item));
             }
         }
 
diff --git a/tests/Feature/Export/ProfitAndLossReportTest.php b/tests/Feature/Export/ProfitAndLossReportTest.php
index 36f16fea7f85..2c81becab4b0 100644
--- a/tests/Feature/Export/ProfitAndLossReportTest.php
+++ b/tests/Feature/Export/ProfitAndLossReportTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature\Export;
 
 use App\DataMapper\ClientSettings;
@@ -42,7 +43,7 @@ class ProfitAndLossReportTest extends TestCase
 
     public $faker;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -53,7 +54,6 @@ class ProfitAndLossReportTest extends TestCase
         );
 
         $this->withoutExceptionHandling();
-
     }
 
     public $company;
@@ -63,60 +63,56 @@ class ProfitAndLossReportTest extends TestCase
     public $payload;
 
     public $account;
-/**
- *
- *      start_date - Y-m-d
-        end_date - Y-m-d
-        date_range - 
-            all
-            last7
-            last30
-            this_month
-            last_month
-            this_quarter
-            last_quarter
-            this_year
-            custom
-        is_income_billed - true = Invoiced || false = Payments
-        expense_billed - true = Expensed || false = Expenses marked as paid
-        include_tax - true tax_included || false - tax_excluded
-
-*/
 
+    /**
+     *      start_date - Y-m-d
+            end_date - Y-m-d
+            date_range -
+                all
+                last7
+                last30
+                this_month
+                last_month
+                this_quarter
+                last_quarter
+                this_year
+                custom
+            is_income_billed - true = Invoiced || false = Payments
+            expense_billed - true = Expensed || false = Expenses marked as paid
+            include_tax - true tax_included || false - tax_excluded
+     */
     private function buildData()
     {
-
         $this->account = Account::factory()->create([
             'hosted_client_count' => 1000,
-            'hosted_company_count' => 1000
+            'hosted_company_count' => 1000,
         ]);
-        
+
         $this->account->num_users = 3;
         $this->account->save();
-        
+
         $this->user = User::factory()->create([
             'account_id' => $this->account->id,
             'confirmation_code' => 'xyz123',
-            'email' => $this->faker->unique()->safeEmail,
+            'email' => $this->faker->unique()->safeEmail(),
         ]);
 
         $settings = CompanySettings::defaults();
-        $settings->client_online_payment_notification = false; 
-        $settings->client_manual_payment_notification = false; 
+        $settings->client_online_payment_notification = false;
+        $settings->client_manual_payment_notification = false;
 
         $this->company = Company::factory()->create([
-                'account_id' => $this->account->id,
-                'settings' => $settings
-            ]);
+            'account_id' => $this->account->id,
+            'settings' => $settings,
+        ]);
 
         $this->payload = [
             'start_date' => '2000-01-01',
             'end_date' => '2030-01-11',
             'date_range' => 'custom',
             'is_income_billed' => true,
-            'include_tax' => false
+            'include_tax' => false,
         ];
-
     }
 
     public function testProfitLossInstance()
@@ -135,10 +131,10 @@ class ProfitAndLossReportTest extends TestCase
         $this->buildData();
 
         $client = Client::factory()->create([
-                'user_id' => $this->user->id,
-                'company_id' => $this->company->id,
-                'is_deleted' => 0,
-            ]);
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'is_deleted' => 0,
+        ]);
 
         Invoice::factory()->count(2)->create([
             'client_id' => $client->id,
@@ -163,7 +159,6 @@ class ProfitAndLossReportTest extends TestCase
         $pl = new ProfitLoss($this->company, $this->payload);
         $pl->build();
 
-
         $this->assertEquals(20.0, $pl->getIncome());
         $this->assertEquals(2, $pl->getIncomeTaxes());
 
@@ -175,10 +170,10 @@ class ProfitAndLossReportTest extends TestCase
         $this->buildData();
 
         $client = Client::factory()->create([
-                'user_id' => $this->user->id,
-                'company_id' => $this->company->id,
-                'is_deleted' => 0,
-            ]);
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'is_deleted' => 0,
+        ]);
 
         Invoice::factory()->count(2)->create([
             'client_id' => $client->id,
@@ -194,7 +189,7 @@ class ProfitAndLossReportTest extends TestCase
             'tax_rate1' => 10,
             'tax_rate2' => 0,
             'tax_rate3' => 0,
-            'tax_name1' => "GST",
+            'tax_name1' => 'GST',
             'tax_name2' => '',
             'tax_name3' => '',
             'uses_inclusive_taxes' => true,
@@ -203,27 +198,25 @@ class ProfitAndLossReportTest extends TestCase
         $pl = new ProfitLoss($this->company, $this->payload);
         $pl->build();
 
-
         $this->assertEquals(18.0, $pl->getIncome());
         $this->assertEquals(2, $pl->getIncomeTaxes());
 
         $this->account->delete();
     }
 
-
     public function testSimpleInvoiceIncomeWithForeignExchange()
     {
         $this->buildData();
 
         $settings = ClientSettings::defaults();
-        $settings->currency_id = "2";
+        $settings->currency_id = '2';
 
         $client = Client::factory()->create([
-                'user_id' => $this->user->id,
-                'company_id' => $this->company->id,
-                'is_deleted' => 0,
-                'settings' => $settings,
-            ]);
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'is_deleted' => 0,
+            'settings' => $settings,
+        ]);
 
         Invoice::factory()->count(2)->create([
             'client_id' => $client->id,
@@ -239,11 +232,11 @@ class ProfitAndLossReportTest extends TestCase
             'tax_rate1' => 10,
             'tax_rate2' => 0,
             'tax_rate3' => 0,
-            'tax_name1' => "GST",
+            'tax_name1' => 'GST',
             'tax_name2' => '',
             'tax_name3' => '',
             'uses_inclusive_taxes' => true,
-            'exchange_rate' => 0.5
+            'exchange_rate' => 0.5,
         ]);
 
         $pl = new ProfitLoss($this->company, $this->payload);
@@ -255,7 +248,6 @@ class ProfitAndLossReportTest extends TestCase
         $this->account->delete();
     }
 
-
     public function testSimpleInvoicePaymentIncome()
     {
         $this->buildData();
@@ -265,22 +257,21 @@ class ProfitAndLossReportTest extends TestCase
             'end_date' => '2030-01-11',
             'date_range' => 'custom',
             'is_income_billed' => false,
-            'include_tax' => false
+            'include_tax' => false,
         ];
 
-
         $settings = ClientSettings::defaults();
-        $settings->currency_id = "1";
+        $settings->currency_id = '1';
 
         $client = Client::factory()->create([
-                'user_id' => $this->user->id,
-                'company_id' => $this->company->id,
-                'is_deleted' => 0,
-                'settings' => $settings,
-            ]);
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'is_deleted' => 0,
+            'settings' => $settings,
+        ]);
 
         $contact = ClientContact::factory()->create([
-            'client_id' => $client->id
+            'client_id' => $client->id,
         ]);
 
         $i = Invoice::factory()->create([
@@ -297,11 +288,11 @@ class ProfitAndLossReportTest extends TestCase
             'tax_rate1' => 0,
             'tax_rate2' => 0,
             'tax_rate3' => 0,
-            'tax_name1' => "",
+            'tax_name1' => '',
             'tax_name2' => '',
             'tax_name3' => '',
             'uses_inclusive_taxes' => true,
-            'exchange_rate' => 1
+            'exchange_rate' => 1,
         ]);
 
         $i->service()->markPaid()->save();
@@ -310,11 +301,10 @@ class ProfitAndLossReportTest extends TestCase
         $pl->build();
 
         $this->assertEquals(10.0, $pl->getIncome());
-        
+
         $this->account->delete();
     }
 
-
     public function testSimpleExpense()
     {
         $this->buildData();
@@ -336,7 +326,6 @@ class ProfitAndLossReportTest extends TestCase
         $this->assertEquals(10, $expense->total);
 
         $this->account->delete();
-
     }
 
     public function testSimpleExpenseAmountTax()
@@ -361,7 +350,6 @@ class ProfitAndLossReportTest extends TestCase
         $this->assertEquals(10, $expense->tax);
 
         $this->account->delete();
-
     }
 
     public function testSimpleExpenseTaxRateExclusive()
@@ -387,7 +375,6 @@ class ProfitAndLossReportTest extends TestCase
         $this->assertEquals(1, $expense->tax);
 
         $this->account->delete();
-
     }
 
     public function testSimpleExpenseTaxRateInclusive()
@@ -413,10 +400,8 @@ class ProfitAndLossReportTest extends TestCase
         $this->assertEquals(1, $expense->tax);
 
         $this->account->delete();
-
     }
 
-
     public function testSimpleExpenseBreakdown()
     {
         $this->buildData();
@@ -427,7 +412,7 @@ class ProfitAndLossReportTest extends TestCase
             'user_id' => $this->user->id,
             'date' => '2022-01-01',
             'exchange_rate' => 1,
-            'currency_id' => $this->company->settings->currency_id
+            'currency_id' => $this->company->settings->currency_id,
         ]);
 
         $pl = new ProfitLoss($this->company, $this->payload);
@@ -437,13 +422,11 @@ class ProfitAndLossReportTest extends TestCase
 
         $bd = $pl->getExpenseBreakDown();
 
-        $this->assertEquals(array_sum(array_column($bd,'total')), 10);
+        $this->assertEquals(array_sum(array_column($bd, 'total')), 10);
 
         $this->account->delete();
-
     }
 
-
     public function testSimpleExpenseCategoriesBreakdown()
     {
         $this->buildData();
@@ -459,14 +442,13 @@ class ProfitAndLossReportTest extends TestCase
             'user_id' => $this->user->id,
             'date' => '2022-01-01',
             'exchange_rate' => 1,
-            'currency_id' => $this->company->settings->currency_id
+            'currency_id' => $this->company->settings->currency_id,
         ]);
 
-
         $ec = ExpenseCategoryFactory::create($this->company->id, $this->user->id);
         $ec->name = 'Fuel';
         $ec->save();
-        
+
         $e = Expense::factory(2)->create([
             'category_id' => $ec->id,
             'amount' => 10,
@@ -474,10 +456,9 @@ class ProfitAndLossReportTest extends TestCase
             'user_id' => $this->user->id,
             'date' => '2022-01-01',
             'exchange_rate' => 1,
-            'currency_id' => $this->company->settings->currency_id
+            'currency_id' => $this->company->settings->currency_id,
         ]);
 
-
         $pl = new ProfitLoss($this->company, $this->payload);
         $pl->build();
 
@@ -485,22 +466,20 @@ class ProfitAndLossReportTest extends TestCase
 
         $bd = $pl->getExpenseBreakDown();
 
-        $this->assertEquals(array_sum(array_column($bd,'total')), 30);
+        $this->assertEquals(array_sum(array_column($bd, 'total')), 30);
 
         $this->account->delete();
-
     }
 
-
     public function testCsvGeneration()
     {
         $this->buildData();
 
         $client = Client::factory()->create([
-                'user_id' => $this->user->id,
-                'company_id' => $this->company->id,
-                'is_deleted' => 0,
-            ]);
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'is_deleted' => 0,
+        ]);
 
         Invoice::factory()->count(1)->create([
             'client_id' => $client->id,
@@ -516,7 +495,7 @@ class ProfitAndLossReportTest extends TestCase
             'tax_rate1' => 10,
             'tax_rate2' => 0,
             'tax_rate3' => 0,
-            'tax_name1' => "GST",
+            'tax_name1' => 'GST',
             'tax_name2' => '',
             'tax_name3' => '',
             'uses_inclusive_taxes' => true,
@@ -533,14 +512,13 @@ class ProfitAndLossReportTest extends TestCase
             'user_id' => $this->user->id,
             'date' => '2022-01-01',
             'exchange_rate' => 1,
-            'currency_id' => $this->company->settings->currency_id
+            'currency_id' => $this->company->settings->currency_id,
         ]);
 
-
         $ec = ExpenseCategoryFactory::create($this->company->id, $this->user->id);
         $ec->name = 'Fuel';
         $ec->save();
-        
+
         $e = Expense::factory(2)->create([
             'category_id' => $ec->id,
             'amount' => 10,
@@ -548,17 +526,14 @@ class ProfitAndLossReportTest extends TestCase
             'user_id' => $this->user->id,
             'date' => '2022-01-01',
             'exchange_rate' => 1,
-            'currency_id' => $this->company->settings->currency_id
+            'currency_id' => $this->company->settings->currency_id,
         ]);
 
-
         $pl = new ProfitLoss($this->company, $this->payload);
         $pl->build();
 
         $this->assertNotNull($pl->getCsv());
 
         $this->account->delete();
-
     }
-
 }
diff --git a/tests/Feature/FilterApiTest.php b/tests/Feature/FilterApiTest.php
index ab5bf7d81eae..ee350234d84e 100644
--- a/tests/Feature/FilterApiTest.php
+++ b/tests/Feature/FilterApiTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -24,14 +25,12 @@ class FilterApiTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
-
         $this->makeTestData();
 
-
         $this->withoutMiddleware(
             ThrottleRequests::class
         );
@@ -40,44 +39,38 @@ class FilterApiTest extends TestCase
     public function testActivityGet()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/filters/invoice');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/filters/invoice');
 
         $response->assertStatus(200);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/filters/quote');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/filters/quote');
 
         $response->assertStatus(200);
 
-
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/filters/credit');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/filters/credit');
 
         $response->assertStatus(200);
 
-
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/filters/payment');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/filters/payment');
 
         $response->assertStatus(200);
 
-
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/filters/recurring_invoice');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/filters/recurring_invoice');
 
         $response->assertStatus(200);
-
-
-
     }
 }
diff --git a/tests/Feature/GroupSettingTest.php b/tests/Feature/GroupSettingTest.php
index f2c3d7de4ca1..d200289be514 100644
--- a/tests/Feature/GroupSettingTest.php
+++ b/tests/Feature/GroupSettingTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Utils\Traits\MakesHash;
@@ -20,10 +21,11 @@ use Tests\TestCase;
 class GroupSettingTest extends TestCase
 {
     use MakesHash;
+
     //use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -49,7 +51,7 @@ class GroupSettingTest extends TestCase
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/group_settings', $data);
+        ])->postJson('/api/v1/group_settings', $data);
 
         $response->assertStatus(200);
 
@@ -72,7 +74,7 @@ class GroupSettingTest extends TestCase
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/group_settings', $data);
+        ])->postJson('/api/v1/group_settings', $data);
 
         $response->assertStatus(200);
 
@@ -86,7 +88,7 @@ class GroupSettingTest extends TestCase
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/group_settings/bulk', $data);
+        ])->postJson('/api/v1/group_settings/bulk', $data);
 
         $response->assertStatus(200);
 
diff --git a/tests/Feature/Import/CSV/BaseTransformerTest.php b/tests/Feature/Import/CSV/BaseTransformerTest.php
index dcc4822eb7f2..39bf1effad6d 100644
--- a/tests/Feature/Import/CSV/BaseTransformerTest.php
+++ b/tests/Feature/Import/CSV/BaseTransformerTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature\Import\CSV;
 
 use App\Import\Transformer\BaseTransformer;
@@ -38,7 +39,7 @@ class BaseTransformerTest extends TestCase
     use MakesHash;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -50,7 +51,7 @@ class BaseTransformerTest extends TestCase
         // $this->faker = \Faker\Factory::create();
 
         $this->makeTestData();
-  
+
         $this->withoutExceptionHandling();
     }
 
@@ -59,287 +60,260 @@ class BaseTransformerTest extends TestCase
         $base_transformer = new BaseTransformer($this->company);
 
         $data = [
-        	'key' => 'value'
+            'key' => 'value',
         ];
 
         $field = 'key';
 
-		$this->assertEquals('value', $base_transformer->getString($data, $field));
-
+        $this->assertEquals('value', $base_transformer->getString($data, $field));
     }
 
     public function testGetCurrencyCode()
     {
         $base_transformer = new BaseTransformer($this->company);
 
-    	$code = ['client.currency_id' => "USD"];
+        $code = ['client.currency_id' => 'USD'];
 
-    	$currency_id = $base_transformer->getCurrencyByCode($code);
+        $currency_id = $base_transformer->getCurrencyByCode($code);
 
-    	$this->assertEquals(1, $currency_id);
+        $this->assertEquals(1, $currency_id);
     }
 
     public function testGetClient()
-	{
+    {
         $base_transformer = new BaseTransformer($this->company);
 
-		$client = 		Client::factory()->create([
-				                'user_id' => $this->user->id,
-				                'company_id' => $this->company->id,
-				                'id_number' => 'hit',
-				                'name' => 'magic ',
-				        ]);
-
-        $contact = ClientContact::factory()->create([
-                'user_id' => $this->user->id,
-                'client_id' => $client->id,
-                'company_id' => $this->company->id,
-                'is_primary' => 1,
-                'send_email' => true,
-                'email' => 'test@gmail.com'
+        $client = Client::factory()->create([
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'id_number' => 'hit',
+            'name' => 'magic ',
         ]);
 
+        $contact = ClientContact::factory()->create([
+            'user_id' => $this->user->id,
+            'client_id' => $client->id,
+            'company_id' => $this->company->id,
+            'is_primary' => 1,
+            'send_email' => true,
+            'email' => 'test@gmail.com',
+        ]);
 
         $this->assertEquals($client->id, $base_transformer->getClient('hit', 'null'));
         $this->assertEquals($client->id, $base_transformer->getClient('magic', 'null'));
         $this->assertEquals($client->id, $base_transformer->getClient('nomagic', 'test@gmail.com'));
-    	$this->assertEquals($client->id, $base_transformer->getClient(null, 'test@gmail.com'));
+        $this->assertEquals($client->id, $base_transformer->getClient(null, 'test@gmail.com'));
         $this->assertNull($base_transformer->getClient('null', 'notest@gmail.com'));
 
         $this->assertEquals($client->id, $base_transformer->getClientId(' magic'));
         $this->assertEquals($client->id, $base_transformer->getClientId('Magic '));
-
-	}
+    }
 
     public function testGetContact()
-	{
+    {
         $base_transformer = new BaseTransformer($this->company);
 
-		$client = 		Client::factory()->create([
-				                'user_id' => $this->user->id,
-				                'company_id' => $this->company->id,
-				                'id_number' => 'hit',
-				                'name' => 'magic ',
-				        ]);
+        $client = Client::factory()->create([
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'id_number' => 'hit',
+            'name' => 'magic ',
+        ]);
 
         $contact = ClientContact::factory()->create([
-                'user_id' => $this->user->id,
-                'client_id' => $client->id,
-                'company_id' => $this->company->id,
-                'is_primary' => 1,
-                'send_email' => true,
-                'email' => 'test@gmail.com'
+            'user_id' => $this->user->id,
+            'client_id' => $client->id,
+            'company_id' => $this->company->id,
+            'is_primary' => 1,
+            'send_email' => true,
+            'email' => 'test@gmail.com',
         ]);
 
         $this->assertEquals($contact->id, $base_transformer->getContact('TeSt@gmail.com')->id);
         $this->assertEquals($contact->id, $base_transformer->getContact('TeSt@gmail.com ')->id);
         $this->assertEquals($contact->id, $base_transformer->getContact('TeSt@gmaiL.com')->id);
+    }
 
-	}
-
-	public function testHasClient()
-	{
+    public function testHasClient()
+    {
         $base_transformer = new BaseTransformer($this->company);
 
-		$client = 		Client::factory()->create([
-				                'user_id' => $this->user->id,
-				                'company_id' => $this->company->id,
-				                'id_number' => 'hit',
-				                'name' => 'maGic ',
-				        ]);
+        $client = Client::factory()->create([
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'id_number' => 'hit',
+            'name' => 'maGic ',
+        ]);
 
+        $this->assertTrue($base_transformer->hasClient('magic'));
+        $this->assertTrue($base_transformer->hasClient('Magic'));
+        $this->assertTrue($base_transformer->hasClient('Ma gi c '));
+    }
 
-		$this->assertTrue($base_transformer->hasClient("magic"));
-		$this->assertTrue($base_transformer->hasClient("Magic"));
-		$this->assertTrue($base_transformer->hasClient("Ma gi c "));
-
-	}
-
-	public function testHasVendor()
-	{
+    public function testHasVendor()
+    {
         $base_transformer = new BaseTransformer($this->company);
 
-		$client = 		Vendor::factory()->create([
-				                'user_id' => $this->user->id,
-				                'company_id' => $this->company->id,
-				                'id_number' => 'hit',
-				                'name' => 'maGic ',
-				        ]);
+        $client = Vendor::factory()->create([
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'id_number' => 'hit',
+            'name' => 'maGic ',
+        ]);
 
+        $this->assertTrue($base_transformer->hasVendor('magic'));
+        $this->assertTrue($base_transformer->hasVendor('Magic'));
+        $this->assertTrue($base_transformer->hasVendor('Ma gi c '));
+    }
 
-		$this->assertTrue($base_transformer->hasVendor("magic"));
-		$this->assertTrue($base_transformer->hasVendor("Magic"));
-		$this->assertTrue($base_transformer->hasVendor("Ma gi c "));
-
-	}
-
-	public function testHasProduct()
-	{
+    public function testHasProduct()
+    {
         $base_transformer = new BaseTransformer($this->company);
 
-		$client = 		Product::factory()->create([
-				                'user_id' => $this->user->id,
-				                'company_id' => $this->company->id,
-				                'product_key' => 'HiT ',
-				        ]);
+        $client = Product::factory()->create([
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'product_key' => 'HiT ',
+        ]);
 
+        $this->assertTrue($base_transformer->hasProduct('hit'));
+        $this->assertTrue($base_transformer->hasProduct(' hIt'));
+        $this->assertTrue($base_transformer->hasProduct('  h i T '));
+    }
 
-		$this->assertTrue($base_transformer->hasProduct("hit"));
-		$this->assertTrue($base_transformer->hasProduct(" hIt"));
-		$this->assertTrue($base_transformer->hasProduct("  h i T "));
-
-	}
-
-
-
-	public function testGetCountryId()
-	{
+    public function testGetCountryId()
+    {
         $base_transformer = new BaseTransformer($this->company);
 
-		$this->assertEquals(840, $base_transformer->getCountryId("us"));
-		$this->assertEquals(840, $base_transformer->getCountryId("US"));
-		$this->assertEquals(840, $base_transformer->getCountryId("United States"));
+        $this->assertEquals(840, $base_transformer->getCountryId('us'));
+        $this->assertEquals(840, $base_transformer->getCountryId('US'));
+        $this->assertEquals(840, $base_transformer->getCountryId('United States'));
+    }
 
-	}
-
-
-	public function testGetTaxRate()
-	{
+    public function testGetTaxRate()
+    {
         $base_transformer = new BaseTransformer($this->company);
 
-		$client = 		TaxRate::factory()->create([
-				                'user_id' => $this->user->id,
-				                'company_id' => $this->company->id,
-				                'rate' => '10',
-				                'name' => 'GST'
-				        ]);
+        $client = TaxRate::factory()->create([
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'rate' => '10',
+            'name' => 'GST',
+        ]);
 
-		$this->assertEquals(10, $base_transformer->getTaxRate("gst"));
-		$this->assertEquals(10, $base_transformer->getTaxRate(" GST"));
-		$this->assertEquals(10, $base_transformer->getTaxRate("  gS t "));
+        $this->assertEquals(10, $base_transformer->getTaxRate('gst'));
+        $this->assertEquals(10, $base_transformer->getTaxRate(' GST'));
+        $this->assertEquals(10, $base_transformer->getTaxRate('  gS t '));
+    }
 
-	}
-
-
-	public function testGetTaxName()
-	{
+    public function testGetTaxName()
+    {
         $base_transformer = new BaseTransformer($this->company);
 
-		$client = 		TaxRate::factory()->create([
-				                'user_id' => $this->user->id,
-				                'company_id' => $this->company->id,
-				                'rate' => '17.5',
-				                'name' => 'VAT'
-				        ]);
+        $client = TaxRate::factory()->create([
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'rate' => '17.5',
+            'name' => 'VAT',
+        ]);
 
-		$this->assertEquals("VAT", $base_transformer->getTaxName("vat"));
-		$this->assertEquals("VAT", $base_transformer->getTaxName(" VaT"));
-		$this->assertEquals("VAT", $base_transformer->getTaxName("  va T "));
+        $this->assertEquals('VAT', $base_transformer->getTaxName('vat'));
+        $this->assertEquals('VAT', $base_transformer->getTaxName(' VaT'));
+        $this->assertEquals('VAT', $base_transformer->getTaxName('  va T '));
+    }
 
-	}
-
-	public function testGetInvoiceId()
-	{
+    public function testGetInvoiceId()
+    {
         $base_transformer = new BaseTransformer($this->company);
 
-		$invoice = 		Invoice::factory()->create([
-				                'user_id' => $this->user->id,
-				                'company_id' => $this->company->id,
-				                'client_id' => $this->client->id,
-				                'number' => 'trick_number_123',
-				        ]);
+        $invoice = Invoice::factory()->create([
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'client_id' => $this->client->id,
+            'number' => 'trick_number_123',
+        ]);
 
-		$this->assertEquals($invoice->id, $base_transformer->getInvoiceId("TRICK_number_123"));
-		$this->assertEquals($invoice->id, $base_transformer->getInvoiceId(" TRICK_number_123"));
-		$this->assertEquals($invoice->id, $base_transformer->getInvoiceId("  TRICK_number_123 "));
+        $this->assertEquals($invoice->id, $base_transformer->getInvoiceId('TRICK_number_123'));
+        $this->assertEquals($invoice->id, $base_transformer->getInvoiceId(' TRICK_number_123'));
+        $this->assertEquals($invoice->id, $base_transformer->getInvoiceId('  TRICK_number_123 '));
+    }
 
-	}
-
-
-
-	public function testHasInvoiceWithNumber()
-	{
+    public function testHasInvoiceWithNumber()
+    {
         $base_transformer = new BaseTransformer($this->company);
 
-		$client = 		Invoice::factory()->create([
-				                'user_id' => $this->user->id,
-				                'company_id' => $this->company->id,
-				                'client_id' => $this->client->id,
-				                'number' => 'tricky_number_123',
-				        ]);
+        $client = Invoice::factory()->create([
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'client_id' => $this->client->id,
+            'number' => 'tricky_number_123',
+        ]);
 
-		$this->assertTrue($base_transformer->hasInvoice("TRICKY_number_123"));
-		$this->assertTrue($base_transformer->hasInvoice(" TRICKY_number_123"));
-		$this->assertTrue($base_transformer->hasInvoice("  TRICKY_number_123 "));
+        $this->assertTrue($base_transformer->hasInvoice('TRICKY_number_123'));
+        $this->assertTrue($base_transformer->hasInvoice(' TRICKY_number_123'));
+        $this->assertTrue($base_transformer->hasInvoice('  TRICKY_number_123 '));
+    }
 
-	}
-	public function testInvoiceClientId()
-	{
+    public function testInvoiceClientId()
+    {
         $base_transformer = new BaseTransformer($this->company);
 
-		$client = 		Invoice::factory()->create([
-				                'user_id' => $this->user->id,
-				                'company_id' => $this->company->id,
-				                'client_id' => $this->client->id,
-				                'number' => 'tricky_number_123',
-				        ]);
+        $client = Invoice::factory()->create([
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'client_id' => $this->client->id,
+            'number' => 'tricky_number_123',
+        ]);
 
-		$this->assertEquals($this->client->id, $base_transformer->getInvoiceClientId("TRICKY_number_123"));
-		$this->assertEquals($this->client->id, $base_transformer->getInvoiceClientId(" TRICKY_number_123"));
-		$this->assertEquals($this->client->id, $base_transformer->getInvoiceClientId("  TRICKY_number_123 "));
+        $this->assertEquals($this->client->id, $base_transformer->getInvoiceClientId('TRICKY_number_123'));
+        $this->assertEquals($this->client->id, $base_transformer->getInvoiceClientId(' TRICKY_number_123'));
+        $this->assertEquals($this->client->id, $base_transformer->getInvoiceClientId('  TRICKY_number_123 '));
+    }
 
-	}
-
-	public function testGetVendorId()
-	{
+    public function testGetVendorId()
+    {
         $base_transformer = new BaseTransformer($this->company);
 
-		$vendor = 		Vendor::factory()->create([
-				                'user_id' => $this->user->id,
-				                'company_id' => $this->company->id,
-				                'id_number' => 'hit',
-				                'name' => 'maGic ',
-				        ]);
+        $vendor = Vendor::factory()->create([
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'id_number' => 'hit',
+            'name' => 'maGic ',
+        ]);
 
+        $this->assertEquals($vendor->id, $base_transformer->getVendorId('magic'));
+        $this->assertEquals($vendor->id, $base_transformer->getVendorId('Magic'));
+        $this->assertEquals($vendor->id, $base_transformer->getVendorId('Ma gi c '));
+    }
 
-		$this->assertEquals($vendor->id, $base_transformer->getVendorId("magic"));
-		$this->assertEquals($vendor->id, $base_transformer->getVendorId("Magic"));
-		$this->assertEquals($vendor->id, $base_transformer->getVendorId("Ma gi c "));
+    // public function testClientCsvImport()
+    // {
+    // 	$csv = file_get_contents(base_path().'/tests/Feature/Import/clients.csv');
+    // 	$hash = Str::random(32);
+    // 	$column_map = [
+    // 		1 => 'client.balance',
+    // 		2 => 'client.paid_to_date',
+    // 		0 => 'client.name',
+    // 		19 => 'client.currency_id',
+    // 		20 => 'client.public_notes',
+    // 		21 => 'client.private_notes',
+    // 		22 => 'contact.first_name',
+    // 		23 => 'contact.last_name',
+    // 	];
 
-	}
+    // 	$data = [
+    // 		'hash'        => $hash,
+    // 		'column_map'  => [ 'client' => [ 'mapping' => $column_map ] ],
+    // 		'skip_header' => true,
+    // 		'import_type' => 'csv',
+    // 	];
 
+    // 	$pre_import = Client::count();
 
+    // 	Cache::put( $hash . '-client', base64_encode( $csv ), 360 );
 
+    // 	CSVImport::dispatchNow( $data, $this->company );
 
-	// public function testClientCsvImport()
-	// {
-	// 	$csv = file_get_contents(base_path().'/tests/Feature/Import/clients.csv');
-	// 	$hash = Str::random(32);
-	// 	$column_map = [
-	// 		1 => 'client.balance',
-	// 		2 => 'client.paid_to_date',
-	// 		0 => 'client.name',
-	// 		19 => 'client.currency_id',
-	// 		20 => 'client.public_notes',
-	// 		21 => 'client.private_notes',
-	// 		22 => 'contact.first_name',
-	// 		23 => 'contact.last_name',
-	// 	];
-
-	// 	$data = [
-	// 		'hash'        => $hash,
-	// 		'column_map'  => [ 'client' => [ 'mapping' => $column_map ] ],
-	// 		'skip_header' => true,
-	// 		'import_type' => 'csv',
-	// 	];
-
-	// 	$pre_import = Client::count();
-
-	// 	Cache::put( $hash . '-client', base64_encode( $csv ), 360 );
-
-	// 	CSVImport::dispatchNow( $data, $this->company );
-
-	// 	$this->assertGreaterThan( $pre_import, Client::count() );
-	// }
-
+    // 	$this->assertGreaterThan( $pre_import, Client::count() );
+    // }
 }
diff --git a/tests/Feature/Import/CSV/CsvImportTest.php b/tests/Feature/Import/CSV/CsvImportTest.php
index 68feae91773e..36197053d47b 100644
--- a/tests/Feature/Import/CSV/CsvImportTest.php
+++ b/tests/Feature/Import/CSV/CsvImportTest.php
@@ -6,7 +6,7 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace Tests\Feature\Import\CSV;
@@ -40,7 +40,7 @@ class CsvImportTest extends TestCase
     use MakesHash;
     use MockAccountData;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -56,7 +56,7 @@ class CsvImportTest extends TestCase
     public function testExpenseCsvImport()
     {
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/expenses.csv'
+            base_path().'/tests/Feature/Import/expenses.csv'
         );
         $hash = Str::random(32);
         $column_map = [
@@ -73,7 +73,7 @@ class CsvImportTest extends TestCase
             'import_type' => 'csv',
         ];
 
-        Cache::put($hash . '-expense', base64_encode($csv), 360);
+        Cache::put($hash.'-expense', base64_encode($csv), 360);
 
         $csv_importer = new Csv($data, $this->company);
 
@@ -87,7 +87,7 @@ class CsvImportTest extends TestCase
     public function testVendorCsvImport()
     {
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/vendors.csv'
+            base_path().'/tests/Feature/Import/vendors.csv'
         );
         $hash = Str::random(32);
         $column_map = [
@@ -108,7 +108,7 @@ class CsvImportTest extends TestCase
 
         $pre_import = Vendor::count();
 
-        Cache::put($hash . '-vendor', base64_encode($csv), 360);
+        Cache::put($hash.'-vendor', base64_encode($csv), 360);
 
         $csv_importer = new Csv($data, $this->company);
 
@@ -122,10 +122,10 @@ class CsvImportTest extends TestCase
     public function testProductImport()
     {
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/products.csv'
+            base_path().'/tests/Feature/Import/products.csv'
         );
         $hash = Str::random(32);
-        Cache::put($hash . '-product', base64_encode($csv), 360);
+        Cache::put($hash.'-product', base64_encode($csv), 360);
 
         $column_map = [
             1 => 'product.product_key',
@@ -149,13 +149,12 @@ class CsvImportTest extends TestCase
         $base_transformer = new BaseTransformer($this->company);
 
         $this->assertTrue($base_transformer->hasProduct('officiis'));
-        // $this->assertTrue($base_transformer->hasProduct('maxime'));
     }
 
     public function testClientImport()
     {
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/clients.csv'
+            base_path().'/tests/Feature/Import/clients.csv'
         );
         $hash = Str::random(32);
         $column_map = [
@@ -177,7 +176,7 @@ class CsvImportTest extends TestCase
             'import_type' => 'csv',
         ];
 
-        Cache::put($hash . '-client', base64_encode($csv), 360);
+        Cache::put($hash.'-client', base64_encode($csv), 360);
 
         $csv_importer = new Csv($data, $this->company);
 
@@ -189,7 +188,7 @@ class CsvImportTest extends TestCase
 
         $this->assertTrue($base_transformer->hasClient('Ludwig Krajcik DVM'));
         $this->assertTrue($base_transformer->hasClient('Bradly Jaskolski Sr.'));
-        
+
         $client_id = $base_transformer->getClient('Ludwig Krajcik DVM', null);
 
         $c = Client::find($client_id);
@@ -208,7 +207,7 @@ class CsvImportTest extends TestCase
     {
         /*Need to import clients first*/
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/clients.csv'
+            base_path().'/tests/Feature/Import/clients.csv'
         );
         $hash = Str::random(32);
         $column_map = [
@@ -229,7 +228,7 @@ class CsvImportTest extends TestCase
             'import_type' => 'csv',
         ];
 
-        Cache::put($hash . '-client', base64_encode($csv), 360);
+        Cache::put($hash.'-client', base64_encode($csv), 360);
 
         $csv_importer = new Csv($data, $this->company);
 
@@ -245,7 +244,7 @@ class CsvImportTest extends TestCase
 
         /*Now import invoices*/
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/invoice.csv'
+            base_path().'/tests/Feature/Import/invoice.csv'
         );
         $hash = Str::random(32);
 
@@ -274,18 +273,18 @@ class CsvImportTest extends TestCase
             'import_type' => 'csv',
         ];
 
-        Cache::put($hash . '-invoice', base64_encode($csv), 360);
+        Cache::put($hash.'-invoice', base64_encode($csv), 360);
 
         $csv_importer = new Csv($data, $this->company);
 
         $csv_importer->import('invoice');
 
-        $this->assertTrue($base_transformer->hasInvoice('801'));
+        $this->assertTrue($base_transformer->hasInvoice('780'));
 
         /* Lets piggy back payments tests here to save rebuilding the test multiple times*/
 
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/payments.csv'
+            base_path().'/tests/Feature/Import/payments.csv'
         );
         $hash = Str::random(32);
 
@@ -303,21 +302,21 @@ class CsvImportTest extends TestCase
             'import_type' => 'csv',
         ];
 
-        Cache::put($hash . '-payment', base64_encode($csv), 360);
+        Cache::put($hash.'-payment', base64_encode($csv), 360);
 
         $csv_importer = new Csv($data, $this->company);
 
         $csv_importer->import('payment');
 
-        $this->assertTrue($base_transformer->hasInvoice('801'));
+        $this->assertTrue($base_transformer->hasInvoice('780'));
 
-        $invoice_id = $base_transformer->getInvoiceId('801');
+        $invoice_id = $base_transformer->getInvoiceId('780');
 
-        $invoice = Invoice::find($invoice_id);
+        $invoice = Invoice::with('payments')->find($invoice_id);
 
         $this->assertTrue($invoice->payments()->exists());
-        $this->assertEquals(3, $invoice->payments()->count());
-        $this->assertEquals(1200, $invoice->payments()->sum('payments.amount'));
+        $this->assertEquals(1, $invoice->payments()->count());
+        $this->assertEquals(51.03, round($invoice->payments()->sum('payments.amount'),2));
     }
 }
 
diff --git a/tests/Feature/Import/Freshbooks/FreshbooksTest.php b/tests/Feature/Import/Freshbooks/FreshbooksTest.php
index 7313c98d89ca..a6062b1b3454 100644
--- a/tests/Feature/Import/Freshbooks/FreshbooksTest.php
+++ b/tests/Feature/Import/Freshbooks/FreshbooksTest.php
@@ -6,7 +6,7 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace Tests\Feature\Import\Freshbooks;
@@ -37,7 +37,7 @@ class FreshbooksTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -53,7 +53,7 @@ class FreshbooksTest extends TestCase
     public function testClientFreshbooksImport()
     {
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/freshbooks_clients.csv'
+            base_path().'/tests/Feature/Import/freshbooks_clients.csv'
         );
         $hash = Str::random(32);
 
@@ -68,7 +68,7 @@ class FreshbooksTest extends TestCase
             7 => 'Province/State',
             8 => 'Country',
             9 => 'Postal Code',
-            10 => 'Notes',     
+            10 => 'Notes',
         ];
 
         $data = [
@@ -78,7 +78,7 @@ class FreshbooksTest extends TestCase
             'import_type' => 'freshbooks',
         ];
 
-        Cache::put($hash . '-client', base64_encode($csv), 360);
+        Cache::put($hash.'-client', base64_encode($csv), 360);
 
         $csv_importer = new Freshbooks($data, $this->company);
 
@@ -96,14 +96,12 @@ class FreshbooksTest extends TestCase
         $this->assertInstanceOf(Client::class, $client);
         $this->assertEquals('840', $client->country_id);
         $this->assertEquals('867-5309', $client->phone);
-
-        
     }
 
     public function testInvoiceZohoImport()
     {
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/freshbooks_clients.csv'
+            base_path().'/tests/Feature/Import/freshbooks_clients.csv'
         );
         $hash = Str::random(32);
 
@@ -118,7 +116,7 @@ class FreshbooksTest extends TestCase
             7 => 'Province/State',
             8 => 'Country',
             9 => 'Postal Code',
-            10 => 'Notes',     
+            10 => 'Notes',
         ];
 
         $data = [
@@ -128,7 +126,7 @@ class FreshbooksTest extends TestCase
             'import_type' => 'freshbooks',
         ];
 
-        Cache::put($hash . '-client', base64_encode($csv), 360);
+        Cache::put($hash.'-client', base64_encode($csv), 360);
 
         $csv_importer = new Freshbooks($data, $this->company);
 
@@ -150,7 +148,7 @@ class FreshbooksTest extends TestCase
         //now import the invoices
 
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/freshbooks_invoices.csv'
+            base_path().'/tests/Feature/Import/freshbooks_invoices.csv'
         );
         $hash = Str::random(32);
 
@@ -171,7 +169,7 @@ class FreshbooksTest extends TestCase
             13 => 'Tax 2 Type',
             14 => 'Tax 2 Amount',
             15 => 'Line Total',
-            16 => 'Currency', 
+            16 => 'Currency',
         ];
 
         $data = [
@@ -181,7 +179,7 @@ class FreshbooksTest extends TestCase
             'import_type' => 'freshbooks',
         ];
 
-        Cache::put($hash . '-invoice', base64_encode($csv), 360);
+        Cache::put($hash.'-invoice', base64_encode($csv), 360);
 
         $csv_importer = new Freshbooks($data, $this->company);
 
@@ -189,19 +187,15 @@ class FreshbooksTest extends TestCase
 
         $base_transformer = new BaseTransformer($this->company);
 
-        $this->assertTrue($base_transformer->hasInvoice("0000001"));
-        $invoice_id = $base_transformer->getInvoiceId("0000001");
+        $this->assertTrue($base_transformer->hasInvoice('0000001'));
+        $invoice_id = $base_transformer->getInvoiceId('0000001');
         $invoice = Invoice::find($invoice_id);
 
-        $this->assertEquals(7890 , $invoice->amount);
-        $this->assertEquals(2 , $invoice->status_id);
-        $this->assertEquals(7890 , $invoice->balance);
-        $this->assertEquals(3 , count($invoice->line_items));
+        $this->assertEquals(7890, $invoice->amount);
+        $this->assertEquals(2, $invoice->status_id);
+        $this->assertEquals(7890, $invoice->balance);
+        $this->assertEquals(3, count($invoice->line_items));
 
         $this->assertFalse($invoice->payments()->exists());
-
     }
-
-
 }
-
diff --git a/tests/Feature/Import/ImportCompanyTest.php b/tests/Feature/Import/ImportCompanyTest.php
index 1cf92665e555..9d5d7f30df51 100644
--- a/tests/Feature/Import/ImportCompanyTest.php
+++ b/tests/Feature/Import/ImportCompanyTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature\Import;
 
 use App\Jobs\Import\CSVImport;
@@ -32,8 +33,8 @@ use App\Models\GroupSetting;
 use App\Models\Invoice;
 use App\Models\InvoiceInvitation;
 use App\Models\Payment;
-use App\Models\PaymentTerm;
 use App\Models\Paymentable;
+use App\Models\PaymentTerm;
 use App\Models\Product;
 use App\Models\Project;
 use App\Models\Quote;
@@ -59,7 +60,6 @@ use Tests\TestCase;
 
 /**
  * @test
- * 
  */
 class ImportCompanyTest extends TestCase
 {
@@ -67,11 +67,14 @@ class ImportCompanyTest extends TestCase
     use DatabaseTransactions;
 
     public $account;
+
     public $company;
+
     public $backup_json_object;
+
     public $ids;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -83,11 +86,11 @@ class ImportCompanyTest extends TestCase
 
         $this->withoutExceptionHandling();
 
-        Account::all()->each(function ($account){
+        Account::all()->each(function ($account) {
             $account->delete();
         });
 
-        CompanyGateway::all()->each(function ($cg){
+        CompanyGateway::all()->each(function ($cg) {
             $cg->forceDelete();
         });
 
@@ -98,20 +101,20 @@ class ImportCompanyTest extends TestCase
 
         $zip = new \ZipArchive;
         $res = $zip->open($backup_json_file_zip);
-        if ($res === TRUE) {
-          $zip->extractTo(sys_get_temp_dir());
-          $zip->close();
-        } 
+        if ($res === true) {
+            $zip->extractTo(sys_get_temp_dir());
+            $zip->close();
+        }
 
-        $backup_json_file = sys_get_temp_dir() . "/backup/backup.json";
+        $backup_json_file = sys_get_temp_dir().'/backup/backup.json';
 
         $this->backup_json_object = json_decode(file_get_contents($backup_json_file));
 
-        Credit::all()->each(function($credit){
+        Credit::all()->each(function ($credit) {
             $credit->forceDelete();
         });
 
-        CreditInvitation::all()->each(function($credit){
+        CreditInvitation::all()->each(function ($credit) {
             $credit->forceDelete();
         });
     }
@@ -123,27 +126,26 @@ class ImportCompanyTest extends TestCase
         $zip = new \ZipArchive;
         $res = $zip->open($backup_json_file_zip);
 
-        if ($res === TRUE) {
-          $zip->extractTo(sys_get_temp_dir());
-          $zip->close();
-        } 
+        if ($res === true) {
+            $zip->extractTo(sys_get_temp_dir());
+            $zip->close();
+        }
 
-        $backup_json_file = sys_get_temp_dir() . "/backup/backup.json";
+        $backup_json_file = sys_get_temp_dir().'/backup/backup.json';
 
-        $this->assertTrue(is_array(json_decode(file_get_contents($backup_json_file),1)));
+        $this->assertTrue(is_array(json_decode(file_get_contents($backup_json_file), 1)));
 
         unlink($backup_json_file);
     }
 
     public function testAppVersion()
     {
-        $this->assertEquals("5.1.65", $this->backup_json_object->app_version);
+        $this->assertEquals('5.1.65', $this->backup_json_object->app_version);
     }
 
     public function testImportUsers()
     {
-
-        CompanyGateway::all()->each(function ($cg){
+        CompanyGateway::all()->each(function ($cg) {
             $cg->forceDelete();
         });
 
@@ -152,7 +154,7 @@ class ImportCompanyTest extends TestCase
         /***************************** Users *****************************/
         $this->assertTrue(property_exists($this->backup_json_object, 'users'));
 
-        User::all()->each(function ($user){
+        User::all()->each(function ($user) {
             $user->forceDelete();
         });
 
@@ -160,9 +162,8 @@ class ImportCompanyTest extends TestCase
 
         $this->assertEquals(2, count($this->backup_json_object->users));
 
-        foreach ($this->backup_json_object->users as $user)
-        {
-            $user_array = (array)$user;
+        foreach ($this->backup_json_object->users as $user) {
+            $user_array = (array) $user;
             unset($user_array['laravel_through_key']);
             unset($user_array['hashed_id']);
 
@@ -174,7 +175,6 @@ class ImportCompanyTest extends TestCase
             $new_user->save(['timestamps' => false]);
 
             $this->ids['users']["{$user->hashed_id}"] = $new_user->id;
-
         }
 
         User::reguard();
@@ -182,18 +182,16 @@ class ImportCompanyTest extends TestCase
         $this->assertEquals(2, User::count());
         /***************************** Users *****************************/
 
-
         /***************************** Company Users *****************************/
 
         $this->assertEquals(2, count($this->backup_json_object->company_users));
 
         CompanyUser::unguard();
 
-        foreach($this->backup_json_object->company_users as $cu)
-        {
+        foreach ($this->backup_json_object->company_users as $cu) {
             $user_id = $this->transformId('users', $cu->user_id);
 
-            $cu_array = (array)$cu;
+            $cu_array = (array) $cu;
             unset($cu_array['user_id']);
             unset($cu_array['company_id']);
             unset($cu_array['account_id']);
@@ -207,7 +205,6 @@ class ImportCompanyTest extends TestCase
 
             $new_cu->account_id = $this->account->id;
             $new_cu->save(['timestamps' => false]);
-            
         }
 
         CompanyUser::reguard();
@@ -215,18 +212,16 @@ class ImportCompanyTest extends TestCase
         $this->assertEquals(2, CompanyUser::count());
         /***************************** Company Users *****************************/
 
-
         /***************************** Company Tokens *****************************/
 
         $this->assertEquals(2, count($this->backup_json_object->company_tokens));
 
         CompanyToken::unguard();
 
-        foreach($this->backup_json_object->company_tokens as $ct)
-        {
+        foreach ($this->backup_json_object->company_tokens as $ct) {
             $user_id = $this->transformId('users', $ct->user_id);
 
-            $ct_array = (array)$ct;
+            $ct_array = (array) $ct;
             unset($ct_array['user_id']);
             unset($ct_array['company_id']);
             unset($ct_array['account_id']);
@@ -240,7 +235,6 @@ class ImportCompanyTest extends TestCase
 
             $new_ct->account_id = $this->account->id;
             $new_ct->save(['timestamps' => false]);
-            
         }
 
         CompanyToken::reguard();
@@ -248,18 +242,15 @@ class ImportCompanyTest extends TestCase
         $this->assertEquals(2, CompanyToken::count());
         /***************************** Company Tokens *****************************/
 
-
         /***************************** Payment Terms *****************************/
         PaymentTerm::unguard();
 
         $this->assertEquals(8, count($this->backup_json_object->payment_terms));
 
-        foreach($this->backup_json_object->payment_terms as $obj)
-        {
-        
+        foreach ($this->backup_json_object->payment_terms as $obj) {
             $user_id = $this->transformId('users', $obj->user_id);
 
-            $obj_array = (array)$obj;
+            $obj_array = (array) $obj;
             unset($obj_array['user_id']);
             unset($obj_array['company_id']);
             unset($obj_array['account_id']);
@@ -272,11 +263,10 @@ class ImportCompanyTest extends TestCase
                     );
 
             $new_obj->save(['timestamps' => false]);
-            
         }
 
         PaymentTerm::reguard();
-    
+
         $this->assertEquals(8, PaymentTerm::count());
         /***************************** Payment Terms *****************************/
 
@@ -285,12 +275,10 @@ class ImportCompanyTest extends TestCase
 
         $this->assertEquals(2, count($this->backup_json_object->tax_rates));
 
-        foreach($this->backup_json_object->tax_rates as $obj)
-        {
-        
+        foreach ($this->backup_json_object->tax_rates as $obj) {
             $user_id = $this->transformId('users', $obj->user_id);
 
-            $obj_array = (array)$obj;
+            $obj_array = (array) $obj;
             unset($obj_array['user_id']);
             unset($obj_array['company_id']);
             unset($obj_array['hashed_id']);
@@ -303,11 +291,10 @@ class ImportCompanyTest extends TestCase
                     );
 
             $new_obj->save(['timestamps' => false]);
-            
         }
 
         TaxRate::reguard();
-    
+
         $this->assertEquals(2, TaxRate::count());
         /***************************** Tax Rates *****************************/
 
@@ -316,12 +303,10 @@ class ImportCompanyTest extends TestCase
 
         $this->assertEquals(2, count($this->backup_json_object->expense_categories));
 
-        foreach($this->backup_json_object->expense_categories as $obj)
-        {
-        
+        foreach ($this->backup_json_object->expense_categories as $obj) {
             $user_id = $this->transformId('users', $obj->user_id);
 
-            $obj_array = (array)$obj;
+            $obj_array = (array) $obj;
             unset($obj_array['user_id']);
             unset($obj_array['company_id']);
             unset($obj_array['hashed_id']);
@@ -333,26 +318,22 @@ class ImportCompanyTest extends TestCase
                     );
 
             $new_obj->save(['timestamps' => false]);
-            
         }
 
         ExpenseCategory::reguard();
-    
+
         $this->assertEquals(2, ExpenseCategory::count());
         /***************************** Expense Category *****************************/
 
-
         /***************************** Task Statuses *****************************/
         TaskStatus::unguard();
 
         $this->assertEquals(4, count($this->backup_json_object->task_statuses));
 
-        foreach($this->backup_json_object->task_statuses as $obj)
-        {
-        
+        foreach ($this->backup_json_object->task_statuses as $obj) {
             $user_id = $this->transformId('users', $obj->user_id);
 
-            $obj_array = (array)$obj;
+            $obj_array = (array) $obj;
             unset($obj_array['user_id']);
             unset($obj_array['company_id']);
             unset($obj_array['hashed_id']);
@@ -364,11 +345,10 @@ class ImportCompanyTest extends TestCase
                     );
 
             $new_obj->save(['timestamps' => false]);
-            
         }
 
         TaskStatus::reguard();
-    
+
         $this->assertEquals(4, TaskStatus::count());
         /***************************** Task Statuses *****************************/
 
@@ -377,13 +357,11 @@ class ImportCompanyTest extends TestCase
 
         $this->assertEquals(1, count($this->backup_json_object->clients));
 
-        foreach($this->backup_json_object->clients as $obj)
-        {
-        
+        foreach ($this->backup_json_object->clients as $obj) {
             $user_id = $this->transformId('users', $obj->user_id);
             $assigned_user_id = $this->transformId('users', $obj->assigned_user_id);
 
-            $obj_array = (array)$obj;
+            $obj_array = (array) $obj;
             unset($obj_array['user_id']);
             unset($obj_array['company_id']);
             unset($obj_array['account_id']);
@@ -392,20 +370,19 @@ class ImportCompanyTest extends TestCase
             unset($obj_array['gateway_tokens']);
             unset($obj_array['contacts']);
             unset($obj_array['documents']);
-            
+
             $new_obj = Client::firstOrNew(
                         ['number' => $obj->number, 'company_id' => $this->company->id],
                         $obj_array,
                     );
 
             $new_obj->save(['timestamps' => false]);
-            
-            $this->ids['clients']["{$obj->hashed_id}"] = $new_obj->id;
 
+            $this->ids['clients']["{$obj->hashed_id}"] = $new_obj->id;
         }
 
         Client::reguard();
-    
+
         $this->assertEquals(1, Client::count());
         /***************************** Clients *****************************/
 
@@ -414,13 +391,11 @@ class ImportCompanyTest extends TestCase
 
         $this->assertEquals(1, count($this->backup_json_object->client_contacts));
 
-        foreach($this->backup_json_object->client_contacts as $obj)
-        {
-
+        foreach ($this->backup_json_object->client_contacts as $obj) {
             $user_id = $this->transformId('users', $obj->user_id);
             $client_id = $this->transformId('clients', $obj->client_id);
 
-            $obj_array = (array)$obj;
+            $obj_array = (array) $obj;
             unset($obj_array['user_id']);
             unset($obj_array['company_id']);
             unset($obj_array['account_id']);
@@ -429,7 +404,7 @@ class ImportCompanyTest extends TestCase
             unset($obj_array['gateway_tokens']);
             unset($obj_array['contacts']);
             unset($obj_array['documents']);
-            
+
             $obj_array['client_id'] = $client_id;
 
             $new_obj = ClientContact::firstOrNew(
@@ -438,23 +413,22 @@ class ImportCompanyTest extends TestCase
                     );
 
             $new_obj->save(['timestamps' => false]);
-            
-            $this->ids['client_contacts']["{$obj->hashed_id}"] = $new_obj->id;
 
+            $this->ids['client_contacts']["{$obj->hashed_id}"] = $new_obj->id;
         }
 
         ClientContact::reguard();
-    
+
         $this->assertEquals(1, ClientContact::count());
         /***************************** Client Contacts *****************************/
 
-//vendors!
+        //vendors!
         /* Generic */
         $this->assertEquals(1, count($this->backup_json_object->vendors));
 
-        $this->genericImport(Vendor::class, 
-            ['user_id', 'assigned_user_id', 'company_id', 'id', 'hashed_id'], 
-            [['users' => 'user_id'], ['users' =>'assigned_user_id']], 
+        $this->genericImport(Vendor::class,
+            ['user_id', 'assigned_user_id', 'company_id', 'id', 'hashed_id'],
+            [['users' => 'user_id'], ['users' =>'assigned_user_id']],
             'vendors',
             'number');
 
@@ -464,313 +438,303 @@ class ImportCompanyTest extends TestCase
 
         $this->assertEquals(1, count($this->backup_json_object->projects));
         //$class, $unset, $transforms, $object_property, $match_key
-        $this->genericImport(Project::class, 
-            ['user_id', 'assigned_user_id', 'company_id', 'id', 'hashed_id','client_id'], 
-            [['users' => 'user_id'], ['users' =>'assigned_user_id'], ['clients' => 'client_id']], 
+        $this->genericImport(Project::class,
+            ['user_id', 'assigned_user_id', 'company_id', 'id', 'hashed_id', 'client_id'],
+            [['users' => 'user_id'], ['users' =>'assigned_user_id'], ['clients' => 'client_id']],
             'projects',
             'number');
 
         $this->assertEquals(1, Project::count());
 
-//projects!
+        //projects!
 
-//products!
+        //products!
 
         $this->assertEquals(1, count($this->backup_json_object->products));
 
         $this->genericNewClassImport(Product::class,
             ['user_id', 'company_id', 'hashed_id', 'id'],
             [['users' => 'user_id'], ['users' =>'assigned_user_id'], ['vendors' => 'vendor_id'], ['projects' => 'project_id']],
-            'products' 
+            'products'
         );
         $this->assertEquals(1, Product::count());
 
-//company gateways        
+        //company gateways
 
         $this->assertEquals(1, count($this->backup_json_object->company_gateways));
 
         $this->genericNewClassImport(CompanyGateway::class,
             ['user_id', 'company_id', 'hashed_id', 'id'],
             [['users' => 'user_id']],
-            'company_gateways' 
+            'company_gateways'
         );
 
         $this->assertEquals(1, CompanyGateway::count());
 
-//company gateways
+        //company gateways
 
+        //client gateway tokens
 
-//client gateway tokens
-
-        $this->genericNewClassImport(ClientGatewayToken::class, 
-            ['company_id', 'id', 'hashed_id','client_id'], 
-            [['clients' => 'client_id']], 
+        $this->genericNewClassImport(ClientGatewayToken::class,
+            ['company_id', 'id', 'hashed_id', 'client_id'],
+            [['clients' => 'client_id']],
             'client_gateway_tokens');
 
-//client gateway tokens
+        //client gateway tokens
 
-//Group Settings
-        $this->genericImport(GroupSetting::class, 
-            ['user_id', 'company_id', 'id', 'hashed_id',], 
-            [['users' => 'user_id']], 
+        //Group Settings
+        $this->genericImport(GroupSetting::class,
+            ['user_id', 'company_id', 'id', 'hashed_id'],
+            [['users' => 'user_id']],
             'group_settings',
             'name');
-//Group Settings
+        //Group Settings
 
-//Subscriptions
+        //Subscriptions
         $this->assertEquals(1, count($this->backup_json_object->subscriptions));
 
-        $this->genericImport(Subscription::class, 
-            ['user_id', 'assigned_user_id', 'company_id', 'id', 'hashed_id',], 
-            [['group_settings' => 'group_id'], ['users' => 'user_id'], ['users' => 'assigned_user_id']], 
+        $this->genericImport(Subscription::class,
+            ['user_id', 'assigned_user_id', 'company_id', 'id', 'hashed_id'],
+            [['group_settings' => 'group_id'], ['users' => 'user_id'], ['users' => 'assigned_user_id']],
             'subscriptions',
             'name');
 
         $this->assertEquals(1, Subscription::count());
 
-//Subscriptions
+        //Subscriptions
+
+        // Recurring Invoices
 
-// Recurring Invoices
- 
         $this->assertEquals(2, count($this->backup_json_object->recurring_invoices));
 
-        $this->genericImport(RecurringInvoice::class, 
-            ['user_id', 'assigned_user_id', 'company_id', 'id', 'hashed_id', 'client_id','subscription_id','project_id','vendor_id','status'], 
+        $this->genericImport(RecurringInvoice::class,
+            ['user_id', 'assigned_user_id', 'company_id', 'id', 'hashed_id', 'client_id', 'subscription_id', 'project_id', 'vendor_id', 'status'],
             [
-                ['subscriptions' => 'subscription_id'], 
-                ['users' => 'user_id'], 
+                ['subscriptions' => 'subscription_id'],
+                ['users' => 'user_id'],
                 ['users' => 'assigned_user_id'],
                 ['clients' => 'client_id'],
                 ['projects' => 'project_id'],
                 ['vendors' => 'vendor_id'],
                 ['clients' => 'client_id'],
-            ], 
+            ],
             'recurring_invoices',
             'number');
 
         $this->assertEquals(2, RecurringInvoice::count());
 
-// Recurring Invoices
+        // Recurring Invoices
 
-
-// Recurring Invoice Invitations
+        // Recurring Invoice Invitations
 
         $this->assertEquals(2, count($this->backup_json_object->recurring_invoice_invitations));
 
-        $this->genericImport(RecurringInvoiceInvitation::class, 
-            ['user_id', 'client_contact_id', 'company_id', 'id', 'hashed_id', 'recurring_invoice_id'], 
+        $this->genericImport(RecurringInvoiceInvitation::class,
+            ['user_id', 'client_contact_id', 'company_id', 'id', 'hashed_id', 'recurring_invoice_id'],
             [
-                ['users' => 'user_id'], 
+                ['users' => 'user_id'],
                 ['recurring_invoices' => 'recurring_invoice_id'],
                 ['client_contacts' => 'client_contact_id'],
-            ], 
+            ],
             'recurring_invoice_invitations',
             'key');
 
         $this->assertEquals(2, RecurringInvoiceInvitation::count());
- 
-// Recurring Invoice Invitations
- 
-// Invoices
+
+        // Recurring Invoice Invitations
+
+        // Invoices
 
         $this->assertEquals(2, count($this->backup_json_object->invoices));
 
-        $this->genericImport(Invoice::class, 
-            ['user_id', 'client_id', 'company_id', 'id', 'hashed_id', 'recurring_id','status'], 
+        $this->genericImport(Invoice::class,
+            ['user_id', 'client_id', 'company_id', 'id', 'hashed_id', 'recurring_id', 'status'],
             [
-                ['users' => 'user_id'], 
-                ['users' => 'assigned_user_id'], 
+                ['users' => 'user_id'],
+                ['users' => 'assigned_user_id'],
                 ['recurring_invoices' => 'recurring_id'],
                 ['clients' => 'client_id'],
                 ['subscriptions' => 'subscription_id'],
                 ['projects' => 'project_id'],
                 ['vendors' => 'vendor_id'],
-            ], 
+            ],
             'invoices',
             'number');
 
         $this->assertEquals(2, Invoice::count());
 
+        // Invoices
 
-// Invoices
-
-//  Invoice Invitations
+        //  Invoice Invitations
 
         $this->assertEquals(2, count($this->backup_json_object->invoice_invitations));
 
-        $this->genericImport(InvoiceInvitation::class, 
-            ['user_id', 'client_contact_id', 'company_id', 'id', 'hashed_id', 'invoice_id'], 
+        $this->genericImport(InvoiceInvitation::class,
+            ['user_id', 'client_contact_id', 'company_id', 'id', 'hashed_id', 'invoice_id'],
             [
-                ['users' => 'user_id'], 
+                ['users' => 'user_id'],
                 ['invoices' => 'invoice_id'],
                 ['client_contacts' => 'client_contact_id'],
-            ], 
+            ],
             'invoice_invitations',
             'key');
 
         $this->assertEquals(2, InvoiceInvitation::count());
- 
-//  Invoice Invitations
 
+        //  Invoice Invitations
 
-// Quotes
+        // Quotes
         $this->assertEquals(2, count($this->backup_json_object->quotes));
 
-        $this->genericImport(Quote::class, 
-            ['user_id', 'client_id', 'company_id', 'id', 'hashed_id', 'recurring_id','status'], 
+        $this->genericImport(Quote::class,
+            ['user_id', 'client_id', 'company_id', 'id', 'hashed_id', 'recurring_id', 'status'],
             [
-                ['users' => 'user_id'], 
-                ['users' => 'assigned_user_id'], 
+                ['users' => 'user_id'],
+                ['users' => 'assigned_user_id'],
                 ['recurring_invoices' => 'recurring_id'],
                 ['clients' => 'client_id'],
                 ['subscriptions' => 'subscription_id'],
                 ['projects' => 'project_id'],
                 ['vendors' => 'vendor_id'],
-            ], 
+            ],
             'quotes',
             'number');
 
         $this->assertEquals(2, Quote::count());
 
+        // Quotes
 
-// Quotes
-
-//  Quotes Invitations
+        //  Quotes Invitations
 
         $this->assertEquals(2, count($this->backup_json_object->quote_invitations));
 
-        $this->genericImport(QuoteInvitation::class, 
-            ['user_id', 'client_contact_id', 'company_id', 'id', 'hashed_id', 'quote_id'], 
+        $this->genericImport(QuoteInvitation::class,
+            ['user_id', 'client_contact_id', 'company_id', 'id', 'hashed_id', 'quote_id'],
             [
-                ['users' => 'user_id'], 
+                ['users' => 'user_id'],
                 ['quotes' => 'quote_id'],
                 ['client_contacts' => 'client_contact_id'],
-            ], 
+            ],
             'quote_invitations',
             'key');
 
         $this->assertEquals(2, QuoteInvitation::count());
- 
-//  Quotes Invitations
 
-// Credits
+        //  Quotes Invitations
+
+        // Credits
         $this->assertEquals(2, count($this->backup_json_object->credits));
 
-        $this->genericImport(Credit::class, 
-            ['user_id', 'client_id', 'company_id', 'id', 'hashed_id', 'recurring_id','status'], 
+        $this->genericImport(Credit::class,
+            ['user_id', 'client_id', 'company_id', 'id', 'hashed_id', 'recurring_id', 'status'],
             [
-                ['users' => 'user_id'], 
-                ['users' => 'assigned_user_id'], 
+                ['users' => 'user_id'],
+                ['users' => 'assigned_user_id'],
                 ['recurring_invoices' => 'recurring_id'],
                 ['clients' => 'client_id'],
                 ['subscriptions' => 'subscription_id'],
                 ['projects' => 'project_id'],
                 ['vendors' => 'vendor_id'],
-            ], 
+            ],
             'credits',
             'number');
 
         $this->assertEquals(2, Credit::count());
 
+        // Credits
 
-// Credits
-
-//  Credits Invitations
+        //  Credits Invitations
 
         $this->assertEquals(2, count($this->backup_json_object->credit_invitations));
 
-        $this->genericImport(CreditInvitation::class, 
-            ['user_id', 'client_contact_id', 'company_id', 'id', 'hashed_id', 'credit_id'], 
+        $this->genericImport(CreditInvitation::class,
+            ['user_id', 'client_contact_id', 'company_id', 'id', 'hashed_id', 'credit_id'],
             [
-                ['users' => 'user_id'], 
+                ['users' => 'user_id'],
                 ['credits' => 'credit_id'],
                 ['client_contacts' => 'client_contact_id'],
-            ], 
+            ],
             'credit_invitations',
             'key');
 
         $this->assertEquals(2, CreditInvitation::count());
- 
-//  Credits Invitations
 
+        //  Credits Invitations
 
-// Expenses
+        // Expenses
 
         $this->assertEquals(2, count($this->backup_json_object->expenses));
 
-        $this->genericImport(Expense::class, 
-            ['assigned_user_id', 'user_id', 'client_id', 'company_id', 'id', 'hashed_id', 'project_id','vendor_id'], 
+        $this->genericImport(Expense::class,
+            ['assigned_user_id', 'user_id', 'client_id', 'company_id', 'id', 'hashed_id', 'project_id', 'vendor_id'],
             [
-                ['users' => 'user_id'], 
-                ['users' => 'assigned_user_id'], 
+                ['users' => 'user_id'],
+                ['users' => 'assigned_user_id'],
                 ['clients' => 'client_id'],
                 ['projects' => 'project_id'],
                 ['vendors' => 'vendor_id'],
-            ], 
+            ],
             'expenses',
             'number');
 
         $this->assertEquals(2, Expense::count());
 
-// Expenses
+        // Expenses
 
-// Tasks
+        // Tasks
 
         $this->assertEquals(3, count($this->backup_json_object->tasks));
 
-        $this->genericImport(Task::class, 
-            ['assigned_user_id', 'user_id', 'client_id', 'company_id', 'id', 'hashed_id', 'invoice_id','project_id'], 
+        $this->genericImport(Task::class,
+            ['assigned_user_id', 'user_id', 'client_id', 'company_id', 'id', 'hashed_id', 'invoice_id', 'project_id'],
             [
-                ['users' => 'user_id'], 
-                ['users' => 'assigned_user_id'], 
+                ['users' => 'user_id'],
+                ['users' => 'assigned_user_id'],
                 ['clients' => 'client_id'],
                 ['projects' => 'project_id'],
                 ['invoices' => 'invoice_id'],
-            ], 
+            ],
             'tasks',
             'number');
 
         $this->assertEquals(3, Task::count());
 
-// Tasks
+        // Tasks
 
-// Payments
+        // Payments
 
         $this->assertEquals(2, count($this->backup_json_object->payments));
 
-        $this->genericImport(Payment::class, 
-            ['assigned_user_id', 'user_id', 'client_id', 'company_id', 'id', 'hashed_id', 'client_contact_id','invitation_id','vendor_id','paymentables'], 
+        $this->genericImport(Payment::class,
+            ['assigned_user_id', 'user_id', 'client_id', 'company_id', 'id', 'hashed_id', 'client_contact_id', 'invitation_id', 'vendor_id', 'paymentables'],
             [
-                ['users' => 'user_id'], 
-                ['users' => 'assigned_user_id'], 
+                ['users' => 'user_id'],
+                ['users' => 'assigned_user_id'],
                 ['clients' => 'client_id'],
                 ['client_contacts' => 'client_contact_id'],
                 ['vendors' => 'vendor_id'],
                 ['invoice_invitations' => 'invitation_id'],
                 ['company_gateways' => 'company_gateway_id'],
-            ], 
+            ],
             'payments',
             'number');
 
         $this->assertEquals(2, Payment::count());
 
-// Payments
- 
-// Paymentables
+        // Payments
+
+        // Paymentables
 
         $this->paymentablesImport();
 
         $this->assertEquals(1, Paymentable::count());
 
+        // Paymentables
 
-// Paymentables
-
-
-// Activities
+        // Activities
         $activities = [];
 
-        foreach($this->backup_json_object->activities as $activity)
-        {
+        foreach ($this->backup_json_object->activities as $activity) {
             $activity->account_id = $this->company->account_id;
             $activities[] = $activity;
         }
@@ -779,7 +743,7 @@ class ImportCompanyTest extends TestCase
 
         $this->backup_json_object->activities = $activities;
 
-        $this->genericNewClassImport(Activity::class, 
+        $this->genericNewClassImport(Activity::class,
             [
                 'user_id',
                 'company_id',
@@ -799,9 +763,9 @@ class ImportCompanyTest extends TestCase
                 'recurring_invoice_id',
                 'hashed_id',
                 'company_id',
-            ], 
+            ],
             [
-                ['users' => 'user_id'], 
+                ['users' => 'user_id'],
                 ['clients' => 'client_id'],
                 ['client_contacts' => 'client_contact_id'],
                 ['projects' => 'project_id'],
@@ -815,74 +779,71 @@ class ImportCompanyTest extends TestCase
                 ['subscriptions' => 'subscription_id'],
                 ['recurring_invoices' => 'recurring_invoice_id'],
                 ['invitations' => 'invitation_id'],
-            ], 
+            ],
             'activities');
 
         $this->assertEquals(25, Activity::count());
 
-// Activities
+        // Activities
 
-// Backup
+        // Backup
 
         $this->assertEquals(25, count($this->backup_json_object->backups));
 
-        $this->genericImportWithoutCompany(Backup::class, 
-            ['activity_id','hashed_id'], 
+        $this->genericImportWithoutCompany(Backup::class,
+            ['activity_id', 'hashed_id'],
             [
-                ['activities' => 'activity_id'], 
-            ], 
+                ['activities' => 'activity_id'],
+            ],
             'backups',
             'created_at');
 
         $this->assertEquals(25, Backup::count());
 
-// Backup
+        // Backup
 
-// Company Ledger
+        // Company Ledger
         $this->assertEquals(3, count($this->backup_json_object->company_ledger));
 
-        $this->genericImport(CompanyLedger::class, 
-            ['company_id', 'user_id', 'client_id', 'activity_id', 'id','account_id'], 
+        $this->genericImport(CompanyLedger::class,
+            ['company_id', 'user_id', 'client_id', 'activity_id', 'id', 'account_id'],
             [
-                ['users' => 'user_id'], 
+                ['users' => 'user_id'],
                 ['clients' => 'client_id'],
                 ['activities' => 'activity_id'],
-            ], 
+            ],
             'company_ledger',
             'created_at');
 
         $this->assertEquals(3, CompanyLedger::count());
 
-// Company Ledger
- 
-// Designs
+        // Company Ledger
 
-        $this->genericImport(Design::class, 
-            ['company_id', 'user_id'], 
+        // Designs
+
+        $this->genericImport(Design::class,
+            ['company_id', 'user_id'],
             [
                 ['users' => 'user_id'],
-            ], 
+            ],
             'designs',
             'name');
 
-//  Designs 
+        //  Designs
 
-// Documents
+        // Documents
         $this->assertEquals(2, count($this->backup_json_object->documents));
 
         $this->documentsImport();
 
         $this->assertEquals(2, Document::count());
 
-// Documents
+        // Documents
     }
 
     private function documentsImport()
     {
-
-        foreach($this->backup_json_object->documents as $document)
-        {
-
+        foreach ($this->backup_json_object->documents as $document) {
             $new_document = new Document();
             $new_document->user_id = $this->transformId('users', $document->user_id);
             $new_document->assigned_user_id = $this->transformId('users', $document->assigned_user_id);
@@ -908,7 +869,6 @@ class ImportCompanyTest extends TestCase
             $new_document->documentable_type = $document->documentable_type;
 
             $new_document->save(['timestamps' => false]);
-        
         }
     }
 
@@ -949,22 +909,16 @@ class ImportCompanyTest extends TestCase
                 return $this->transformId('clients', $id);
                 break;
 
-            
             default:
-                # code...
+                // code...
                 break;
         }
     }
 
     private function paymentablesImport()
     {
-
-        foreach($this->backup_json_object->payments as $payment)
-        {
-
-            foreach($payment->paymentables as $paymentable_obj)
-            {
-
+        foreach ($this->backup_json_object->payments as $payment) {
+            foreach ($payment->paymentables as $paymentable_obj) {
                 $paymentable = new Paymentable();
                 $paymentable->payment_id = $this->transformId('payments', $paymentable_obj->payment_id);
                 $paymentable->paymentable_type = $paymentable_obj->paymentable_type;
@@ -988,58 +942,52 @@ class ImportCompanyTest extends TestCase
                 break;
             case Credit::class:
                 return $this->transformId('credits', $id);
-                break;    
+                break;
             case Payment::class:
-                return $this->transformId('payments', $id);        
+                return $this->transformId('payments', $id);
             default:
-                # code...
+                // code...
                 break;
         }
     }
 
-
     private function genericNewClassImport($class, $unset, $transforms, $object_property)
     {
-
         $class::unguard();
 
-        foreach($this->backup_json_object->{$object_property} as $obj)
-        {
+        foreach ($this->backup_json_object->{$object_property} as $obj) {
             /* Remove unwanted keys*/
-            $obj_array = (array)$obj;
-            foreach($unset as $un){
+            $obj_array = (array) $obj;
+            foreach ($unset as $un) {
                 unset($obj_array[$un]);
             }
 
             $activity_invitation_key = false;
 
-            if($class instanceof Activity){
-
-                if(isset($obj->invitation_id)){
-
-                    if(isset($obj->invoice_id))
+            if ($class instanceof Activity) {
+                if (isset($obj->invitation_id)) {
+                    if (isset($obj->invoice_id)) {
                         $activity_invitation_key = 'invoice_invitations';
-                    elseif(isset($obj->quote_id))
+                    } elseif (isset($obj->quote_id)) {
                         $activity_invitation_key = 'quote_invitations';
-                    elseif($isset($obj->credit_id))
-                        $activity_invitation_key  = 'credit_invitations';
+                    } elseif ($isset($obj->credit_id)) {
+                        $activity_invitation_key = 'credit_invitations';
+                    }
                 }
-
             }
 
             /* Transform old keys to new keys */
-            foreach($transforms as $transform)
-            {
-                foreach($transform as $key => $value)
-                {
-                    if($class instanceof Activity && $activity_invitation_key)
+            foreach ($transforms as $transform) {
+                foreach ($transform as $key => $value) {
+                    if ($class instanceof Activity && $activity_invitation_key) {
                         $key = $activity_invitation_key;
-                    
+                    }
+
                     $obj_array["{$value}"] = $this->transformId($key, $obj->{$value});
-                }    
+                }
             }
 
-            if($class instanceof CompanyGateway) {
+            if ($class instanceof CompanyGateway) {
                 $obj_array['config'] = encrypt($obj_array['config']);
             }
 
@@ -1048,42 +996,35 @@ class ImportCompanyTest extends TestCase
             $new_obj->fill($obj_array);
 
             $new_obj->save(['timestamps' => false]);
-            
-            $this->ids["{$object_property}"]["{$obj->hashed_id}"] = $new_obj->id;
 
+            $this->ids["{$object_property}"]["{$obj->hashed_id}"] = $new_obj->id;
         }
 
         $class::reguard();
-    
-
     }
 
     private function genericImportWithoutCompany($class, $unset, $transforms, $object_property, $match_key)
     {
-
         $class::unguard();
 
-        foreach($this->backup_json_object->{$object_property} as $obj)
-        {
+        foreach ($this->backup_json_object->{$object_property} as $obj) {
             /* Remove unwanted keys*/
-            $obj_array = (array)$obj;
-            foreach($unset as $un){
+            $obj_array = (array) $obj;
+            foreach ($unset as $un) {
                 unset($obj_array[$un]);
             }
 
             /* Transform old keys to new keys */
-            foreach($transforms as $transform)
-            {
-                foreach($transform as $key => $value)
-                {
+            foreach ($transforms as $transform) {
+                foreach ($transform as $key => $value) {
                     $obj_array["{$value}"] = $this->transformId($key, $obj->{$value});
-                }    
+                }
             }
-            
+
             /* New to convert product ids from old hashes to new hashes*/
-            if($class instanceof Subscription){
-                $obj_array['product_ids'] = $this->recordProductIds($obj_array['product_ids']); 
-                $obj_array['recurring_product_ids'] = $this->recordProductIds($obj_array['recurring_product_ids']); 
+            if ($class instanceof Subscription) {
+                $obj_array['product_ids'] = $this->recordProductIds($obj_array['product_ids']);
+                $obj_array['recurring_product_ids'] = $this->recordProductIds($obj_array['recurring_product_ids']);
             }
 
             $new_obj = $class::firstOrNew(
@@ -1092,46 +1033,38 @@ class ImportCompanyTest extends TestCase
                 );
 
             $new_obj->save(['timestamps' => false]);
-            
-            if($new_obj instanceof CompanyLedger){
 
-            }
-            else
+            if ($new_obj instanceof CompanyLedger) {
+            } else {
                 $this->ids["{$object_property}"]["{$obj->hashed_id}"] = $new_obj->id;
-
+            }
         }
 
         $class::reguard();
-    
     }
 
-
     private function genericImport($class, $unset, $transforms, $object_property, $match_key)
     {
-
         $class::unguard();
 
-        foreach($this->backup_json_object->{$object_property} as $obj)
-        {
+        foreach ($this->backup_json_object->{$object_property} as $obj) {
             /* Remove unwanted keys*/
-            $obj_array = (array)$obj;
-            foreach($unset as $un){
+            $obj_array = (array) $obj;
+            foreach ($unset as $un) {
                 unset($obj_array[$un]);
             }
 
             /* Transform old keys to new keys */
-            foreach($transforms as $transform)
-            {
-                foreach($transform as $key => $value)
-                {
+            foreach ($transforms as $transform) {
+                foreach ($transform as $key => $value) {
                     $obj_array["{$value}"] = $this->transformId($key, $obj->{$value});
-                }    
+                }
             }
-            
+
             /* New to convert product ids from old hashes to new hashes*/
-            if($class instanceof Subscription){
-                $obj_array['product_ids'] = $this->recordProductIds($obj_array['product_ids']); 
-                $obj_array['recurring_product_ids'] = $this->recordProductIds($obj_array['recurring_product_ids']); 
+            if ($class instanceof Subscription) {
+                $obj_array['product_ids'] = $this->recordProductIds($obj_array['product_ids']);
+                $obj_array['recurring_product_ids'] = $this->recordProductIds($obj_array['recurring_product_ids']);
             }
 
             $new_obj = $class::firstOrNew(
@@ -1140,37 +1073,34 @@ class ImportCompanyTest extends TestCase
                 );
 
             $new_obj->save(['timestamps' => false]);
-            
-            if($new_obj instanceof CompanyLedger){
-            }
-            else
-                $this->ids["{$object_property}"]["{$obj->hashed_id}"] = $new_obj->id;
 
+            if ($new_obj instanceof CompanyLedger) {
+            } else {
+                $this->ids["{$object_property}"]["{$obj->hashed_id}"] = $new_obj->id;
+            }
         }
 
         $class::reguard();
-    
     }
 
     private function recordProductIds($ids)
     {
-
-        $id_array = explode(",", $ids);
+        $id_array = explode(',', $ids);
 
         $tmp_arr = [];
 
-        foreach($id_array as $id) {
-
+        foreach ($id_array as $id) {
             $tmp_arr[] = $this->encodePrimaryKey($this->transformId('products', $id));
-        }     
+        }
 
-        return implode(",", $tmp_arr);
+        return implode(',', $tmp_arr);
     }
 
     private function transformId(string $resource, ?string $old): ?int
     {
-        if(empty($old))
+        if (empty($old)) {
             return null;
+        }
 
         if (! array_key_exists($resource, $this->ids)) {
             throw new \Exception("Resource {$resource} not available.");
@@ -1183,12 +1113,10 @@ class ImportCompanyTest extends TestCase
         return $this->ids[$resource]["{$old}"];
     }
 
-    public function tearDown() :void
+    protected function tearDown() :void
     {
-        $backup_json_file = sys_get_temp_dir() . "/backup/backup.json";
+        $backup_json_file = sys_get_temp_dir().'/backup/backup.json';
 
-     //   unlink($backup_json_file);
+        //   unlink($backup_json_file);
     }
-
-
 }
diff --git a/tests/Feature/Import/ImportCsvTest.php b/tests/Feature/Import/ImportCsvTest.php
index 9517a7d1a5e5..d234c15dd829 100644
--- a/tests/Feature/Import/ImportCsvTest.php
+++ b/tests/Feature/Import/ImportCsvTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature\Import;
 
 use App\Jobs\Import\CSVImport;
@@ -35,7 +36,7 @@ class ImportCsvTest extends TestCase
     use MakesHash;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -49,7 +50,7 @@ class ImportCsvTest extends TestCase
         $this->makeTestData();
 
         $this->markTestSkipped('Skipping CSV Import to improve test speed');
-        
+
         $this->withoutExceptionHandling();
     }
 
@@ -60,65 +61,65 @@ class ImportCsvTest extends TestCase
         $this->assertTrue(is_array($this->getCsvData($csv)));
     }
 
-	public function testClientCsvImport()
-	{
-		$csv = file_get_contents(base_path().'/tests/Feature/Import/clients.csv');
-		$hash = Str::random(32);
-		$column_map = [
-			1 => 'client.balance',
-			2 => 'client.paid_to_date',
-			0 => 'client.name',
-			19 => 'client.currency_id',
-			20 => 'client.public_notes',
-			21 => 'client.private_notes',
-			22 => 'contact.first_name',
-			23 => 'contact.last_name',
-		];
+    public function testClientCsvImport()
+    {
+        $csv = file_get_contents(base_path().'/tests/Feature/Import/clients.csv');
+        $hash = Str::random(32);
+        $column_map = [
+            1 => 'client.balance',
+            2 => 'client.paid_to_date',
+            0 => 'client.name',
+            19 => 'client.currency_id',
+            20 => 'client.public_notes',
+            21 => 'client.private_notes',
+            22 => 'contact.first_name',
+            23 => 'contact.last_name',
+        ];
 
-		$data = [
-			'hash'        => $hash,
-			'column_map'  => [ 'client' => [ 'mapping' => $column_map ] ],
-			'skip_header' => true,
-			'import_type' => 'csv',
-		];
+        $data = [
+            'hash'        => $hash,
+            'column_map'  => ['client' => ['mapping' => $column_map]],
+            'skip_header' => true,
+            'import_type' => 'csv',
+        ];
 
-		$pre_import = Client::count();
+        $pre_import = Client::count();
 
-		Cache::put( $hash . '-client', base64_encode( $csv ), 360 );
+        Cache::put($hash.'-client', base64_encode($csv), 360);
 
-		CSVImport::dispatchNow( $data, $this->company );
+        CSVImport::dispatchSync($data, $this->company);
 
-		$this->assertGreaterThan( $pre_import, Client::count() );
-	}
+        $this->assertGreaterThan($pre_import, Client::count());
+    }
 
     public function testInvoiceCsvImport()
     {
-    	/*Need to import clients first*/
-		$csv = file_get_contents(base_path().'/tests/Feature/Import/clients.csv');
-		$hash = Str::random(32);
-		$column_map = [
-			1 => 'client.balance',
-			2 => 'client.paid_to_date',
-			0 => 'client.name',
-			19 => 'client.currency_id',
-			20 => 'client.public_notes',
-			21 => 'client.private_notes',
-			22 => 'contact.first_name',
-			23 => 'contact.last_name',
-		];
+        /*Need to import clients first*/
+        $csv = file_get_contents(base_path().'/tests/Feature/Import/clients.csv');
+        $hash = Str::random(32);
+        $column_map = [
+            1 => 'client.balance',
+            2 => 'client.paid_to_date',
+            0 => 'client.name',
+            19 => 'client.currency_id',
+            20 => 'client.public_notes',
+            21 => 'client.private_notes',
+            22 => 'contact.first_name',
+            23 => 'contact.last_name',
+        ];
 
-		$data = [
-			'hash'        => $hash,
-			'column_map'  => [ 'client' => [ 'mapping' => $column_map ] ],
-			'skip_header' => true,
-			'import_type' => 'csv',
-		];
+        $data = [
+            'hash'        => $hash,
+            'column_map'  => ['client' => ['mapping' => $column_map]],
+            'skip_header' => true,
+            'import_type' => 'csv',
+        ];
 
-		Cache::put( $hash . '-client', base64_encode( $csv ), 360 );
+        Cache::put($hash.'-client', base64_encode($csv), 360);
 
-		CSVImport::dispatchNow( $data, $this->company );
+        CSVImport::dispatchSync($data, $this->company);
 
-		/*Now import invoices*/
+        /*Now import invoices*/
         $csv = file_get_contents(base_path().'/tests/Feature/Import/invoice.csv');
         $hash = Str::random(32);
 
@@ -140,128 +141,132 @@ class ImportCsvTest extends TestCase
             17 => 'item.quantity',
         ];
 
-		$data = [
-			'hash'        => $hash,
-			'column_map'  => [ 'invoice' => [ 'mapping' => $column_map ] ],
-			'skip_header' => true,
-			'import_type' => 'csv',
-		];
+        $data = [
+            'hash'        => $hash,
+            'column_map'  => ['invoice' => ['mapping' => $column_map]],
+            'skip_header' => true,
+            'import_type' => 'csv',
+        ];
 
-		$pre_import = Invoice::count();
+        $pre_import = Invoice::count();
 
-		Cache::put( $hash . '-invoice', base64_encode( $csv ), 360 );
+        Cache::put($hash.'-invoice', base64_encode($csv), 360);
 
-		CSVImport::dispatchNow( $data, $this->company );
+        CSVImport::dispatchSync($data, $this->company);
 
-		$this->assertGreaterThan( $pre_import, Invoice::count() );
-	}
+        $this->assertGreaterThan($pre_import, Invoice::count());
+    }
 
-	public function testVendorCsvImport() {
-		$csv        = file_get_contents( base_path() . '/tests/Feature/Import/vendors.csv' );
-		$hash       = Str::random( 32 );
-		$column_map = [
-			0  => 'vendor.name',
-			19 => 'vendor.currency_id',
-			20 => 'vendor.public_notes',
-			21 => 'vendor.private_notes',
-			22 => 'vendor.first_name',
-			23 => 'vendor.last_name',
-		];
+    public function testVendorCsvImport()
+    {
+        $csv = file_get_contents(base_path().'/tests/Feature/Import/vendors.csv');
+        $hash = Str::random(32);
+        $column_map = [
+            0  => 'vendor.name',
+            19 => 'vendor.currency_id',
+            20 => 'vendor.public_notes',
+            21 => 'vendor.private_notes',
+            22 => 'vendor.first_name',
+            23 => 'vendor.last_name',
+        ];
 
-		$data = [
-			'hash'        => $hash,
-			'column_map'  => [ 'vendor' => [ 'mapping' => $column_map ] ],
-			'skip_header' => true,
-			'import_type' => 'csv',
-		];
+        $data = [
+            'hash'        => $hash,
+            'column_map'  => ['vendor' => ['mapping' => $column_map]],
+            'skip_header' => true,
+            'import_type' => 'csv',
+        ];
 
-		$pre_import = Vendor::count();
+        $pre_import = Vendor::count();
 
-		Cache::put( $hash . '-vendor', base64_encode( $csv ), 360 );
+        Cache::put($hash.'-vendor', base64_encode($csv), 360);
 
-		CSVImport::dispatchNow( $data, $this->company );
+        CSVImport::dispatchSync($data, $this->company);
 
-		$this->assertGreaterThan( $pre_import, Vendor::count() );
-	}
+        $this->assertGreaterThan($pre_import, Vendor::count());
+    }
 
-	public function testProductCsvImport() {
-		$csv  = file_get_contents( base_path() . '/tests/Feature/Import/products.csv' );
-		$hash = Str::random( 32 );
+    public function testProductCsvImport()
+    {
+        $csv = file_get_contents(base_path().'/tests/Feature/Import/products.csv');
+        $hash = Str::random(32);
 
-		$column_map = [
-			2 => 'product.notes',
-			3 => 'product.cost',
-		];
+        $column_map = [
+            2 => 'product.notes',
+            3 => 'product.cost',
+        ];
 
-		$data = [
-			'hash'        => $hash,
-			'column_map'  => [ 'product' => [ 'mapping' => $column_map ] ],
-			'skip_header' => true,
-			'import_type' => 'csv',
-		];
+        $data = [
+            'hash'        => $hash,
+            'column_map'  => ['product' => ['mapping' => $column_map]],
+            'skip_header' => true,
+            'import_type' => 'csv',
+        ];
 
-		$pre_import = Product::count();
+        $pre_import = Product::count();
 
-		Cache::put( $hash . '-product', base64_encode( $csv ), 360 );
+        Cache::put($hash.'-product', base64_encode($csv), 360);
 
-		CSVImport::dispatchNow( $data, $this->company );
+        CSVImport::dispatchSync($data, $this->company);
 
-		$this->assertGreaterThan( $pre_import, Product::count() );
-	}
+        $this->assertGreaterThan($pre_import, Product::count());
+    }
 
-	public function testExpenseCsvImport() {
-		$csv  = file_get_contents( base_path() . '/tests/Feature/Import/expenses.csv' );
-		$hash = Str::random( 32 );
+    public function testExpenseCsvImport()
+    {
+        $csv = file_get_contents(base_path().'/tests/Feature/Import/expenses.csv');
+        $hash = Str::random(32);
 
-		$column_map = [
-			2 => 'expense.public_notes',
-			3 => 'expense.amount',
-		];
+        $column_map = [
+            2 => 'expense.public_notes',
+            3 => 'expense.amount',
+        ];
 
-		$data = [
-			'hash'        => $hash,
-			'column_map'  => [ 'expense' => [ 'mapping' => $column_map ] ],
-			'skip_header' => true,
-			'import_type' => 'csv',
-		];
+        $data = [
+            'hash'        => $hash,
+            'column_map'  => ['expense' => ['mapping' => $column_map]],
+            'skip_header' => true,
+            'import_type' => 'csv',
+        ];
 
-		$pre_import = Expense::count();
+        $pre_import = Expense::count();
 
-		Cache::put( $hash . '-expense', base64_encode( $csv ), 360 );
+        Cache::put($hash.'-expense', base64_encode($csv), 360);
 
-		CSVImport::dispatchNow( $data, $this->company );
+        CSVImport::dispatchSync($data, $this->company);
 
-		$this->assertGreaterThan( $pre_import, Expense::count() );
-	}
+        $this->assertGreaterThan($pre_import, Expense::count());
+    }
 
-	public function testPaymentCsvImport() {
+    public function testPaymentCsvImport()
+    {
 
 /*Need to import clients first*/
-		$csv = file_get_contents(base_path().'/tests/Feature/Import/clients.csv');
-		$hash = Str::random(32);
-		$column_map = [
-			1 => 'client.balance',
-			2 => 'client.paid_to_date',
-			0 => 'client.name',
-			19 => 'client.currency_id',
-			20 => 'client.public_notes',
-			21 => 'client.private_notes',
-			22 => 'contact.first_name',
-			23 => 'contact.last_name',
-		];
+        $csv = file_get_contents(base_path().'/tests/Feature/Import/clients.csv');
+        $hash = Str::random(32);
+        $column_map = [
+            1 => 'client.balance',
+            2 => 'client.paid_to_date',
+            0 => 'client.name',
+            19 => 'client.currency_id',
+            20 => 'client.public_notes',
+            21 => 'client.private_notes',
+            22 => 'contact.first_name',
+            23 => 'contact.last_name',
+        ];
 
-		$data = [
-			'hash'        => $hash,
-			'column_map'  => [ 'client' => [ 'mapping' => $column_map ] ],
-			'skip_header' => true,
-			'import_type' => 'csv',
-		];
+        $data = [
+            'hash'        => $hash,
+            'column_map'  => ['client' => ['mapping' => $column_map]],
+            'skip_header' => true,
+            'import_type' => 'csv',
+        ];
 
-		Cache::put( $hash . '-client', base64_encode( $csv ), 360 );
+        Cache::put($hash.'-client', base64_encode($csv), 360);
 
-		CSVImport::dispatchNow( $data, $this->company );
+        CSVImport::dispatchSync($data, $this->company);
 
-		/*Now import invoices*/
+        /*Now import invoices*/
         $csv = file_get_contents(base_path().'/tests/Feature/Import/invoice.csv');
         $hash = Str::random(32);
 
@@ -283,47 +288,46 @@ class ImportCsvTest extends TestCase
             17 => 'item.quantity',
         ];
 
-		$data = [
-			'hash'        => $hash,
-			'column_map'  => [ 'invoice' => [ 'mapping' => $column_map ] ],
-			'skip_header' => true,
-			'import_type' => 'csv',
-		];
+        $data = [
+            'hash'        => $hash,
+            'column_map'  => ['invoice' => ['mapping' => $column_map]],
+            'skip_header' => true,
+            'import_type' => 'csv',
+        ];
 
-		$pre_import = Invoice::count();
+        $pre_import = Invoice::count();
 
-		Cache::put( $hash . '-invoice', base64_encode( $csv ), 360 );
+        Cache::put($hash.'-invoice', base64_encode($csv), 360);
 
-		CSVImport::dispatchNow( $data, $this->company );
+        CSVImport::dispatchSync($data, $this->company);
 
+        /* Test Now import payments*/
 
-		/* Test Now import payments*/
+        $csv = file_get_contents(base_path().'/tests/Feature/Import/payments.csv');
+        $hash = Str::random(32);
 
-		$csv  = file_get_contents( base_path() . '/tests/Feature/Import/payments.csv' );
-		$hash = Str::random( 32 );
+        $column_map = [
+            0 => 'payment.client_id',
+            1 => 'payment.invoice_number',
+            2 => 'payment.amount',
+            3 => 'payment.date',
+        ];
 
-		$column_map = [
-			0 => 'payment.client_id',
-			1 => 'payment.invoice_number',
-			2 => 'payment.amount',
-			3 => 'payment.date',
-		];
+        $data = [
+            'hash'        => $hash,
+            'column_map'  => ['payment' => ['mapping' => $column_map]],
+            'skip_header' => true,
+            'import_type' => 'csv',
+        ];
 
-		$data = [
-			'hash'        => $hash,
-			'column_map'  => [ 'payment' => [ 'mapping' => $column_map ] ],
-			'skip_header' => true,
-			'import_type' => 'csv',
-		];
+        $pre_import = Payment::count();
 
-		$pre_import = Payment::count();
+        Cache::put($hash.'-payment', base64_encode($csv), 360);
 
-		Cache::put( $hash . '-payment', base64_encode( $csv ), 360 );
+        CSVImport::dispatchSync($data, $this->company);
 
-		CSVImport::dispatchNow( $data, $this->company );
-
-		$this->assertGreaterThan( $pre_import, Payment::count() );
-	}
+        $this->assertGreaterThan($pre_import, Payment::count());
+    }
 
     private function getCsvData($csvfile)
     {
diff --git a/tests/Feature/Import/Invoice2Go/Invoice2GoTest.php b/tests/Feature/Import/Invoice2Go/Invoice2GoTest.php
index b851474ecfb3..9cf62be12b67 100644
--- a/tests/Feature/Import/Invoice2Go/Invoice2GoTest.php
+++ b/tests/Feature/Import/Invoice2Go/Invoice2GoTest.php
@@ -6,7 +6,7 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace Tests\Feature\Import\Invoice2Go;
@@ -38,7 +38,7 @@ class Invoice2GoTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -54,7 +54,7 @@ class Invoice2GoTest extends TestCase
     public function testInvoice2GoImport()
     {
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/i2g_invoices.csv'
+            base_path().'/tests/Feature/Import/i2g_invoices.csv'
         );
         $hash = Str::random(32);
 
@@ -108,7 +108,7 @@ class Invoice2GoTest extends TestCase
             'import_type' => 'invoice2go',
         ];
 
-        Cache::put($hash . '-invoice', base64_encode($csv), 360);
+        Cache::put($hash.'-invoice', base64_encode($csv), 360);
 
         $csv_importer = new Invoice2Go($data, $this->company);
 
@@ -129,19 +129,15 @@ class Invoice2GoTest extends TestCase
         $this->assertEquals('840', $client->country_id);
         $this->assertEquals('2584 Sesame Street', $client->address1);
 
-        $this->assertTrue($base_transformer->hasInvoice("1"));
-        $this->assertTrue($base_transformer->hasInvoice("2"));
-        $this->assertTrue($base_transformer->hasInvoice("3"));
-        $this->assertTrue($base_transformer->hasInvoice("4"));
-        $invoice_id = $base_transformer->getInvoiceId("1");
+        $this->assertTrue($base_transformer->hasInvoice('1'));
+        $this->assertTrue($base_transformer->hasInvoice('2'));
+        $this->assertTrue($base_transformer->hasInvoice('3'));
+        $this->assertTrue($base_transformer->hasInvoice('4'));
+        $invoice_id = $base_transformer->getInvoiceId('1');
         $invoice = Invoice::find($invoice_id);
 
         $this->assertEquals(953.55, $invoice->amount);
-        $this->assertEquals(1 , $invoice->status_id);
+        $this->assertEquals(1, $invoice->status_id);
         $this->assertEquals(0, $invoice->balance);
-
     }
-
-
 }
-
diff --git a/tests/Feature/Import/Invoicely/InvoicelyTest.php b/tests/Feature/Import/Invoicely/InvoicelyTest.php
index 2af75f1b3aa1..8d4896516817 100644
--- a/tests/Feature/Import/Invoicely/InvoicelyTest.php
+++ b/tests/Feature/Import/Invoicely/InvoicelyTest.php
@@ -6,7 +6,7 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace Tests\Feature\Import\Invoicely;
@@ -37,7 +37,7 @@ class InvoicelyTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -53,7 +53,7 @@ class InvoicelyTest extends TestCase
     public function testClientInvoicelyImport()
     {
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/invoicely_clients.csv'
+            base_path().'/tests/Feature/Import/invoicely_clients.csv'
         );
         $hash = Str::random(32);
 
@@ -61,7 +61,7 @@ class InvoicelyTest extends TestCase
             0 => 'Client Name',
             1 => 'Email',
             2 => 'Phone',
-            3 => 'Country',    
+            3 => 'Country',
         ];
 
         $data = [
@@ -71,7 +71,7 @@ class InvoicelyTest extends TestCase
             'import_type' => 'invoicely',
         ];
 
-        Cache::put($hash . '-client', base64_encode($csv), 360);
+        Cache::put($hash.'-client', base64_encode($csv), 360);
 
         $csv_importer = new Invoicely($data, $this->company);
 
@@ -88,15 +88,12 @@ class InvoicelyTest extends TestCase
 
         $this->assertInstanceOf(Client::class, $client);
         $this->assertEquals('5558675309', $client->phone);
-
-        
     }
 
     public function testInvoiceInvoicelyImport()
     {
-
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/invoicely_clients.csv'
+            base_path().'/tests/Feature/Import/invoicely_clients.csv'
         );
         $hash = Str::random(32);
 
@@ -104,7 +101,7 @@ class InvoicelyTest extends TestCase
             0 => 'Client Name',
             1 => 'Email',
             2 => 'Phone',
-            3 => 'Country',    
+            3 => 'Country',
         ];
 
         $data = [
@@ -114,7 +111,7 @@ class InvoicelyTest extends TestCase
             'import_type' => 'invoicely',
         ];
 
-        Cache::put($hash . '-client', base64_encode($csv), 360);
+        Cache::put($hash.'-client', base64_encode($csv), 360);
 
         $csv_importer = new Invoicely($data, $this->company);
 
@@ -134,7 +131,7 @@ class InvoicelyTest extends TestCase
         //now import the invoices
 
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/invoicely_invoices.csv'
+            base_path().'/tests/Feature/Import/invoicely_invoices.csv'
         );
         $hash = Str::random(32);
 
@@ -144,7 +141,7 @@ class InvoicelyTest extends TestCase
             2 => 'Details',
             3 => 'Client',
             4 => 'Status',
-            5 => 'Total', 
+            5 => 'Total',
         ];
 
         $data = [
@@ -154,28 +151,24 @@ class InvoicelyTest extends TestCase
             'import_type' => 'invoicely',
         ];
 
-        Cache::put($hash . '-invoice', base64_encode($csv), 360);
+        Cache::put($hash.'-invoice', base64_encode($csv), 360);
 
         $csv_importer = new Invoicely($data, $this->company);
 
         $count = $csv_importer->import('invoice');
 
         $base_transformer = new BaseTransformer($this->company);
-nlog($count);
-        $this->assertTrue($base_transformer->hasInvoice("INV-1"));
+        nlog($count);
+        $this->assertTrue($base_transformer->hasInvoice('INV-1'));
 
-        $invoice_id = $base_transformer->getInvoiceId("INV-1");
+        $invoice_id = $base_transformer->getInvoiceId('INV-1');
         $invoice = Invoice::find($invoice_id);
 
-        $this->assertEquals(1020 , $invoice->amount);
-        $this->assertEquals(2 , $invoice->status_id);
-        $this->assertEquals(1020 , $invoice->balance);
-        $this->assertEquals(1 , count($invoice->line_items));
+        $this->assertEquals(1020, $invoice->amount);
+        $this->assertEquals(2, $invoice->status_id);
+        $this->assertEquals(1020, $invoice->balance);
+        $this->assertEquals(1, count($invoice->line_items));
 
         $this->assertFalse($invoice->payments()->exists());
-
     }
-
-
 }
-
diff --git a/tests/Feature/Import/Wave/WaveTest.php b/tests/Feature/Import/Wave/WaveTest.php
index 3dbab9388a90..de984b5b9558 100644
--- a/tests/Feature/Import/Wave/WaveTest.php
+++ b/tests/Feature/Import/Wave/WaveTest.php
@@ -6,7 +6,7 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace Tests\Feature\Import\Wave;
@@ -36,7 +36,7 @@ class WaveTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -56,7 +56,7 @@ class WaveTest extends TestCase
     //         base_path() . '/tests/Feature/Import/wave_expenses.csv'
     //     );
     //     $hash = Str::random(32);
-    
+
     //     $column_map = [
     //         0 => 'Transaction ID',
     //         1 => 'Transaction Date',
@@ -80,7 +80,7 @@ class WaveTest extends TestCase
     //         19 => 'Transaction Date Last Modified',
     //         20 => 'Account Group',
     //         21 => 'Account Type',
-    //         22 => 'Account ID',    
+    //         22 => 'Account ID',
     //     ];
 
     //     $data = [
@@ -96,13 +96,12 @@ class WaveTest extends TestCase
 
     //     $count = $csv_importer->import('expense');
 
-
     // }
 
     public function testVendorAndExpenseWaveImport()
     {
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/wave_vendors.csv'
+            base_path().'/tests/Feature/Import/wave_vendors.csv'
         );
         $hash = Str::random(32);
 
@@ -123,7 +122,7 @@ class WaveTest extends TestCase
             13 => 'address_line_1',
             14 => 'address_line_2',
             15 => 'city',
-            16 => 'postal_code/zip_code',      
+            16 => 'postal_code/zip_code',
         ];
 
         $data = [
@@ -133,7 +132,7 @@ class WaveTest extends TestCase
             'import_type' => 'waveaccounting',
         ];
 
-        Cache::put($hash . '-vendor', base64_encode($csv), 360);
+        Cache::put($hash.'-vendor', base64_encode($csv), 360);
 
         $csv_importer = new Wave($data, $this->company);
 
@@ -158,11 +157,10 @@ class WaveTest extends TestCase
         $this->assertEquals('lastname', $vendor->contacts->first()->last_name);
         $this->assertEquals('vendor@gmail.com', $vendor->contacts->first()->email);
         $this->assertEquals('phone', $vendor->contacts->first()->phone);
-        
 
         // now lets try importing expenses / bills
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/wave_expenses.csv'
+            base_path().'/tests/Feature/Import/wave_expenses.csv'
         );
         $hash = Str::random(32);
 
@@ -189,7 +187,7 @@ class WaveTest extends TestCase
             19 => 'Transaction Date Last Modified',
             20 => 'Account Group',
             21 => 'Account Type',
-            22 => 'Account ID',    
+            22 => 'Account ID',
         ];
 
         $data = [
@@ -199,7 +197,7 @@ class WaveTest extends TestCase
             'import_type' => 'waveaccounting',
         ];
 
-        Cache::put($hash . '-expense', base64_encode($csv), 360);
+        Cache::put($hash.'-expense', base64_encode($csv), 360);
 
         $csv_importer = new Wave($data, $this->company);
 
@@ -207,16 +205,13 @@ class WaveTest extends TestCase
 
         $base_transformer = new BaseTransformer($this->company);
 
-        $this->assertTrue($base_transformer->hasExpense("66"));
-        
+        $this->assertTrue($base_transformer->hasExpense('66'));
     }
 
-
-
     public function testClientWaveImport()
     {
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/wave_clients.csv'
+            base_path().'/tests/Feature/Import/wave_clients.csv'
         );
         $hash = Str::random(32);
 
@@ -247,7 +242,7 @@ class WaveTest extends TestCase
             23 => 'ship-to_city',
             24 => 'ship-to_postal_code/zip_code',
             25 => 'ship-to_phone',
-            26 => 'delivery_instructions',        
+            26 => 'delivery_instructions',
         ];
 
         $data = [
@@ -257,7 +252,7 @@ class WaveTest extends TestCase
             'import_type' => 'waveaccounting',
         ];
 
-        Cache::put($hash . '-client', base64_encode($csv), 360);
+        Cache::put($hash.'-client', base64_encode($csv), 360);
 
         $csv_importer = new Wave($data, $this->company);
 
@@ -285,15 +280,14 @@ class WaveTest extends TestCase
         $this->assertEquals('', $client->contacts->first()->last_name);
         $this->assertEquals('jessica@jones.com', $client->contacts->first()->email);
         $this->assertEquals('555-867-5309', $client->contacts->first()->phone);
-        
     }
 
     public function testInvoiceWaveImport()
     {
         //first import all the clients
 
-                $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/wave_clients.csv'
+        $csv = file_get_contents(
+            base_path().'/tests/Feature/Import/wave_clients.csv'
         );
         $hash = Str::random(32);
 
@@ -324,7 +318,7 @@ class WaveTest extends TestCase
             23 => 'ship-to_city',
             24 => 'ship-to_postal_code/zip_code',
             25 => 'ship-to_phone',
-            26 => 'delivery_instructions',        
+            26 => 'delivery_instructions',
         ];
 
         $data = [
@@ -334,7 +328,7 @@ class WaveTest extends TestCase
             'import_type' => 'waveaccounting',
         ];
 
-        Cache::put($hash . '-client', base64_encode($csv), 360);
+        Cache::put($hash.'-client', base64_encode($csv), 360);
 
         $csv_importer = new Wave($data, $this->company);
 
@@ -343,7 +337,7 @@ class WaveTest extends TestCase
         //now import the invoices
 
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/wave_invoices.csv'
+            base_path().'/tests/Feature/Import/wave_invoices.csv'
         );
         $hash = Str::random(32);
 
@@ -370,7 +364,7 @@ class WaveTest extends TestCase
             19 => 'Transaction Date Last Modified',
             20 => 'Account Group',
             21 => 'Account Type',
-            22 => 'Account ID',    
+            22 => 'Account ID',
         ];
 
         $data = [
@@ -380,7 +374,7 @@ class WaveTest extends TestCase
             'import_type' => 'waveaccounting',
         ];
 
-        Cache::put($hash . '-invoice', base64_encode($csv), 360);
+        Cache::put($hash.'-invoice', base64_encode($csv), 360);
 
         $csv_importer = new Wave($data, $this->company);
 
@@ -388,23 +382,21 @@ class WaveTest extends TestCase
 
         $base_transformer = new BaseTransformer($this->company);
 
-        $this->assertTrue($base_transformer->hasInvoice("2"));
-        $this->assertTrue($base_transformer->hasInvoice("3"));
-        $this->assertTrue($base_transformer->hasInvoice("4"));
+        $this->assertTrue($base_transformer->hasInvoice('2'));
+        $this->assertTrue($base_transformer->hasInvoice('3'));
+        $this->assertTrue($base_transformer->hasInvoice('4'));
 
-        $invoice_id = $base_transformer->getInvoiceId("4");
+        $invoice_id = $base_transformer->getInvoiceId('4');
         $invoice = Invoice::find($invoice_id);
 
-        $this->assertEquals(3500.41 , $invoice->amount);
-        $this->assertEquals(0 , $invoice->balance);
-        $this->assertEquals(2 , count($invoice->line_items));
+        $this->assertEquals(3500.41, $invoice->amount);
+        $this->assertEquals(0, $invoice->balance);
+        $this->assertEquals(2, count($invoice->line_items));
 
         $this->assertTrue($invoice->payments()->exists());
         $this->assertEquals(3500.41, $invoice->payments->first()->amount);
-
     }
 
-
     // public function testVendorCsvImport()
     // {
     //     $csv = file_get_contents(
@@ -639,7 +631,4 @@ class WaveTest extends TestCase
     //     $this->assertEquals(1, $invoice->payments()->count());
     //     $this->assertEquals(400, $invoice->payments()->sum('payments.amount'));
     // }
-
-
 }
-
diff --git a/tests/Feature/Import/Zoho/ZohoTest.php b/tests/Feature/Import/Zoho/ZohoTest.php
index de9ff8814c17..550abde66002 100644
--- a/tests/Feature/Import/Zoho/ZohoTest.php
+++ b/tests/Feature/Import/Zoho/ZohoTest.php
@@ -6,7 +6,7 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace Tests\Feature\Import\Zoho;
@@ -37,7 +37,7 @@ class ZohoTest extends TestCase
     use MockAccountData;
     // use DatabaseTransactions;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -55,7 +55,7 @@ class ZohoTest extends TestCase
     public function testClientZohoImport()
     {
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/zoho_contacts.csv'
+            base_path().'/tests/Feature/Import/zoho_contacts.csv'
         );
         $hash = Str::random(32);
 
@@ -110,7 +110,7 @@ class ZohoTest extends TestCase
             47 => 'Customer Address ID',
             48 => 'Source',
             49 => 'Reference ID',
-            50 => 'Payment Reminder',       
+            50 => 'Payment Reminder',
         ];
 
         $data = [
@@ -120,10 +120,10 @@ class ZohoTest extends TestCase
             'import_type' => 'zoho',
         ];
 
-        Cache::put($hash . '-client', base64_encode($csv), 360);
+        Cache::put($hash.'-client', base64_encode($csv), 360);
 
         $csv_importer = new Zoho($data, $this->company);
-        
+
         $count = $csv_importer->import('client');
 
         $base_transformer = new BaseTransformer($this->company);
@@ -140,15 +140,13 @@ class ZohoTest extends TestCase
         $this->assertInstanceOf(Client::class, $client);
         $this->assertEquals('1', $client->settings->currency_id);
         $this->assertEquals('888-867-5309', $client->phone);
-
-        
     }
 
     public function testInvoiceZohoImport()
     {
         //first import all the clients
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/zoho_contacts.csv'
+            base_path().'/tests/Feature/Import/zoho_contacts.csv'
         );
         $hash = Str::random(32);
 
@@ -203,7 +201,7 @@ class ZohoTest extends TestCase
             47 => 'Customer Address ID',
             48 => 'Source',
             49 => 'Reference ID',
-            50 => 'Payment Reminder',       
+            50 => 'Payment Reminder',
         ];
 
         $data = [
@@ -213,7 +211,7 @@ class ZohoTest extends TestCase
             'import_type' => 'zoho',
         ];
 
-        Cache::put($hash . '-client', base64_encode($csv), 360);
+        Cache::put($hash.'-client', base64_encode($csv), 360);
 
         $csv_importer = new Zoho($data, $this->company);
 
@@ -222,7 +220,7 @@ class ZohoTest extends TestCase
         //now import the invoices
 
         $csv = file_get_contents(
-            base_path() . '/tests/Feature/Import/zoho_invoices.csv'
+            base_path().'/tests/Feature/Import/zoho_invoices.csv'
         );
         $hash = Str::random(32);
 
@@ -309,7 +307,7 @@ class ZohoTest extends TestCase
             79 => 'Shipping Country',
             80 => 'Shipping Code',
             81 => 'Shipping Fax',
-            82 => 'Shipping Phone Number',  
+            82 => 'Shipping Phone Number',
         ];
 
         $data = [
@@ -319,7 +317,7 @@ class ZohoTest extends TestCase
             'import_type' => 'zoho',
         ];
 
-        Cache::put($hash . '-invoice', base64_encode($csv), 360);
+        Cache::put($hash.'-invoice', base64_encode($csv), 360);
 
         $csv_importer = new Zoho($data, $this->company);
 
@@ -327,22 +325,18 @@ class ZohoTest extends TestCase
 
         $base_transformer = new BaseTransformer($this->company);
 
-        $this->assertTrue($base_transformer->hasInvoice("INV-000001"));
-        $this->assertTrue($base_transformer->hasInvoice("INV-000002"));
-        $this->assertTrue($base_transformer->hasInvoice("INV-000003"));
+        $this->assertTrue($base_transformer->hasInvoice('INV-000001'));
+        $this->assertTrue($base_transformer->hasInvoice('INV-000002'));
+        $this->assertTrue($base_transformer->hasInvoice('INV-000003'));
 
-        $invoice_id = $base_transformer->getInvoiceId("INV-000003");
+        $invoice_id = $base_transformer->getInvoiceId('INV-000003');
         $invoice = Invoice::find($invoice_id);
 
-        $this->assertEquals(390 , $invoice->amount);
-        $this->assertEquals(1 , $invoice->status_id);
-        $this->assertEquals(0 , $invoice->balance);
-        $this->assertEquals(4 , count($invoice->line_items));
+        $this->assertEquals(390, $invoice->amount);
+        $this->assertEquals(1, $invoice->status_id);
+        $this->assertEquals(0, $invoice->balance);
+        $this->assertEquals(4, count($invoice->line_items));
 
         $this->assertFalse($invoice->payments()->exists());
-
     }
-
-
 }
-
diff --git a/tests/Feature/Import/expenses.csv b/tests/Feature/Import/expenses.csv
index af05d055eb48..0ddec395d1de 100644
--- a/tests/Feature/Import/expenses.csv
+++ b/tests/Feature/Import/expenses.csv
@@ -1,185 +1,185 @@
-"Invoice Ninja v4.5.23 - December 17, 2020 7:01 am","","",""
-"","","",""
-"Expenses","","",""
-"Client","Project","Notes","Amount"
-"David Bomba","officiis","Sed minima soluta saepe quae laboriosam placeat. Sequi laboriosam architecto et aut. Ut hic repellat veniam eligendi.","3.94"
-"David Bomba","maxime","Distinctio consectetur provident nisi autem ipsum animi.","1.11"
-"David Bomba","atque","Fugiat illo iste esse laudantium est. Recusandae et ullam optio soluta. Est est nulla doloribus adipisci.","9.779999999999999"
-"David Bomba","itaque","Placeat aliquam et est quasi illo aut inventore. Expedita asperiores cupiditate accusantium. Eos esse dolorem tenetur illo totam.","3.5"
-"David Bomba","et","Est quia soluta asperiores dolor ipsum illum sapiente.","3.98"
-"David Bomba","velit","Quia consequatur magnam impedit dignissimos. Ut vel sapiente nemo quia laborum. Consectetur occaecati quia sunt eum. Dignissimos labore molestiae laudantium impedit temporibus blanditiis porro maxime. Dolorem quia alias ducimus fugiat. Aut vel officia voluptatem et quia.","1.83"
-"David Bomba","corporis","Vel temporibus qui et ex a. Pariatur minima ipsa quasi non dolorum laboriosam laboriosam. Dolor soluta ut nostrum veniam. Porro alias eos quibusdam. Maiores aut eos similique.","9.59"
-"David Bomba","expedita","Mollitia aperiam modi velit sit necessitatibus dolor quibusdam sit. Autem molestiae neque neque doloribus nulla.","8.859999999999999"
-"David Bomba","ea","Deleniti exercitationem rem et nihil. Ea qui autem fuga repudiandae accusamus qui et et. Quia accusamus molestiae dolor.","5.37"
-"David Bomba","ducimus","Ut nobis sint et error ducimus minus suscipit. Ipsum inventore cumque et magni minima explicabo. Corporis earum nihil at facilis ut voluptates aut. Blanditiis reiciendis aut dolor et. Est rerum magni in qui velit. Dolore nihil nostrum quisquam in ut.","8.960000000000001"
-"David Bomba","in","Non laudantium adipisci eos porro. Quia aspernatur cum soluta eaque blanditiis fugit alias. Quam nobis dolorem repellendus ut alias dolor cumque. Laboriosam laboriosam et debitis autem autem.","3.14"
-"David Bomba","ut","Fuga quam reprehenderit adipisci nesciunt ratione omnis. Dolore dicta quasi excepturi rerum. Alias voluptatem voluptatem vel harum iste id. Nihil est velit quo soluta delectus.","4.6"
-"David Bomba","adipisci","Itaque iure necessitatibus vel doloribus omnis. Possimus atque tempora quo ut.","6.64"
-"David Bomba","quidem","Sit maiores quia quos facilis earum ducimus. Numquam dolores quo numquam.","7.47"
-"David Bomba","optio","Qui minus dicta culpa aperiam id natus quaerat. Facilis cupiditate consequuntur quisquam soluta in.","3.03"
-"David Bomba","temporibus","Tempora eligendi nisi dolore non tenetur. Officiis autem aspernatur et optio. Omnis dolore placeat et nihil et.","7.54"
-"David Bomba","repellendus","Voluptates hic dolorum aspernatur vitae. Adipisci dicta ut sapiente commodi quia explicabo.","2.14"
-"David Bomba","dolorum","Quo vitae atque aut vel et dolorem eaque alias. Quod tempore illum placeat ipsum aspernatur. Incidunt qui ea dolorem et. Optio qui deserunt beatae sed perferendis. Esse rerum et magnam eum soluta. Consequatur rem sed ut repellendus exercitationem. Dolores error omnis quia qui qui.","5.9"
-"David Bomba","non","Et cumque odio nam voluptatum nam molestias.","2.62"
-"David Bomba","quam","Nostrum in eos voluptatem.","8.630000000000001"
-"David Bomba","harum","Vero deleniti vel cumque cumque cupiditate nihil. Est non blanditiis consequatur commodi similique cumque ipsa sapiente. Dolor eum fugiat distinctio nihil aut. Sequi qui cum architecto quia ullam rerum ad. Quo et magnam perferendis rerum voluptatem. Maiores atque ipsa nihil.","7.64"
-"David Bomba","quasi","Et labore doloremque incidunt atque illo repudiandae. Officiis necessitatibus est quo. Veniam eum qui aut est est.","5.79"
-"David Bomba","sed","Illo nihil aut iste sed. In ea rerum atque iure. Et maiores qui odit inventore cum at. Possimus doloribus dicta excepturi quisquam asperiores qui.","2.56"
-"David Bomba","numquam","Ex temporibus alias voluptatem qui.","6.21"
-"David Bomba","quis","Aut nobis qui quia. Laboriosam id optio aut. Voluptatem doloremque doloremque odit sint iure sint adipisci. Ut fugiat perspiciatis adipisci earum quasi et.","9.74"
-"David Bomba","laboriosam","Temporibus quisquam eligendi harum. Quis est architecto suscipit. Saepe aut et quis. Dolorem nisi recusandae laborum nulla aut dolorem. Provident consectetur maxime minima sint. Et non consequatur possimus officia non sunt incidunt. Odit quia sit quia consequatur ipsam.","5.59"
-"David Bomba","voluptas","Numquam quasi eos harum laborum illo. Sit distinctio totam dolores deleniti veritatis voluptas inventore. Pariatur dicta saepe id id quod ratione ea.","5.86"
-"David Bomba","unde","Similique autem maiores et repellat natus eius unde sequi.","8.81"
-"David Bomba","autem","Sit eveniet reiciendis aut rerum est omnis sunt sed.","3.42"
-"David Bomba","sequi","Nesciunt sequi modi inventore delectus aut sit fuga. Modi et quibusdam et laborum.","9.51"
-"David Bomba","deserunt","Similique hic voluptate velit. Fuga est est qui fugit eligendi consequatur omnis. Nihil alias adipisci quisquam ut explicabo facere.","2.16"
-"David Bomba","id","Facere vero amet fugit et voluptatem nisi repellendus. Excepturi sit earum in pariatur consequatur aut. Molestiae et explicabo voluptas tempore voluptates eos.","9.83"
-"David Bomba","nesciunt","Perspiciatis id iste vel enim alias fugit itaque. Facilis quae aut quos nam est nemo suscipit impedit. Debitis ut commodi iure magni. Optio voluptatum inventore tempora incidunt aut deserunt corporis animi.","6.12"
-"David Bomba","error","Quisquam ut dolor quo. Hic ex quos neque omnis officiis cumque. Et quae qui autem. Pariatur amet iure labore fugiat error quo.","2.03"
-"David Bomba","iste","Ad qui adipisci in et quos eveniet. Sapiente voluptatum sint error ex in. Minima voluptatem commodi ea aut laborum.","5.13"
-"David Bomba","laudantium","Quo inventore est mollitia fugiat. Veniam sit fugit dolorem.","7.91"
-"David Bomba","minima","Nulla laborum totam adipisci esse explicabo. Eaque dolor facere nesciunt voluptatem ratione. Nesciunt dignissimos cum voluptas quidem repudiandae aut sed. Repellat voluptatem veniam culpa eum.","8.25"
-"David Bomba","aliquid","Consequuntur sint laboriosam adipisci consequatur quam a fuga. Delectus sequi tempore molestias dolorem fugiat molestiae ex. Quisquam eaque eum iure ut nisi odit quia. Id iusto ipsa nihil harum hic voluptatum beatae sed. Eum quam omnis in cumque.","9.92"
-"David Bomba","iusto","Laboriosam quia eum error quam repellendus.","6.02"
-"David Bomba","nemo","Deleniti asperiores doloribus consequuntur magni. Earum aspernatur et vitae veniam molestiae magni. Quaerat error ea dignissimos qui labore error velit.","9.9"
-"David Bomba","minus","Voluptatum explicabo amet quidem quia autem aut temporibus. Dolorem sed aut totam et minus ut consequatur tenetur. Et rerum quia autem neque sed neque.","8.26"
-"David Bomba","quos","Suscipit praesentium animi ut sunt. Tempore adipisci maiores sed atque id libero consectetur porro. Itaque consequuntur perspiciatis officiis sit. Itaque magni velit laborum rerum qui reiciendis ut. Provident tempore fuga hic quae aut.","6.52"
-"David Bomba","vel","Eum aliquam officia ea beatae fugit qui ut laboriosam.","8.34"
-"David Bomba","fuga","Vel ut deserunt consequatur voluptatum quis nam. Reiciendis possimus quisquam fugiat numquam.","4.12"
-"David Bomba","nostrum","Non ducimus non rem. Est qui odit est nam. Ab voluptatum nihil itaque explicabo hic.","7.07"
-"David Bomba","hic","Non modi voluptatum blanditiis et.","4.29"
-"David Bomba","rerum","Enim omnis ut dolore ex velit sit. Ab et dolor qui iste. Odit quia et et debitis eligendi illo. Rerum rem corrupti dolor est est ea illum.","7.08"
-"David Bomba","corrupti","Ut vitae accusantium ratione in suscipit. Distinctio unde est expedita omnis. Sequi non sit ut modi nostrum libero nesciunt beatae. Qui dolorem optio reprehenderit eum.","8.970000000000001"
-"David Bomba","maiores","Aut accusantium neque nam aut quas inventore. Qui laboriosam quam commodi aut suscipit et. Nam aut iusto aut facilis vitae dolores eum. Culpa magni deserunt qui rerum aut.","2.41"
-"David Bomba","totam","Totam eos molestiae totam vero fuga sint. Nisi minima et veritatis fugiat. Quo earum ut eius odit.","3.41"
-"David Bomba","eligendi","Voluptates amet voluptatem placeat aliquam non non saepe. Provident quaerat laudantium debitis. Quasi sed maxime deserunt laboriosam reiciendis tempore.","8.33"
-"David Bomba","architecto","Placeat qui qui doloribus architecto distinctio.","3.3"
-"David Bomba","qui","Quibusdam repellat quo tenetur ipsum. Et labore itaque totam sequi quia. Quo in beatae ipsa quia est. Totam architecto placeat hic qui recusandae tempora reiciendis.","2.49"
-"David Bomba","deleniti","Ut illo vero accusantium ex dolor id. Hic in nobis est dolorem consequatur qui ratione.","6.07"
-"David Bomba","aspernatur","Non voluptatem et deserunt molestiae consectetur. Fuga autem et nisi qui quisquam veniam modi sunt. Recusandae maiores qui facere ut expedita laudantium maxime consequuntur. Qui id quibusdam neque et accusantium.","5.05"
-"David Bomba","sit","Quaerat consequatur debitis aut quidem magnam. Illum dolore numquam voluptates cum amet corporis sit.","5.82"
-"David Bomba","doloremque","Est non ut libero. Aut qui qui qui maiores. Impedit est optio saepe dignissimos odio. Qui nisi doloremque eius mollitia sint repellat possimus at. Possimus et sit odio quis.","4.08"
-"David Bomba","quaerat","Error est eum in pariatur. Aspernatur recusandae ex quasi molestiae. Quos sed excepturi placeat non.","8.380000000000001"
-"David Bomba","pariatur","Laboriosam aliquam et eos consequatur ab quis.","4.52"
-"David Bomba","facilis","Vero officia necessitatibus adipisci in culpa. Soluta et voluptas magni tenetur ut aut. Et ducimus qui non dolores eum.","9.49"
-"David Bomba","aut","Excepturi sit ipsum ipsam corrupti. Quod ab voluptatem explicabo ex. Dolores fugit maiores nemo. Natus sit eligendi quia voluptas deleniti qui. Omnis perferendis consequatur aut quos architecto in.","7.73"
-"David Bomba","molestiae","Quam et ex provident magni.","3.26"
-"David Bomba","inventore","Placeat enim ipsa perspiciatis dolorem quasi impedit quas exercitationem. Consequatur aut architecto laborum suscipit. Voluptas veritatis voluptas corrupti ex earum laudantium. Ad aliquid est autem a molestias enim dolores dignissimos.","4.82"
-"David Bomba","enim","Qui quo sed et quos possimus error. Recusandae at illum ipsum natus. In esse et sit debitis quo ut tempore. Et vel eos officiis provident perferendis.","3.98"
-"David Bomba","consectetur","Quas voluptas facere beatae sequi quos et magni. Pariatur harum aspernatur qui consequatur quae. Rem voluptatem dolorem voluptatem voluptas quas rerum.","6.81"
-"David Bomba","distinctio","Placeat libero quis id sed praesentium. Ea sed magnam et aliquam.","2.17"
-"David Bomba","praesentium","Non itaque consectetur repellendus cupiditate vel expedita. Ipsa rerum harum voluptatem magnam voluptatem. Est reiciendis inventore repellat ut vitae minus in.","8.41"
-"David Bomba","eius","Corporis consequatur aut maiores. Praesentium in voluptates consequatur et accusamus. Fuga itaque aliquid consequuntur consequatur.","2.69"
-"David Bomba","ipsum","Iste sit beatae consequuntur omnis praesentium iste nulla. Totam odio neque quia excepturi optio sit. Dolores quis unde repellat et maxime.","2.13"
-"David Bomba","veniam","Illum nisi maiores aspernatur ut ut voluptatum.","4.8"
-"David Bomba","quae","Voluptatem perspiciatis atque laborum qui recusandae non dicta qui. Qui esse nesciunt corporis architecto.","3.35"
-"David Bomba","tenetur","Neque dolores ad ut. Sit sed nemo est sed ut. Alias est est officiis pariatur autem.","8.619999999999999"
-"David Bomba","aliquam","Aut minus eveniet architecto doloribus esse sint amet. Dignissimos qui enim et fuga sapiente quaerat.","5.03"
-"David Bomba","porro","Iure maxime aperiam ipsa id doloremque ad pariatur quia. Aut maiores ipsa est dolor quidem ad quisquam. Excepturi dolor dolores molestiae explicabo dolorem. Sapiente nobis mollitia reprehenderit voluptatem culpa vel sapiente corrupti.","7.42"
-"David Bomba","repudiandae","Molestias ut ullam ipsa accusantium. Nobis aut sint cupiditate a ullam. Aut velit nemo modi voluptate.","2.03"
-"David Bomba","voluptatem","Maxime non nobis quae omnis molestiae sed dolor dolorem.","3.69"
-"David Bomba","ipsa","Voluptas commodi expedita doloribus ut. Minima ullam repudiandae doloribus repellat aut ut. Officia odio labore laboriosam dolor et. Quia dolorem suscipit possimus omnis quidem nam commodi.","1.28"
-"David Bomba","nam","Et odio provident eos eveniet nisi ut est enim. Earum inventore tempora doloribus officia sit et esse facere. Quia iusto suscipit et occaecati. Voluptatum commodi placeat tempora saepe facilis exercitationem. Quae esse id et est iste.","7.57"
-"David Bomba","voluptates","Sed corrupti dolore culpa consectetur id voluptatem fugiat. Ex impedit sit eum facere reprehenderit ut.","4.91"
-"David Bomba","odio","Maxime sed fuga id. Architecto ut nisi et ullam reiciendis voluptatem. Odit excepturi qui cupiditate.","4.54"
-"David Bomba","dolorem","Ratione et iure similique est exercitationem a laboriosam.","5.59"
-"David Bomba","ipsam","Iure iste sapiente molestias culpa distinctio qui. Ut aut qui similique maxime vel qui. Et aspernatur corporis omnis. Aliquid asperiores veniam harum veritatis fugit quas quia omnis.","7.86"
-"David Bomba","consequatur","Consequatur officia perferendis placeat quis. Nihil consectetur et voluptatibus. Modi sint modi modi possimus velit.","1.92"
-"David Bomba","quia","Et eaque doloribus accusantium eos. Optio maxime fuga voluptate et. Consequatur atque modi eos dolorem. Quae assumenda repudiandae corporis. Suscipit quo quia ipsa itaque. Animi adipisci voluptas ut.","5.78"
-"David Bomba","recusandae","Labore voluptas vero ut. Facere unde iure neque unde dolor. Non quis provident et porro.","1.69"
-"David Bomba","reiciendis","Aut nulla autem porro.","4.38"
-"David Bomba","beatae","Qui est quaerat quas velit accusamus minima. Ut aspernatur ut minima architecto. Nobis vero nisi suscipit voluptatum necessitatibus aut autem. Sunt ut atque enim aut quisquam laborum. Voluptatibus et laborum voluptatibus ex et nam voluptatem.","2.35"
-"David Bomba","dolor","Sed impedit rerum quibusdam sed est laudantium praesentium. Voluptatem eligendi commodi vel magnam.","4.56"
-"David Bomba","nihil","Et voluptatem possimus provident eaque ipsum. Recusandae rerum maiores quasi illum eum accusantium quae sunt.","5.15"
-"David Bomba","impedit","Laborum dolores qui expedita eum ut. Distinctio explicabo laudantium quasi eligendi magnam necessitatibus placeat.","7.55"
-"David Bomba","est","Consequatur suscipit qui aut rerum iste tempore illo. Assumenda temporibus illo aliquam quis rerum. Et officiis rerum culpa facilis ex.","8.68"
-"David Bomba","dolores","Veritatis eius consequatur doloremque voluptates debitis. Voluptate asperiores rerum officiis.","2.88"
-"David Bomba","reprehenderit","Expedita dolor nam inventore aliquam est architecto. Ut at itaque eius maiores est est soluta.","3.68"
-"David Bomba","mollitia","Similique sint voluptatem excepturi laboriosam. Quam fuga recusandae totam id molestiae similique deserunt nesciunt. Ullam earum iusto reprehenderit qui.","7.78"
-"David Bomba","cumque","Ut illum quis qui enim. Repudiandae earum incidunt natus eius qui. Qui unde a doloribus qui aliquid.","2.94"
-"David Bomba","incidunt","Autem quos voluptas architecto sed cumque distinctio. Incidunt illo iste delectus molestias. Molestias nisi quis velit.","5.14"
-"David Bomba","quo","Dolorem nobis dolorem quidem veritatis facilis sunt rerum exercitationem.","5.26"
-"David Bomba","voluptatibus","Voluptatem voluptas vel explicabo placeat at eos ea. Laudantium est numquam repudiandae quia autem unde praesentium.","5.62"
-"David Bomba","natus","Laudantium ut ut voluptas quam et et. Voluptatem aspernatur accusamus ut aliquid laborum et iure praesentium. Dolor voluptatem mollitia possimus beatae et ratione omnis. Consequatur possimus enim velit hic.","8.02"
-"David Bomba","vero","Et similique omnis ea dolorem. Atque assumenda ratione hic. Doloremque reprehenderit sed voluptatem nemo.","6.14"
-"David Bomba","provident","Consectetur animi ad est vel voluptatem velit. Repellat et sunt et provident. Sequi deserunt dignissimos nobis et et nam id. Voluptas et quia odit vero molestiae nulla odio id.","9.5"
-"David Bomba","tempora","Laudantium distinctio et voluptate ex sint. Aut adipisci et consequatur at consequatur numquam. Ipsa aliquam totam placeat eveniet. Eligendi sint molestiae reiciendis rerum quam.","5.66"
-"David Bomba","blanditiis","Odio perspiciatis nobis nulla odit omnis facere voluptates. Eos consequatur cupiditate facere sunt pariatur tempora. Reiciendis maiores odio sit quo cumque quidem qui. Hic et qui asperiores ut.","1.05"
-"David Bomba","officia","Dolor fuga natus et laborum. Qui laborum cum et est laboriosam. Molestiae repudiandae in aut magni. Sint impedit vel ut ut velit ullam.","1.98"
-"David Bomba","exercitationem","Et recusandae dolore eos optio sapiente. Dolores vitae libero aut sit.","7.85"
-"David Bomba","illo","Earum corrupti occaecati dolores voluptatibus ab fugit. Dolorem assumenda ipsa tempore sed at dolor occaecati. Qui itaque quia modi est ea et.","8.6"
-"David Bomba","eaque","Distinctio impedit incidunt labore est assumenda. Ut sed quasi odit vel rem dolor voluptate.","8.68"
-"David Bomba","eveniet","Molestiae id dicta quod placeat consequatur asperiores dolorem. Sequi numquam qui ut libero dolore impedit aut. Eum temporibus non nesciunt.","3.89"
-"David Bomba","debitis","Magnam eum qui facilis sed. Voluptas ab nostrum et nihil maiores. Sunt ratione nemo ipsum rem repudiandae voluptas.","6.53"
-"David Bomba","culpa","A omnis consequatur quae. Vero et quas cum facilis.","4.65"
-"David Bomba","sapiente","Autem vel pariatur odit quod et dicta veritatis. Sed nulla debitis reiciendis. Aut tenetur nostrum optio sit repellendus aut et.","1.2"
-"David Bomba","delectus","Nobis dolorem iusto qui eos est recusandae velit. Qui voluptas veritatis aut occaecati quia. Accusantium earum debitis sed aut non.","9.859999999999999"
-"David Bomba","dignissimos","Est dolorem odio perferendis officiis dignissimos quidem eveniet. Qui earum eos possimus laudantium qui et excepturi. Sed vel rem asperiores eum ut rerum deserunt et. Nam at et id commodi. Magnam reiciendis sapiente hic commodi et a illum sed. Magnam eos veniam iure delectus similique.","8.85"
-"David Bomba","quisquam","At perspiciatis vero laborum itaque non. Facere nesciunt blanditiis consequuntur in. Consequuntur voluptatem ipsa culpa sed. Modi error vel dolorem.","7.12"
-"David Bomba","sunt","Commodi excepturi aut quam sed impedit molestiae. Quis a iure vel quia error hic unde. In dolore quisquam nihil adipisci perspiciatis. Enim eveniet sed magni voluptate id molestiae sit non. Ut et molestiae sint et voluptas aperiam nobis.","8.109999999999999"
-"David Bomba","necessitatibus","Autem illo sit quasi voluptatem enim. Aperiam recusandae eveniet enim consequatur. Et eius pariatur quas ipsa ex inventore. Sunt aliquam ut numquam in autem inventore eligendi molestiae.","2.71"
-"David Bomba","cupiditate","Esse nulla illum sunt aliquid. Temporibus eum earum ea recusandae est distinctio. Placeat quae culpa et placeat animi et aut.","4.52"
-"David Bomba","aperiam","Sit fuga sit itaque esse cum.","5.78"
-"David Bomba","assumenda","Eius et eum vitae adipisci deserunt omnis commodi.","3.36"
-"David Bomba","laborum","Tempora sint vel maxime et iusto eos. Consequatur aut aut autem ea est animi fugit. Qui sint ducimus ipsum et.","2.25"
-"David Bomba","perferendis","Optio mollitia aperiam laudantium fuga et. Sed qui ad delectus aperiam inventore sit nisi eos.","8.470000000000001"
-"David Bomba","a","Minima est et sed. Voluptatibus et quia recusandae.","1.16"
-"David Bomba","dolore","Odit illum ut quia commodi natus. Veniam nemo qui quis optio. Repellat at est distinctio magnam.","9.539999999999999"
-"David Bomba","placeat","Est culpa sit nemo dolores sunt eligendi ut suscipit. Voluptas qui maxime molestiae saepe sint ipsam. Delectus tempora iure sed sit.","5.9"
-"David Bomba","cum","Autem voluptatem dolores qui dicta. Delectus ex aut rem quibusdam odit provident et.","6.92"
-"David Bomba","dicta","Nemo fuga fugiat molestiae odio. Ullam rerum sed assumenda.","6.94"
-"David Bomba","ex","Et accusamus ullam explicabo voluptatem eligendi neque. Veritatis quia suscipit aut sunt ipsa autem recusandae vel. Est et voluptas sint dolor velit eius incidunt rem.","8.609999999999999"
-"David Bomba","rem","Corrupti a voluptatibus culpa aut autem omnis.","5.09"
-"David Bomba","commodi","Quas asperiores expedita soluta porro ea id. Voluptatem dolorum magni aut ut in saepe. Eos et dignissimos error fugit hic.","4.59"
-"David Bomba","voluptate","Beatae perspiciatis ipsam occaecati recusandae rerum optio. Magnam repudiandae soluta a qui velit voluptatem. Quaerat et expedita a cupiditate rem.","1.22"
-"David Bomba","eum","Qui voluptatem ducimus aperiam odit et recusandae dolore.","4.28"
-"David Bomba","quas","Delectus perferendis eum nihil. Accusamus temporibus rerum quia. Iure aut placeat illum praesentium totam ea voluptas ipsa. Maiores sapiente ut labore tempore.","3.86"
-"David Bomba","magni","Eaque fugit excepturi ad. Dolores molestias natus fuga corrupti. Quo natus tempore voluptas magnam velit.","7.1"
-"David Bomba","fugit","Omnis suscipit quis aut laudantium. Velit voluptas totam sequi. Architecto iste quia natus. Quas totam modi quod provident.","5.86"
-"David Bomba","neque","Maiores itaque iure vel aut. Totam dolorum est quisquam officia nostrum. Aut in alias praesentium aliquid.","3.91"
-"David Bomba","molestias","Cupiditate ut cupiditate voluptates accusantium iste veritatis ut molestias.","2.1"
-"David Bomba","saepe","Dicta sequi laborum ex quos pariatur. Consequatur et culpa minima quo qui laboriosam. Nam nulla et quis fugit doloremque sunt nemo. Fugit quae totam quos distinctio ea in.","2.35"
-"David Bomba","similique","Magni velit veniam eos sed ut repellendus. Sint dolorem quaerat quidem porro nobis. Maiores amet molestias consequatur sit.","9.01"
-"David Bomba","earum","Iusto illo reiciendis vitae dolorem accusamus et. Qui aut quia consequatur facilis. Dolores aut ut optio aperiam qui officia. Cupiditate voluptatem quia odit et aut. Aut unde maxime dicta dignissimos quas. Dolorum aperiam quod est culpa. Blanditiis rerum perferendis aut.","6.46"
-"David Bomba","ullam","Et illo voluptatum doloribus. Voluptatem sed dolores fugiat libero consequatur quas et. Vero quos consequuntur id quibusdam sequi blanditiis.","9.27"
-"David Bomba","eos","Aperiam facilis sed non quo repudiandae dolores. Vero cumque dolorum et porro laborum exercitationem. Fugiat doloribus corporis soluta mollitia vel. Veniam velit dolore voluptas quam.","8.08"
-"David Bomba","facere","Qui delectus quidem et qui. Fuga a omnis atque veniam. Repellat et saepe neque sed rerum quam.","6.34"
-"David Bomba","quod","Architecto velit nam veniam ratione. Qui velit doloribus aut. Distinctio laudantium est consequatur consequatur molestiae. Cum et accusamus esse dolore quam.","1.07"
-"David Bomba","nobis","Quasi omnis quidem qui sint et repellat facilis veritatis. Quam inventore soluta earum sit illum et. Eos delectus tempore odio ut laboriosam culpa.","2.56"
-"David Bomba","perspiciatis","Quam deserunt temporibus laboriosam ea consequatur explicabo omnis. Exercitationem atque autem ut. Sit dolorum eius ut dolorem odit dolorem debitis.","1.67"
-"David Bomba","animi","Quia ea atque id quia. Et odio laboriosam delectus dolorem. Fugiat ipsa porro accusantium.","7.91"
-"David Bomba","nulla","Minus sit nobis rerum reiciendis. Consectetur modi non qui quisquam omnis culpa. Ut commodi tempora sit iste.","7.29"
-"David Bomba","quibusdam","Et et nihil rerum aut vitae. Aut optio optio unde voluptatem. Perspiciatis aut placeat explicabo et ducimus.","7.9"
-"David Bomba","excepturi","Quis repudiandae ratione impedit repellat doloremque est. Accusamus minus cupiditate velit. Aliquam explicabo magnam eaque velit quibusdam et quisquam. Eos maxime consequatur voluptatem quis doloremque quibusdam.","3.4"
-"David Bomba","veritatis","Ut reprehenderit aut aut non quam cupiditate numquam.","6.15"
-"David Bomba","omnis","Iusto eum aspernatur temporibus ratione voluptatem ducimus. Repellat rem sed aut cupiditate. Et quasi voluptatibus cumque cupiditate. Velit quidem praesentium quasi est sed est.","9.869999999999999"
-"David Bomba","voluptatum","Ipsum cupiditate aut officia praesentium aut architecto. Eos omnis ratione sed quam. Sed corporis aut quia dicta autem.","5.64"
-"David Bomba","sint","Libero sed dolore suscipit repellat ut libero.","5.69"
-"David Bomba","odit","Nesciunt esse explicabo expedita facere repellat nulla. Eligendi iusto quos in culpa. Amet commodi et odit nostrum. Quaerat excepturi non rerum officiis autem ut.","1.37"
-"David Bomba","ad","Vel enim sit sed doloribus sit sed. In veritatis sunt autem et aliquid aspernatur. Fugiat deleniti et porro repellat maiores ea.","4.55"
-"David Bomba","asperiores","Cum veniam ipsam suscipit eos totam quae. Eaque ducimus odit ut molestiae aut esse.","1.9"
-"David Bomba","accusamus","Aliquam alias laborum numquam asperiores. Ut praesentium repellendus ut nostrum. Cumque ut est et nam qui esse hic.","3.8"
-"David Bomba","explicabo","Vero eaque quasi officiis modi nihil ad dolor. Sequi facilis assumenda possimus vel fugit inventore voluptatem.","2.21"
-"David Bomba","consequuntur","Reprehenderit et aut rerum quos iusto rerum. A delectus eveniet quia expedita.","3.72"
-"David Bomba","repellat","Consequatur quis at ut nesciunt quibusdam dicta ut provident. Aperiam dicta dolores id sed non ex sunt.","7.56"
-"David Bomba","esse","Aut harum cupiditate quos nihil quis. Cupiditate non non est nesciunt consequatur. Provident est quis porro consequatur et. Illo placeat et quisquam sit nisi veniam commodi.","5.03"
-"David Bomba","doloribus","Provident molestias libero dolores sit voluptate quis architecto.","9.91"
-"David Bomba","magnam","Voluptas dicta occaecati adipisci autem sunt libero tenetur est. Voluptas quia recusandae est et enim est. Labore fugit vitae qui cumque aut. Illo aperiam aliquid deserunt beatae. Voluptatem tempora tenetur dignissimos et autem qui minus voluptatem.","1.53"
-"David Bomba","suscipit","Ullam amet consequuntur itaque. Cupiditate odio facere quis est fuga architecto. Aut placeat quae ut itaque. Voluptatem omnis architecto ipsum qui. Blanditiis nostrum iusto quo nesciunt voluptate. Ut expedita unde ex illum ut dignissimos.","4.43"
-"David Bomba","iure","Quo autem voluptas reiciendis temporibus.","4.27"
-"David Bomba","modi","Adipisci dolor vel non officia nisi veritatis. Est quo voluptas doloribus quis est sunt. Ducimus minus quia quia est eos maiores earum. Ut placeat iste tempore occaecati.","1.04"
-"David Bomba","labore","Doloremque distinctio aperiam voluptas rerum quidem sed.","1.95"
-"David Bomba","soluta","Dolore sint similique eos. Harum est ipsa aut voluptas esse culpa. Voluptas voluptatem cumque et aut et quasi tempora.","1.67"
-"David Bomba","accusantium","Eos quo voluptatem odit temporibus aut. Reprehenderit sit ducimus expedita nostrum incidunt ut voluptates.","8.619999999999999"
-"David Bomba","vitae","Enim error dolorem cupiditate voluptate quasi numquam quis. Porro ducimus eos maiores facere.","5.28"
-"David Bomba","possimus","Et tempore at sit est repellendus aut illo eum. Ratione aperiam aliquam veritatis rerum est cupiditate. Fuga sit recusandae officiis.","9.279999999999999"
-"David Bomba","nisi","Animi modi ut perspiciatis temporibus quo. Est officia qui numquam perspiciatis. Provident ut nostrum enim accusantium veniam saepe. Vero est minus aut aliquam.","8.67"
-"David Bomba","ratione","Nemo at quo est velit.","5.6"
-"David Bomba","illum","Odio illo veritatis dolorem omnis ad. Magni officia est officia voluptate voluptas dolor. Est dolores et tempora corporis est at ullam. Illum amet ipsa quia et omnis esse quaerat. Fugiat unde magni quod saepe. Incidunt assumenda neque voluptatem.","6.01"
-"David Bomba","libero","Reiciendis voluptatem sed vitae sapiente pariatur alias. Voluptates velit libero voluptatum minima aperiam. Magnam natus consequatur voluptatem molestiae iure cum qui. Nisi tempore aperiam porro.","9.16"
-"David Bomba","alias","A fugiat id aliquam officia. Eum eum tempore rerum officiis modi sit. Non impedit incidunt et commodi quia harum nesciunt.","1.92"
-"David Bomba","occaecati","Aspernatur aut temporibus voluptas. Cumque sint sint voluptatibus.","5.95"
-"David Bomba","1","100","100"
-"David Bomba","ab","Sed perferendis modi velit minima placeat reprehenderit. Voluptatum ullam vel officia quia et esse quaerat. Sit aperiam minus dolor. Quasi earum temporibus est aspernatur.","6.86"
-"David Bomba","amet","Nihil consequatur et deserunt nihil et.","7.82"
-"David Bomba",":MONTH","hey there :MONTH+1 and :YEAR+1","0"
+"Invoice Ninja v4.5.23 - December 17, 2020 7:01 am",,,,
+,,,,
+Expenses,,,,
+Client,Project,Notes,Amount,Date
+David Bomba,officiis,Sed minima soluta saepe quae laboriosam placeat. Sequi laboriosam architecto et aut. Ut hic repellat veniam eligendi.,3.94,2022-01-01
+David Bomba,maxime,Distinctio consectetur provident nisi autem ipsum animi.,1.11,2022-01-01
+David Bomba,atque,Fugiat illo iste esse laudantium est. Recusandae et ullam optio soluta. Est est nulla doloribus adipisci.,9.78,2022-01-02
+David Bomba,itaque,Placeat aliquam et est quasi illo aut inventore. Expedita asperiores cupiditate accusantium. Eos esse dolorem tenetur illo totam.,3.5,2022-01-03
+David Bomba,et,Est quia soluta asperiores dolor ipsum illum sapiente.,3.98,2022-01-04
+David Bomba,velit,Quia consequatur magnam impedit dignissimos. Ut vel sapiente nemo quia laborum. Consectetur occaecati quia sunt eum. Dignissimos labore molestiae laudantium impedit temporibus blanditiis porro maxime. Dolorem quia alias ducimus fugiat. Aut vel officia voluptatem et quia.,1.83,2022-01-05
+David Bomba,corporis,Vel temporibus qui et ex a. Pariatur minima ipsa quasi non dolorum laboriosam laboriosam. Dolor soluta ut nostrum veniam. Porro alias eos quibusdam. Maiores aut eos similique.,9.59,2022-01-06
+David Bomba,expedita,Mollitia aperiam modi velit sit necessitatibus dolor quibusdam sit. Autem molestiae neque neque doloribus nulla.,8.86,2022-01-07
+David Bomba,ea,Deleniti exercitationem rem et nihil. Ea qui autem fuga repudiandae accusamus qui et et. Quia accusamus molestiae dolor.,5.37,2022-01-08
+David Bomba,ducimus,Ut nobis sint et error ducimus minus suscipit. Ipsum inventore cumque et magni minima explicabo. Corporis earum nihil at facilis ut voluptates aut. Blanditiis reiciendis aut dolor et. Est rerum magni in qui velit. Dolore nihil nostrum quisquam in ut.,8.96,2022-01-09
+David Bomba,in,Non laudantium adipisci eos porro. Quia aspernatur cum soluta eaque blanditiis fugit alias. Quam nobis dolorem repellendus ut alias dolor cumque. Laboriosam laboriosam et debitis autem autem.,3.14,2022-01-10
+David Bomba,ut,Fuga quam reprehenderit adipisci nesciunt ratione omnis. Dolore dicta quasi excepturi rerum. Alias voluptatem voluptatem vel harum iste id. Nihil est velit quo soluta delectus.,4.6,2022-01-11
+David Bomba,adipisci,Itaque iure necessitatibus vel doloribus omnis. Possimus atque tempora quo ut.,6.64,2022-01-12
+David Bomba,quidem,Sit maiores quia quos facilis earum ducimus. Numquam dolores quo numquam.,7.47,2022-01-13
+David Bomba,optio,Qui minus dicta culpa aperiam id natus quaerat. Facilis cupiditate consequuntur quisquam soluta in.,3.03,2022-01-14
+David Bomba,temporibus,Tempora eligendi nisi dolore non tenetur. Officiis autem aspernatur et optio. Omnis dolore placeat et nihil et.,7.54,2022-01-15
+David Bomba,repellendus,Voluptates hic dolorum aspernatur vitae. Adipisci dicta ut sapiente commodi quia explicabo.,2.14,2022-01-16
+David Bomba,dolorum,Quo vitae atque aut vel et dolorem eaque alias. Quod tempore illum placeat ipsum aspernatur. Incidunt qui ea dolorem et. Optio qui deserunt beatae sed perferendis. Esse rerum et magnam eum soluta. Consequatur rem sed ut repellendus exercitationem. Dolores error omnis quia qui qui.,5.9,2022-01-17
+David Bomba,non,Et cumque odio nam voluptatum nam molestias.,2.62,2022-01-18
+David Bomba,quam,Nostrum in eos voluptatem.,8.63,2022-01-19
+David Bomba,harum,Vero deleniti vel cumque cumque cupiditate nihil. Est non blanditiis consequatur commodi similique cumque ipsa sapiente. Dolor eum fugiat distinctio nihil aut. Sequi qui cum architecto quia ullam rerum ad. Quo et magnam perferendis rerum voluptatem. Maiores atque ipsa nihil.,7.64,2022-01-20
+David Bomba,quasi,Et labore doloremque incidunt atque illo repudiandae. Officiis necessitatibus est quo. Veniam eum qui aut est est.,5.79,2022-01-21
+David Bomba,sed,Illo nihil aut iste sed. In ea rerum atque iure. Et maiores qui odit inventore cum at. Possimus doloribus dicta excepturi quisquam asperiores qui.,2.56,2022-01-22
+David Bomba,numquam,Ex temporibus alias voluptatem qui.,6.21,2022-01-23
+David Bomba,quis,Aut nobis qui quia. Laboriosam id optio aut. Voluptatem doloremque doloremque odit sint iure sint adipisci. Ut fugiat perspiciatis adipisci earum quasi et.,9.74,2022-01-24
+David Bomba,laboriosam,Temporibus quisquam eligendi harum. Quis est architecto suscipit. Saepe aut et quis. Dolorem nisi recusandae laborum nulla aut dolorem. Provident consectetur maxime minima sint. Et non consequatur possimus officia non sunt incidunt. Odit quia sit quia consequatur ipsam.,5.59,2022-01-25
+David Bomba,voluptas,Numquam quasi eos harum laborum illo. Sit distinctio totam dolores deleniti veritatis voluptas inventore. Pariatur dicta saepe id id quod ratione ea.,5.86,2022-01-26
+David Bomba,unde,Similique autem maiores et repellat natus eius unde sequi.,8.81,2022-01-27
+David Bomba,autem,Sit eveniet reiciendis aut rerum est omnis sunt sed.,3.42,2022-01-28
+David Bomba,sequi,Nesciunt sequi modi inventore delectus aut sit fuga. Modi et quibusdam et laborum.,9.51,2022-01-29
+David Bomba,deserunt,Similique hic voluptate velit. Fuga est est qui fugit eligendi consequatur omnis. Nihil alias adipisci quisquam ut explicabo facere.,2.16,2022-01-30
+David Bomba,id,Facere vero amet fugit et voluptatem nisi repellendus. Excepturi sit earum in pariatur consequatur aut. Molestiae et explicabo voluptas tempore voluptates eos.,9.83,2022-01-31
+David Bomba,nesciunt,Perspiciatis id iste vel enim alias fugit itaque. Facilis quae aut quos nam est nemo suscipit impedit. Debitis ut commodi iure magni. Optio voluptatum inventore tempora incidunt aut deserunt corporis animi.,6.12,2022-02-01
+David Bomba,error,Quisquam ut dolor quo. Hic ex quos neque omnis officiis cumque. Et quae qui autem. Pariatur amet iure labore fugiat error quo.,2.03,2022-02-02
+David Bomba,iste,Ad qui adipisci in et quos eveniet. Sapiente voluptatum sint error ex in. Minima voluptatem commodi ea aut laborum.,5.13,2022-02-03
+David Bomba,laudantium,Quo inventore est mollitia fugiat. Veniam sit fugit dolorem.,7.91,2022-02-04
+David Bomba,minima,Nulla laborum totam adipisci esse explicabo. Eaque dolor facere nesciunt voluptatem ratione. Nesciunt dignissimos cum voluptas quidem repudiandae aut sed. Repellat voluptatem veniam culpa eum.,8.25,2022-02-05
+David Bomba,aliquid,Consequuntur sint laboriosam adipisci consequatur quam a fuga. Delectus sequi tempore molestias dolorem fugiat molestiae ex. Quisquam eaque eum iure ut nisi odit quia. Id iusto ipsa nihil harum hic voluptatum beatae sed. Eum quam omnis in cumque.,9.92,2022-02-06
+David Bomba,iusto,Laboriosam quia eum error quam repellendus.,6.02,2022-02-07
+David Bomba,nemo,Deleniti asperiores doloribus consequuntur magni. Earum aspernatur et vitae veniam molestiae magni. Quaerat error ea dignissimos qui labore error velit.,9.9,2022-02-08
+David Bomba,minus,Voluptatum explicabo amet quidem quia autem aut temporibus. Dolorem sed aut totam et minus ut consequatur tenetur. Et rerum quia autem neque sed neque.,8.26,2022-02-09
+David Bomba,quos,Suscipit praesentium animi ut sunt. Tempore adipisci maiores sed atque id libero consectetur porro. Itaque consequuntur perspiciatis officiis sit. Itaque magni velit laborum rerum qui reiciendis ut. Provident tempore fuga hic quae aut.,6.52,2022-02-10
+David Bomba,vel,Eum aliquam officia ea beatae fugit qui ut laboriosam.,8.34,2022-02-11
+David Bomba,fuga,Vel ut deserunt consequatur voluptatum quis nam. Reiciendis possimus quisquam fugiat numquam.,4.12,2022-02-12
+David Bomba,nostrum,Non ducimus non rem. Est qui odit est nam. Ab voluptatum nihil itaque explicabo hic.,7.07,2022-02-13
+David Bomba,hic,Non modi voluptatum blanditiis et.,4.29,2022-02-14
+David Bomba,rerum,Enim omnis ut dolore ex velit sit. Ab et dolor qui iste. Odit quia et et debitis eligendi illo. Rerum rem corrupti dolor est est ea illum.,7.08,2022-02-15
+David Bomba,corrupti,Ut vitae accusantium ratione in suscipit. Distinctio unde est expedita omnis. Sequi non sit ut modi nostrum libero nesciunt beatae. Qui dolorem optio reprehenderit eum.,8.97,2022-02-16
+David Bomba,maiores,Aut accusantium neque nam aut quas inventore. Qui laboriosam quam commodi aut suscipit et. Nam aut iusto aut facilis vitae dolores eum. Culpa magni deserunt qui rerum aut.,2.41,2022-02-17
+David Bomba,totam,Totam eos molestiae totam vero fuga sint. Nisi minima et veritatis fugiat. Quo earum ut eius odit.,3.41,2022-02-18
+David Bomba,eligendi,Voluptates amet voluptatem placeat aliquam non non saepe. Provident quaerat laudantium debitis. Quasi sed maxime deserunt laboriosam reiciendis tempore.,8.33,2022-02-19
+David Bomba,architecto,Placeat qui qui doloribus architecto distinctio.,3.3,2022-02-20
+David Bomba,qui,Quibusdam repellat quo tenetur ipsum. Et labore itaque totam sequi quia. Quo in beatae ipsa quia est. Totam architecto placeat hic qui recusandae tempora reiciendis.,2.49,2022-02-21
+David Bomba,deleniti,Ut illo vero accusantium ex dolor id. Hic in nobis est dolorem consequatur qui ratione.,6.07,2022-02-22
+David Bomba,aspernatur,Non voluptatem et deserunt molestiae consectetur. Fuga autem et nisi qui quisquam veniam modi sunt. Recusandae maiores qui facere ut expedita laudantium maxime consequuntur. Qui id quibusdam neque et accusantium.,5.05,2022-02-23
+David Bomba,sit,Quaerat consequatur debitis aut quidem magnam. Illum dolore numquam voluptates cum amet corporis sit.,5.82,2022-02-24
+David Bomba,doloremque,Est non ut libero. Aut qui qui qui maiores. Impedit est optio saepe dignissimos odio. Qui nisi doloremque eius mollitia sint repellat possimus at. Possimus et sit odio quis.,4.08,2022-02-25
+David Bomba,quaerat,Error est eum in pariatur. Aspernatur recusandae ex quasi molestiae. Quos sed excepturi placeat non.,8.38,2022-02-26
+David Bomba,pariatur,Laboriosam aliquam et eos consequatur ab quis.,4.52,2022-02-27
+David Bomba,facilis,Vero officia necessitatibus adipisci in culpa. Soluta et voluptas magni tenetur ut aut. Et ducimus qui non dolores eum.,9.49,2022-02-28
+David Bomba,aut,Excepturi sit ipsum ipsam corrupti. Quod ab voluptatem explicabo ex. Dolores fugit maiores nemo. Natus sit eligendi quia voluptas deleniti qui. Omnis perferendis consequatur aut quos architecto in.,7.73,2022-03-01
+David Bomba,molestiae,Quam et ex provident magni.,3.26,2022-03-02
+David Bomba,inventore,Placeat enim ipsa perspiciatis dolorem quasi impedit quas exercitationem. Consequatur aut architecto laborum suscipit. Voluptas veritatis voluptas corrupti ex earum laudantium. Ad aliquid est autem a molestias enim dolores dignissimos.,4.82,2022-03-03
+David Bomba,enim,Qui quo sed et quos possimus error. Recusandae at illum ipsum natus. In esse et sit debitis quo ut tempore. Et vel eos officiis provident perferendis.,3.98,2022-03-04
+David Bomba,consectetur,Quas voluptas facere beatae sequi quos et magni. Pariatur harum aspernatur qui consequatur quae. Rem voluptatem dolorem voluptatem voluptas quas rerum.,6.81,2022-03-05
+David Bomba,distinctio,Placeat libero quis id sed praesentium. Ea sed magnam et aliquam.,2.17,2022-03-06
+David Bomba,praesentium,Non itaque consectetur repellendus cupiditate vel expedita. Ipsa rerum harum voluptatem magnam voluptatem. Est reiciendis inventore repellat ut vitae minus in.,8.41,2022-03-07
+David Bomba,eius,Corporis consequatur aut maiores. Praesentium in voluptates consequatur et accusamus. Fuga itaque aliquid consequuntur consequatur.,2.69,2022-03-08
+David Bomba,ipsum,Iste sit beatae consequuntur omnis praesentium iste nulla. Totam odio neque quia excepturi optio sit. Dolores quis unde repellat et maxime.,2.13,2022-03-09
+David Bomba,veniam,Illum nisi maiores aspernatur ut ut voluptatum.,4.8,2022-03-10
+David Bomba,quae,Voluptatem perspiciatis atque laborum qui recusandae non dicta qui. Qui esse nesciunt corporis architecto.,3.35,2022-03-11
+David Bomba,tenetur,Neque dolores ad ut. Sit sed nemo est sed ut. Alias est est officiis pariatur autem.,8.62,2022-03-12
+David Bomba,aliquam,Aut minus eveniet architecto doloribus esse sint amet. Dignissimos qui enim et fuga sapiente quaerat.,5.03,2022-03-13
+David Bomba,porro,Iure maxime aperiam ipsa id doloremque ad pariatur quia. Aut maiores ipsa est dolor quidem ad quisquam. Excepturi dolor dolores molestiae explicabo dolorem. Sapiente nobis mollitia reprehenderit voluptatem culpa vel sapiente corrupti.,7.42,2022-03-14
+David Bomba,repudiandae,Molestias ut ullam ipsa accusantium. Nobis aut sint cupiditate a ullam. Aut velit nemo modi voluptate.,2.03,2022-03-15
+David Bomba,voluptatem,Maxime non nobis quae omnis molestiae sed dolor dolorem.,3.69,2022-03-16
+David Bomba,ipsa,Voluptas commodi expedita doloribus ut. Minima ullam repudiandae doloribus repellat aut ut. Officia odio labore laboriosam dolor et. Quia dolorem suscipit possimus omnis quidem nam commodi.,1.28,2022-03-17
+David Bomba,nam,Et odio provident eos eveniet nisi ut est enim. Earum inventore tempora doloribus officia sit et esse facere. Quia iusto suscipit et occaecati. Voluptatum commodi placeat tempora saepe facilis exercitationem. Quae esse id et est iste.,7.57,2022-03-18
+David Bomba,voluptates,Sed corrupti dolore culpa consectetur id voluptatem fugiat. Ex impedit sit eum facere reprehenderit ut.,4.91,2022-03-19
+David Bomba,odio,Maxime sed fuga id. Architecto ut nisi et ullam reiciendis voluptatem. Odit excepturi qui cupiditate.,4.54,2022-03-20
+David Bomba,dolorem,Ratione et iure similique est exercitationem a laboriosam.,5.59,2022-03-21
+David Bomba,ipsam,Iure iste sapiente molestias culpa distinctio qui. Ut aut qui similique maxime vel qui. Et aspernatur corporis omnis. Aliquid asperiores veniam harum veritatis fugit quas quia omnis.,7.86,2022-03-22
+David Bomba,consequatur,Consequatur officia perferendis placeat quis. Nihil consectetur et voluptatibus. Modi sint modi modi possimus velit.,1.92,2022-03-23
+David Bomba,quia,Et eaque doloribus accusantium eos. Optio maxime fuga voluptate et. Consequatur atque modi eos dolorem. Quae assumenda repudiandae corporis. Suscipit quo quia ipsa itaque. Animi adipisci voluptas ut.,5.78,2022-03-24
+David Bomba,recusandae,Labore voluptas vero ut. Facere unde iure neque unde dolor. Non quis provident et porro.,1.69,2022-03-25
+David Bomba,reiciendis,Aut nulla autem porro.,4.38,2022-03-26
+David Bomba,beatae,Qui est quaerat quas velit accusamus minima. Ut aspernatur ut minima architecto. Nobis vero nisi suscipit voluptatum necessitatibus aut autem. Sunt ut atque enim aut quisquam laborum. Voluptatibus et laborum voluptatibus ex et nam voluptatem.,2.35,2022-03-27
+David Bomba,dolor,Sed impedit rerum quibusdam sed est laudantium praesentium. Voluptatem eligendi commodi vel magnam.,4.56,2022-03-28
+David Bomba,nihil,Et voluptatem possimus provident eaque ipsum. Recusandae rerum maiores quasi illum eum accusantium quae sunt.,5.15,2022-03-29
+David Bomba,impedit,Laborum dolores qui expedita eum ut. Distinctio explicabo laudantium quasi eligendi magnam necessitatibus placeat.,7.55,2022-03-30
+David Bomba,est,Consequatur suscipit qui aut rerum iste tempore illo. Assumenda temporibus illo aliquam quis rerum. Et officiis rerum culpa facilis ex.,8.68,2022-03-31
+David Bomba,dolores,Veritatis eius consequatur doloremque voluptates debitis. Voluptate asperiores rerum officiis.,2.88,2022-04-01
+David Bomba,reprehenderit,Expedita dolor nam inventore aliquam est architecto. Ut at itaque eius maiores est est soluta.,3.68,2022-04-02
+David Bomba,mollitia,Similique sint voluptatem excepturi laboriosam. Quam fuga recusandae totam id molestiae similique deserunt nesciunt. Ullam earum iusto reprehenderit qui.,7.78,2022-04-03
+David Bomba,cumque,Ut illum quis qui enim. Repudiandae earum incidunt natus eius qui. Qui unde a doloribus qui aliquid.,2.94,2022-04-04
+David Bomba,incidunt,Autem quos voluptas architecto sed cumque distinctio. Incidunt illo iste delectus molestias. Molestias nisi quis velit.,5.14,2022-04-05
+David Bomba,quo,Dolorem nobis dolorem quidem veritatis facilis sunt rerum exercitationem.,5.26,2022-04-06
+David Bomba,voluptatibus,Voluptatem voluptas vel explicabo placeat at eos ea. Laudantium est numquam repudiandae quia autem unde praesentium.,5.62,2022-04-07
+David Bomba,natus,Laudantium ut ut voluptas quam et et. Voluptatem aspernatur accusamus ut aliquid laborum et iure praesentium. Dolor voluptatem mollitia possimus beatae et ratione omnis. Consequatur possimus enim velit hic.,8.02,2022-04-08
+David Bomba,vero,Et similique omnis ea dolorem. Atque assumenda ratione hic. Doloremque reprehenderit sed voluptatem nemo.,6.14,2022-04-09
+David Bomba,provident,Consectetur animi ad est vel voluptatem velit. Repellat et sunt et provident. Sequi deserunt dignissimos nobis et et nam id. Voluptas et quia odit vero molestiae nulla odio id.,9.5,2022-04-10
+David Bomba,tempora,Laudantium distinctio et voluptate ex sint. Aut adipisci et consequatur at consequatur numquam. Ipsa aliquam totam placeat eveniet. Eligendi sint molestiae reiciendis rerum quam.,5.66,2022-04-11
+David Bomba,blanditiis,Odio perspiciatis nobis nulla odit omnis facere voluptates. Eos consequatur cupiditate facere sunt pariatur tempora. Reiciendis maiores odio sit quo cumque quidem qui. Hic et qui asperiores ut.,1.05,2022-04-12
+David Bomba,officia,Dolor fuga natus et laborum. Qui laborum cum et est laboriosam. Molestiae repudiandae in aut magni. Sint impedit vel ut ut velit ullam.,1.98,2022-04-13
+David Bomba,exercitationem,Et recusandae dolore eos optio sapiente. Dolores vitae libero aut sit.,7.85,2022-04-14
+David Bomba,illo,Earum corrupti occaecati dolores voluptatibus ab fugit. Dolorem assumenda ipsa tempore sed at dolor occaecati. Qui itaque quia modi est ea et.,8.6,2022-04-15
+David Bomba,eaque,Distinctio impedit incidunt labore est assumenda. Ut sed quasi odit vel rem dolor voluptate.,8.68,2022-04-16
+David Bomba,eveniet,Molestiae id dicta quod placeat consequatur asperiores dolorem. Sequi numquam qui ut libero dolore impedit aut. Eum temporibus non nesciunt.,3.89,2022-04-17
+David Bomba,debitis,Magnam eum qui facilis sed. Voluptas ab nostrum et nihil maiores. Sunt ratione nemo ipsum rem repudiandae voluptas.,6.53,2022-04-18
+David Bomba,culpa,A omnis consequatur quae. Vero et quas cum facilis.,4.65,2022-04-19
+David Bomba,sapiente,Autem vel pariatur odit quod et dicta veritatis. Sed nulla debitis reiciendis. Aut tenetur nostrum optio sit repellendus aut et.,1.2,2022-04-20
+David Bomba,delectus,Nobis dolorem iusto qui eos est recusandae velit. Qui voluptas veritatis aut occaecati quia. Accusantium earum debitis sed aut non.,9.86,2022-04-21
+David Bomba,dignissimos,Est dolorem odio perferendis officiis dignissimos quidem eveniet. Qui earum eos possimus laudantium qui et excepturi. Sed vel rem asperiores eum ut rerum deserunt et. Nam at et id commodi. Magnam reiciendis sapiente hic commodi et a illum sed. Magnam eos veniam iure delectus similique.,8.85,2022-04-22
+David Bomba,quisquam,At perspiciatis vero laborum itaque non. Facere nesciunt blanditiis consequuntur in. Consequuntur voluptatem ipsa culpa sed. Modi error vel dolorem.,7.12,2022-04-23
+David Bomba,sunt,Commodi excepturi aut quam sed impedit molestiae. Quis a iure vel quia error hic unde. In dolore quisquam nihil adipisci perspiciatis. Enim eveniet sed magni voluptate id molestiae sit non. Ut et molestiae sint et voluptas aperiam nobis.,8.11,2022-04-24
+David Bomba,necessitatibus,Autem illo sit quasi voluptatem enim. Aperiam recusandae eveniet enim consequatur. Et eius pariatur quas ipsa ex inventore. Sunt aliquam ut numquam in autem inventore eligendi molestiae.,2.71,2022-04-25
+David Bomba,cupiditate,Esse nulla illum sunt aliquid. Temporibus eum earum ea recusandae est distinctio. Placeat quae culpa et placeat animi et aut.,4.52,2022-04-26
+David Bomba,aperiam,Sit fuga sit itaque esse cum.,5.78,2022-04-27
+David Bomba,assumenda,Eius et eum vitae adipisci deserunt omnis commodi.,3.36,2022-04-28
+David Bomba,laborum,Tempora sint vel maxime et iusto eos. Consequatur aut aut autem ea est animi fugit. Qui sint ducimus ipsum et.,2.25,2022-04-29
+David Bomba,perferendis,Optio mollitia aperiam laudantium fuga et. Sed qui ad delectus aperiam inventore sit nisi eos.,8.47,2022-04-30
+David Bomba,a,Minima est et sed. Voluptatibus et quia recusandae.,1.16,2022-05-01
+David Bomba,dolore,Odit illum ut quia commodi natus. Veniam nemo qui quis optio. Repellat at est distinctio magnam.,9.54,2022-05-02
+David Bomba,placeat,Est culpa sit nemo dolores sunt eligendi ut suscipit. Voluptas qui maxime molestiae saepe sint ipsam. Delectus tempora iure sed sit.,5.9,2022-05-03
+David Bomba,cum,Autem voluptatem dolores qui dicta. Delectus ex aut rem quibusdam odit provident et.,6.92,2022-05-04
+David Bomba,dicta,Nemo fuga fugiat molestiae odio. Ullam rerum sed assumenda.,6.94,2022-05-05
+David Bomba,ex,Et accusamus ullam explicabo voluptatem eligendi neque. Veritatis quia suscipit aut sunt ipsa autem recusandae vel. Est et voluptas sint dolor velit eius incidunt rem.,8.61,2022-05-06
+David Bomba,rem,Corrupti a voluptatibus culpa aut autem omnis.,5.09,2022-05-07
+David Bomba,commodi,Quas asperiores expedita soluta porro ea id. Voluptatem dolorum magni aut ut in saepe. Eos et dignissimos error fugit hic.,4.59,2022-05-08
+David Bomba,voluptate,Beatae perspiciatis ipsam occaecati recusandae rerum optio. Magnam repudiandae soluta a qui velit voluptatem. Quaerat et expedita a cupiditate rem.,1.22,2022-05-09
+David Bomba,eum,Qui voluptatem ducimus aperiam odit et recusandae dolore.,4.28,2022-05-10
+David Bomba,quas,Delectus perferendis eum nihil. Accusamus temporibus rerum quia. Iure aut placeat illum praesentium totam ea voluptas ipsa. Maiores sapiente ut labore tempore.,3.86,2022-05-11
+David Bomba,magni,Eaque fugit excepturi ad. Dolores molestias natus fuga corrupti. Quo natus tempore voluptas magnam velit.,7.1,2022-05-12
+David Bomba,fugit,Omnis suscipit quis aut laudantium. Velit voluptas totam sequi. Architecto iste quia natus. Quas totam modi quod provident.,5.86,2022-05-13
+David Bomba,neque,Maiores itaque iure vel aut. Totam dolorum est quisquam officia nostrum. Aut in alias praesentium aliquid.,3.91,2022-05-14
+David Bomba,molestias,Cupiditate ut cupiditate voluptates accusantium iste veritatis ut molestias.,2.1,2022-05-15
+David Bomba,saepe,Dicta sequi laborum ex quos pariatur. Consequatur et culpa minima quo qui laboriosam. Nam nulla et quis fugit doloremque sunt nemo. Fugit quae totam quos distinctio ea in.,2.35,2022-05-16
+David Bomba,similique,Magni velit veniam eos sed ut repellendus. Sint dolorem quaerat quidem porro nobis. Maiores amet molestias consequatur sit.,9.01,2022-05-17
+David Bomba,earum,Iusto illo reiciendis vitae dolorem accusamus et. Qui aut quia consequatur facilis. Dolores aut ut optio aperiam qui officia. Cupiditate voluptatem quia odit et aut. Aut unde maxime dicta dignissimos quas. Dolorum aperiam quod est culpa. Blanditiis rerum perferendis aut.,6.46,2022-05-18
+David Bomba,ullam,Et illo voluptatum doloribus. Voluptatem sed dolores fugiat libero consequatur quas et. Vero quos consequuntur id quibusdam sequi blanditiis.,9.27,2022-05-19
+David Bomba,eos,Aperiam facilis sed non quo repudiandae dolores. Vero cumque dolorum et porro laborum exercitationem. Fugiat doloribus corporis soluta mollitia vel. Veniam velit dolore voluptas quam.,8.08,2022-05-20
+David Bomba,facere,Qui delectus quidem et qui. Fuga a omnis atque veniam. Repellat et saepe neque sed rerum quam.,6.34,2022-05-21
+David Bomba,quod,Architecto velit nam veniam ratione. Qui velit doloribus aut. Distinctio laudantium est consequatur consequatur molestiae. Cum et accusamus esse dolore quam.,1.07,2022-05-22
+David Bomba,nobis,Quasi omnis quidem qui sint et repellat facilis veritatis. Quam inventore soluta earum sit illum et. Eos delectus tempore odio ut laboriosam culpa.,2.56,2022-05-23
+David Bomba,perspiciatis,Quam deserunt temporibus laboriosam ea consequatur explicabo omnis. Exercitationem atque autem ut. Sit dolorum eius ut dolorem odit dolorem debitis.,1.67,2022-05-24
+David Bomba,animi,Quia ea atque id quia. Et odio laboriosam delectus dolorem. Fugiat ipsa porro accusantium.,7.91,2022-05-25
+David Bomba,nulla,Minus sit nobis rerum reiciendis. Consectetur modi non qui quisquam omnis culpa. Ut commodi tempora sit iste.,7.29,2022-05-26
+David Bomba,quibusdam,Et et nihil rerum aut vitae. Aut optio optio unde voluptatem. Perspiciatis aut placeat explicabo et ducimus.,7.9,2022-05-27
+David Bomba,excepturi,Quis repudiandae ratione impedit repellat doloremque est. Accusamus minus cupiditate velit. Aliquam explicabo magnam eaque velit quibusdam et quisquam. Eos maxime consequatur voluptatem quis doloremque quibusdam.,3.4,2022-05-28
+David Bomba,veritatis,Ut reprehenderit aut aut non quam cupiditate numquam.,6.15,2022-05-29
+David Bomba,omnis,Iusto eum aspernatur temporibus ratione voluptatem ducimus. Repellat rem sed aut cupiditate. Et quasi voluptatibus cumque cupiditate. Velit quidem praesentium quasi est sed est.,9.87,2022-05-30
+David Bomba,voluptatum,Ipsum cupiditate aut officia praesentium aut architecto. Eos omnis ratione sed quam. Sed corporis aut quia dicta autem.,5.64,2022-05-31
+David Bomba,sint,Libero sed dolore suscipit repellat ut libero.,5.69,2022-06-01
+David Bomba,odit,Nesciunt esse explicabo expedita facere repellat nulla. Eligendi iusto quos in culpa. Amet commodi et odit nostrum. Quaerat excepturi non rerum officiis autem ut.,1.37,2022-06-02
+David Bomba,ad,Vel enim sit sed doloribus sit sed. In veritatis sunt autem et aliquid aspernatur. Fugiat deleniti et porro repellat maiores ea.,4.55,2022-06-03
+David Bomba,asperiores,Cum veniam ipsam suscipit eos totam quae. Eaque ducimus odit ut molestiae aut esse.,1.9,2022-06-04
+David Bomba,accusamus,Aliquam alias laborum numquam asperiores. Ut praesentium repellendus ut nostrum. Cumque ut est et nam qui esse hic.,3.8,2022-06-05
+David Bomba,explicabo,Vero eaque quasi officiis modi nihil ad dolor. Sequi facilis assumenda possimus vel fugit inventore voluptatem.,2.21,2022-06-06
+David Bomba,consequuntur,Reprehenderit et aut rerum quos iusto rerum. A delectus eveniet quia expedita.,3.72,2022-06-07
+David Bomba,repellat,Consequatur quis at ut nesciunt quibusdam dicta ut provident. Aperiam dicta dolores id sed non ex sunt.,7.56,2022-06-08
+David Bomba,esse,Aut harum cupiditate quos nihil quis. Cupiditate non non est nesciunt consequatur. Provident est quis porro consequatur et. Illo placeat et quisquam sit nisi veniam commodi.,5.03,2022-06-09
+David Bomba,doloribus,Provident molestias libero dolores sit voluptate quis architecto.,9.91,2022-06-10
+David Bomba,magnam,Voluptas dicta occaecati adipisci autem sunt libero tenetur est. Voluptas quia recusandae est et enim est. Labore fugit vitae qui cumque aut. Illo aperiam aliquid deserunt beatae. Voluptatem tempora tenetur dignissimos et autem qui minus voluptatem.,1.53,2022-06-11
+David Bomba,suscipit,Ullam amet consequuntur itaque. Cupiditate odio facere quis est fuga architecto. Aut placeat quae ut itaque. Voluptatem omnis architecto ipsum qui. Blanditiis nostrum iusto quo nesciunt voluptate. Ut expedita unde ex illum ut dignissimos.,4.43,2022-06-12
+David Bomba,iure,Quo autem voluptas reiciendis temporibus.,4.27,2022-06-13
+David Bomba,modi,Adipisci dolor vel non officia nisi veritatis. Est quo voluptas doloribus quis est sunt. Ducimus minus quia quia est eos maiores earum. Ut placeat iste tempore occaecati.,1.04,2022-06-14
+David Bomba,labore,Doloremque distinctio aperiam voluptas rerum quidem sed.,1.95,2022-06-15
+David Bomba,soluta,Dolore sint similique eos. Harum est ipsa aut voluptas esse culpa. Voluptas voluptatem cumque et aut et quasi tempora.,1.67,2022-06-16
+David Bomba,accusantium,Eos quo voluptatem odit temporibus aut. Reprehenderit sit ducimus expedita nostrum incidunt ut voluptates.,8.62,2022-06-17
+David Bomba,vitae,Enim error dolorem cupiditate voluptate quasi numquam quis. Porro ducimus eos maiores facere.,5.28,2022-06-18
+David Bomba,possimus,Et tempore at sit est repellendus aut illo eum. Ratione aperiam aliquam veritatis rerum est cupiditate. Fuga sit recusandae officiis.,9.28,2022-06-19
+David Bomba,nisi,Animi modi ut perspiciatis temporibus quo. Est officia qui numquam perspiciatis. Provident ut nostrum enim accusantium veniam saepe. Vero est minus aut aliquam.,8.67,2022-06-20
+David Bomba,ratione,Nemo at quo est velit.,5.6,2022-06-21
+David Bomba,illum,Odio illo veritatis dolorem omnis ad. Magni officia est officia voluptate voluptas dolor. Est dolores et tempora corporis est at ullam. Illum amet ipsa quia et omnis esse quaerat. Fugiat unde magni quod saepe. Incidunt assumenda neque voluptatem.,6.01,2022-06-22
+David Bomba,libero,Reiciendis voluptatem sed vitae sapiente pariatur alias. Voluptates velit libero voluptatum minima aperiam. Magnam natus consequatur voluptatem molestiae iure cum qui. Nisi tempore aperiam porro.,9.16,2022-06-23
+David Bomba,alias,A fugiat id aliquam officia. Eum eum tempore rerum officiis modi sit. Non impedit incidunt et commodi quia harum nesciunt.,1.92,2022-06-24
+David Bomba,occaecati,Aspernatur aut temporibus voluptas. Cumque sint sint voluptatibus.,5.95,2022-06-25
+David Bomba,1,100,100,2022-06-26
+David Bomba,ab,Sed perferendis modi velit minima placeat reprehenderit. Voluptatum ullam vel officia quia et esse quaerat. Sit aperiam minus dolor. Quasi earum temporibus est aspernatur.,6.86,2022-06-27
+David Bomba,amet,Nihil consequatur et deserunt nihil et.,7.82,2022-06-28
+David Bomba,:MONTH,hey there :MONTH+1 and :YEAR+1,0,2022-06-29
diff --git a/tests/Feature/Import/invoice.csv b/tests/Feature/Import/invoice.csv
index f5a1f20affb4..629bdd93a083 100644
--- a/tests/Feature/Import/invoice.csv
+++ b/tests/Feature/Import/invoice.csv
@@ -403,5 +403,3 @@ Ms. Alena Cassin,golden.green@example.org,777,$17.94,$12.76,,Partial,2019-12-05,
 Ms. Alena Cassin,golden.green@example.org,778,$14.88,$7.97,,Partial,2020-02-27,2019-11-29,,$0.00,,,,sed,In nulla eos ipsam molestias. Perferendis sunt et consequuntur qui ex nesciunt et. Amet animi aut dicta qui facilis voluptatem.,4.96,3
 Ms. Alena Cassin,golden.green@example.org,779,$49.00,$28.77,,Partial,2019-10-25,2020-01-10,,$0.00,,,,facere,Reiciendis voluptas unde et ut. Omnis dolorum modi facere exercitationem fuga. Eum recusandae ut ea qui autem.,4.9,10
 Ms. Alena Cassin,golden.green@example.org,780,$51.03,$51.03,,Paid,2019-12-01,2020-01-14,,$0.00,,,,voluptas,Saepe eius placeat sit mollitia magni. Porro ipsam praesentium tempora iste. Suscipit dolorem omnis eligendi corrupti est nobis.,7.29,7
-Ludwig Krajcik DVM,brook59@example.org,801,$-400.00,$0.00,,Sent,2020-01-22,2020-01-29,,$0.00,,,,1,10,1,-200
-Ludwig Krajcik DVM,brook59@example.org,801,$-400.00,$0.00,,Sent,2020-01-22,2020-01-29,,$0.00,,,,2,5,1,-200
diff --git a/tests/Feature/Inventory/InventoryManagementTest.php b/tests/Feature/Inventory/InventoryManagementTest.php
index 567a2bf917b4..a97ae0e6e025 100644
--- a/tests/Feature/Inventory/InventoryManagementTest.php
+++ b/tests/Feature/Inventory/InventoryManagementTest.php
@@ -6,18 +6,20 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature\Inventory;
 
+use App\DataMapper\InvoiceItem;
+use App\Models\Invoice;
+use App\Models\Product;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Routing\Middleware\ThrottleRequests;
+use Illuminate\Support\Str;
 use Tests\MockAccountData;
 use Tests\TestCase;
-use App\Models\Product;
-use App\Models\Invoice;
-use App\DataMapper\InvoiceItem;
-use Illuminate\Support\Str;
+
 /**
  * @test
  */
@@ -26,7 +28,7 @@ class InventoryManagementTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -39,25 +41,23 @@ class InventoryManagementTest extends TestCase
 
     public function testInventoryMovements()
     {
-
         $product = Product::factory()->create([
             'user_id' => $this->user->id,
             'company_id' => $this->company->id,
             'in_stock_quantity' => 100,
             'stock_notification' => true,
-            'stock_notification_threshold' => 99
+            'stock_notification_threshold' => 99,
         ]);
 
         $invoice = Invoice::factory()->create([
-            'user_id' => $this->user->id, 
-            'company_id' => $this->company->id, 
-            'client_id' => $this->client->id
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'client_id' => $this->client->id,
         ]);
 
         $invoice->company->track_inventory = true;
         $invoice->push();
 
-
         $invoice_item = new InvoiceItem;
         $invoice_item->type_id = 1;
         $invoice_item->product_key = $product->product_key;
@@ -75,16 +75,15 @@ class InventoryManagementTest extends TestCase
         $invoice_array['client_id'] = $this->client->hashed_id;
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/invoices/', $invoice_array)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/invoices/', $invoice_array)
             ->assertStatus(200);
 
         $product = $product->refresh();
 
         $this->assertEquals(90, $product->in_stock_quantity);
 
-
         // $arr = $response->json();
         // $invoice_hashed_id = $arr['data']['id'];
 
diff --git a/tests/Feature/InvitationTest.php b/tests/Feature/InvitationTest.php
index f46edcf0a1db..193baae2c05e 100644
--- a/tests/Feature/InvitationTest.php
+++ b/tests/Feature/InvitationTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\DataMapper\CompanySettings;
@@ -36,7 +37,7 @@ class InvitationTest extends TestCase
     use DatabaseTransactions;
     // use RefreshDatabase;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
     }
@@ -45,8 +46,8 @@ class InvitationTest extends TestCase
     {
         $account = Account::factory()->create();
         $company = Company::factory()->create([
-                    'account_id' => $account->id,
-                ]);
+            'account_id' => $account->id,
+        ]);
 
         $account->default_company_id = $company->id;
         $account->save();
@@ -61,13 +62,13 @@ class InvitationTest extends TestCase
         }
 
         $userPermissions = collect([
-                                    'view_invoice',
-                                    'view_client',
-                                    'edit_client',
-                                    'edit_invoice',
-                                    'create_invoice',
-                                    'create_client',
-                                ]);
+            'view_invoice',
+            'view_client',
+            'edit_client',
+            'edit_invoice',
+            'create_invoice',
+            'create_client',
+        ]);
 
         $userSettings = DefaultSettings::userSettings();
 
diff --git a/tests/Feature/InvoiceAmountPaymentTest.php b/tests/Feature/InvoiceAmountPaymentTest.php
index e971f23e3803..c9d7b1e1b599 100644
--- a/tests/Feature/InvoiceAmountPaymentTest.php
+++ b/tests/Feature/InvoiceAmountPaymentTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Factory\InvoiceItemFactory;
@@ -26,7 +27,7 @@ class InvoiceAmountPaymentTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -39,15 +40,14 @@ class InvoiceAmountPaymentTest extends TestCase
 
     public function testPaymentAmountForInvoice()
     {
-        
         $data = [
             'name' => 'A Nice Client',
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/clients', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/clients', $data);
 
         $response->assertStatus(200);
 
@@ -55,7 +55,7 @@ class InvoiceAmountPaymentTest extends TestCase
 
         $client_hash_id = $arr['data']['id'];
         $client = Client::find($this->decodePrimaryKey($client_hash_id));
-        
+
         $this->assertEquals($client->balance, 0);
         $this->assertEquals($client->paid_to_date, 0);
         //create new invoice.
@@ -66,13 +66,13 @@ class InvoiceAmountPaymentTest extends TestCase
         $item->quantity = 1;
         $item->cost = 10;
 
-        $line_items[] = (array)$item;
+        $line_items[] = (array) $item;
 
         $item = InvoiceItemFactory::create();
         $item->quantity = 1;
         $item->cost = 10;
 
-        $line_items[] = (array)$item;
+        $line_items[] = (array) $item;
 
         $invoice = [
             'status_id' => 1,
@@ -87,20 +87,20 @@ class InvoiceAmountPaymentTest extends TestCase
             'custom_value3' => 0,
             'custom_value4' => 0,
             'client_id' => $client_hash_id,
-            'line_items' => (array)$line_items,
+            'line_items' => (array) $line_items,
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/invoices?amount_paid=10', $invoice)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/invoices?amount_paid=10', $invoice)
             ->assertStatus(200);
 
         $arr = $response->json();
-    
+
         $invoice_one_hashed_id = $arr['data']['id'];
 
-        $invoice =  Invoice::find($this->decodePrimaryKey($invoice_one_hashed_id));
+        $invoice = Invoice::find($this->decodePrimaryKey($invoice_one_hashed_id));
 
         $this->assertEquals(10, $invoice->balance);
         $this->assertTrue($invoice->payments()->exists());
@@ -109,20 +109,18 @@ class InvoiceAmountPaymentTest extends TestCase
 
         $this->assertEquals(10, $payment->applied);
         $this->assertEquals(10, $payment->amount);
-        
     }
 
     public function testMarkPaidRemovesUnpaidGatewayFees()
     {
-
         $data = [
             'name' => 'A Nice Client',
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/clients', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/clients', $data);
 
         $response->assertStatus(200);
 
@@ -130,7 +128,7 @@ class InvoiceAmountPaymentTest extends TestCase
 
         $client_hash_id = $arr['data']['id'];
         $client = Client::find($this->decodePrimaryKey($client_hash_id));
-        
+
         $this->assertEquals($client->balance, 0);
         $this->assertEquals($client->paid_to_date, 0);
         //create new invoice.
@@ -141,20 +139,20 @@ class InvoiceAmountPaymentTest extends TestCase
         $item->quantity = 1;
         $item->cost = 10;
 
-        $line_items[] = (array)$item;
+        $line_items[] = (array) $item;
 
         $item = InvoiceItemFactory::create();
         $item->quantity = 1;
         $item->cost = 10;
 
-        $line_items[] = (array)$item;
+        $line_items[] = (array) $item;
 
         $item = InvoiceItemFactory::create();
         $item->quantity = 1;
         $item->cost = 5;
-        $item->type_id = "3";
+        $item->type_id = '3';
 
-        $line_items[] = (array)$item;
+        $line_items[] = (array) $item;
 
         $invoice = [
             'status_id' => 1,
@@ -169,17 +167,17 @@ class InvoiceAmountPaymentTest extends TestCase
             'custom_value3' => 0,
             'custom_value4' => 0,
             'client_id' => $client_hash_id,
-            'line_items' => (array)$line_items,
+            'line_items' => (array) $line_items,
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/invoices?mark_sent=true', $invoice)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/invoices?mark_sent=true', $invoice)
             ->assertStatus(200);
 
         $arr = $response->json();
-    
+
         $invoice_one_hashed_id = $arr['data']['id'];
 
         $invoice = Invoice::find($this->decodePrimaryKey($invoice_one_hashed_id));
@@ -193,8 +191,5 @@ class InvoiceAmountPaymentTest extends TestCase
 
         $this->assertEquals(20, $invoice->amount);
         $this->assertEquals(0, $invoice->balance);
-
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/tests/Feature/InvoiceEmailTest.php b/tests/Feature/InvoiceEmailTest.php
index 69a80930d66d..f1387f9bf5d5 100644
--- a/tests/Feature/InvoiceEmailTest.php
+++ b/tests/Feature/InvoiceEmailTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Jobs\Entity\EmailEntity;
@@ -28,7 +29,7 @@ class InvoiceEmailTest extends TestCase
     use DatabaseTransactions;
     use GeneratesCounter;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -60,7 +61,7 @@ class InvoiceEmailTest extends TestCase
 
         $this->invoice->invitations->each(function ($invitation) {
             if ($invitation->contact->send_email && $invitation->contact->email) {
-                EmailEntity::dispatchNow($invitation, $invitation->company);
+                EmailEntity::dispatch($invitation, $invitation->company);
 
                 $this->expectsJobs(EmailEntity::class);
             }
@@ -88,7 +89,7 @@ class InvoiceEmailTest extends TestCase
 
         $this->invoice->invitations->each(function ($invitation) {
             if ($invitation->contact->send_email && $invitation->contact->email) {
-                EmailEntity::dispatchNow($invitation, $invitation->company);
+                EmailEntity::dispatch($invitation, $invitation->company);
 
                 $this->expectsJobs(EmailEntity::class);
             }
@@ -116,7 +117,7 @@ class InvoiceEmailTest extends TestCase
 
         $this->invoice->invitations->each(function ($invitation) {
             if ($invitation->contact->send_email && $invitation->contact->email) {
-                EmailEntity::dispatchNow($invitation, $invitation->company);
+                EmailEntity::dispatch($invitation, $invitation->company);
 
                 $this->expectsJobs(EmailEntity::class);
             }
@@ -139,7 +140,7 @@ class InvoiceEmailTest extends TestCase
 
         $this->invoice->invitations->each(function ($invitation) {
             if ($invitation->contact->send_email && $invitation->contact->email) {
-                EmailEntity::dispatchNow($invitation, $invitation->company);
+                EmailEntity::dispatch($invitation, $invitation->company);
 
                 $this->expectsJobs(EmailEntity::class);
             }
diff --git a/tests/Feature/InvoiceLinkTasksTest.php b/tests/Feature/InvoiceLinkTasksTest.php
index 31b7985249ab..72a084fe93b3 100644
--- a/tests/Feature/InvoiceLinkTasksTest.php
+++ b/tests/Feature/InvoiceLinkTasksTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Utils\Traits\MakesHash;
@@ -26,7 +27,7 @@ class InvoiceLinkTasksTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Feature/InvoiceTest.php b/tests/Feature/InvoiceTest.php
index 3cea664ea69a..5e582bf5ce1e 100644
--- a/tests/Feature/InvoiceTest.php
+++ b/tests/Feature/InvoiceTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Helpers\Invoice\InvoiceSum;
@@ -32,7 +33,7 @@ class InvoiceTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -47,8 +48,7 @@ class InvoiceTest extends TestCase
 
     public function testMarkingDeletedInvoiceAsSent()
     {
-
-     Client::factory()->create(['user_id' => $this->user->id, 'company_id' => $this->company->id])->each(function ($c) {
+        Client::factory()->create(['user_id' => $this->user->id, 'company_id' => $this->company->id])->each(function ($c) {
             ClientContact::factory()->create([
                 'user_id' => $this->user->id,
                 'client_id' => $c->id,
@@ -87,10 +87,9 @@ class InvoiceTest extends TestCase
         $this->assertEquals(10, $invoice->amount);
         $this->assertEquals(0, $invoice->balance);
 
-        $invoice_repository  = new InvoiceRepository();
+        $invoice_repository = new InvoiceRepository();
         $invoice = $invoice_repository->delete($invoice);
 
-
         $this->assertEquals(10, $invoice->amount);
         $this->assertEquals(0, $invoice->balance);
         $this->assertTrue($invoice->is_deleted);
@@ -98,7 +97,6 @@ class InvoiceTest extends TestCase
         $invoice->service()->markSent()->save();
 
         $this->assertEquals(0, $invoice->balance);
-
     }
 
     public function testInvoiceList()
@@ -123,9 +121,9 @@ class InvoiceTest extends TestCase
         Invoice::factory()->create(['user_id' => $this->user->id, 'company_id' => $this->company->id, 'client_id' => $this->client->id]);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/invoices');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/invoices');
 
         $response->assertStatus(200);
     }
@@ -133,16 +131,16 @@ class InvoiceTest extends TestCase
     public function testInvoiceRESTEndPoints()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/invoices/'.$this->encodePrimaryKey($this->invoice->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/invoices/'.$this->encodePrimaryKey($this->invoice->id));
 
         $response->assertStatus(200);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/invoices/'.$this->encodePrimaryKey($this->invoice->id).'/edit');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/invoices/'.$this->encodePrimaryKey($this->invoice->id).'/edit');
 
         $response->assertStatus(200);
 
@@ -153,9 +151,9 @@ class InvoiceTest extends TestCase
         $this->assertNotNull($this->invoice);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/invoices/'.$this->encodePrimaryKey($this->invoice->id), $invoice_update)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/invoices/'.$this->encodePrimaryKey($this->invoice->id), $invoice_update)
             ->assertStatus(200);
     }
 
@@ -178,33 +176,32 @@ class InvoiceTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/invoices/', $invoice)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/invoices/', $invoice)
             ->assertStatus(200);
 
-
         $arr = $response->json();
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/invoices/'.$arr['data']['id'], $invoice)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/invoices/'.$arr['data']['id'], $invoice)
             ->assertStatus(200);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/invoices/', $invoice)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/invoices/', $invoice)
             ->assertStatus(302);
     }
 
     public function testDeleteInvoice()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->delete('/api/v1/invoices/'.$this->encodePrimaryKey($this->invoice->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->delete('/api/v1/invoices/'.$this->encodePrimaryKey($this->invoice->id));
 
         $response->assertStatus(200);
     }
@@ -255,33 +252,33 @@ class InvoiceTest extends TestCase
         }
 
         $data = [
-                'client_id' => $this->client->hashed_id,
-                'number' => 'style',
-            ];
+            'client_id' => $this->client->hashed_id,
+            'number' => 'style',
+        ];
 
         /* test number passed validation*/
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/invoices/'.$arr['data']['id'], $data)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/invoices/'.$arr['data']['id'], $data)
             ->assertStatus(200);
 
         $data = [
-                'client_id' => $this->client->hashed_id,
-                'number' => 'style',
-            ];
+            'client_id' => $this->client->hashed_id,
+            'number' => 'style',
+        ];
 
         /* Make sure we can UPDATE using the same number*/
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/invoices/'.$arr['data']['id'], $data)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/invoices/'.$arr['data']['id'], $data)
             ->assertStatus(200);
     }
 
     public function testClientedDeletedAttemptingToCreateInvoice()
     {
-                /* Test fire new invoice */
+        /* Test fire new invoice */
         $data = [
             'client_id' => $this->client->hashed_id,
             'number' => 'dude',
diff --git a/tests/Feature/LoadTest.php b/tests/Feature/LoadTest.php
index b5545f610ef4..38b5c15fa6f2 100644
--- a/tests/Feature/LoadTest.php
+++ b/tests/Feature/LoadTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\DataMapper\CompanySettings;
@@ -44,13 +45,12 @@ use Tests\TestCase;
  */
 class LoadTest extends TestCase
 {
-
     use MakesHash;
     use GeneratesCounter;
 
     public int $count = 1;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -59,7 +59,6 @@ class LoadTest extends TestCase
 
     public function testLoad()
     {
-
         $account = Account::factory()->create();
         $company = Company::factory()->create([
             'account_id' => $account->id,
@@ -95,34 +94,28 @@ class LoadTest extends TestCase
             'is_admin' => 1,
             'is_locked' => 0,
             'notifications' => CompanySettings::notificationDefaults(),
-           // 'permissions' => '',
+            // 'permissions' => '',
             'settings' => null,
         ]);
 
-        dispatch(function () use($user, $company){
-
+        dispatch(function () use ($user, $company) {
             Product::factory()->count(500)->create([
-                    'user_id' => $user->id,
-                    'company_id' => $company->id,
-                ]);
-
+                'user_id' => $user->id,
+                'company_id' => $company->id,
+            ]);
         });
 
         for ($x = 0; $x < $this->count * 100; $x++) {
             $z = $x + 1;
 
             $this->createClient($company, $user);
-
         }
 
-            do{
-                sleep(3);
-            }
-            while($company->clients()->count() != 500);
-
-
-        for ($x = 0; $x < $this->count * 100 ; $x++) {
+        do {
+            sleep(3);
+        } while ($company->clients()->count() != 500);
 
+        for ($x = 0; $x < $this->count * 100; $x++) {
             $client = $company->clients->random();
 
             $this->createInvoice($client);
@@ -151,127 +144,109 @@ class LoadTest extends TestCase
 
             $this->createProject($client);
         }
-
     }
 
-
     private function createClient($company, $user)
     {
-
-
-    dispatch(function () use ($company, $user){
-
-        $client = Client::factory()->create([
+        dispatch(function () use ($company, $user) {
+            $client = Client::factory()->create([
                 'user_id' => $user->id,
                 'company_id' => $company->id,
                 'country_id' => 840,
             ]);
 
-
-        Document::factory()->count(2)->create([
+            Document::factory()->count(2)->create([
                 'user_id' => $user->id,
                 'company_id' => $company->id,
                 'documentable_type' => Client::class,
-                'documentable_id' => $client->id
+                'documentable_id' => $client->id,
             ]);
 
-        ClientContact::factory()->create([
-                    'user_id' => $user->id,
-                    'client_id' => $client->id,
-                    'company_id' => $company->id,
-                    'is_primary' => 1,
-                ]);
+            ClientContact::factory()->create([
+                'user_id' => $user->id,
+                'client_id' => $client->id,
+                'company_id' => $company->id,
+                'is_primary' => 1,
+            ]);
 
-        ClientContact::factory()->count(2)->create([
-                    'user_id' => $user->id,
-                    'client_id' => $client->id,
-                    'company_id' => $company->id,
-                ]);
+            ClientContact::factory()->count(2)->create([
+                'user_id' => $user->id,
+                'client_id' => $client->id,
+                'company_id' => $company->id,
+            ]);
 
-        $client->number = Str::random(28);
-
-        $settings = $client->settings;
-        $settings->currency_id = (string) rand(1, 79);
-        $client->settings = $settings;
-        $client->save();
-
-    });
+            $client->number = Str::random(28);
 
+            $settings = $client->settings;
+            $settings->currency_id = (string) rand(1, 79);
+            $client->settings = $settings;
+            $client->save();
+        });
     }
 
     private function createExpense($client)
     {
-        dispatch(function () use($client){
+        dispatch(function () use ($client) {
             Expense::factory()->count(rand(1, 5))->create([
-                    'user_id' => $client->user->id,
-                    'client_id' => $client->id,
-                    'company_id' => $client->company->id,
-                ]);
+                'user_id' => $client->user->id,
+                'client_id' => $client->id,
+                'company_id' => $client->company->id,
+            ]);
         });
     }
 
     private function createVendor($client)
     {
-       
-        dispatch(function () use($client){
-       
-        $vendor = Vendor::factory()->create([
+        dispatch(function () use ($client) {
+            $vendor = Vendor::factory()->create([
                 'user_id' => $client->user->id,
                 'company_id' => $client->company->id,
             ]);
 
-        Document::factory()->count(2)->create([
+            Document::factory()->count(2)->create([
                 'user_id' => $client->user->id,
                 'company_id' => $client->company_id,
                 'documentable_type' => Vendor::class,
-                'documentable_id' => $vendor->id
+                'documentable_id' => $vendor->id,
             ]);
 
-        VendorContact::factory()->create([
+            VendorContact::factory()->create([
                 'user_id' => $client->user->id,
                 'vendor_id' => $vendor->id,
                 'company_id' => $client->company->id,
                 'is_primary' => 1,
             ]);
 
-        VendorContact::factory()->count(rand(1, 500))->create([
+            VendorContact::factory()->count(rand(1, 500))->create([
                 'user_id' => $client->user->id,
                 'vendor_id' => $vendor->id,
                 'company_id' => $client->company->id,
                 'is_primary' => 0,
             ]);
-
-    });
-
+        });
     }
 
     private function createTask($client)
     {
-        
-        dispatch(function () use($client){
-       
-        $vendor = Task::factory()->create([
+        dispatch(function () use ($client) {
+            $vendor = Task::factory()->create([
                 'user_id' => $client->user->id,
                 'company_id' => $client->company->id,
             ]);
 
-
-        Document::factory()->count(5)->create([
+            Document::factory()->count(5)->create([
                 'user_id' => $client->user->id,
                 'company_id' => $client->company_id,
                 'documentable_type' => Task::class,
-                'documentable_id' => $vendor->id
+                'documentable_id' => $vendor->id,
             ]);
-
         });
     }
 
     private function createProject($client)
     {
-        
-        dispatch(function () use($client){
-       
-        $vendor = Project::factory()->create([
+        dispatch(function () use ($client) {
+            $vendor = Project::factory()->create([
                 'user_id' => $client->user->id,
                 'company_id' => $client->company->id,
             ]);
@@ -280,16 +255,13 @@ class LoadTest extends TestCase
                 'user_id' => $client->user->id,
                 'company_id' => $client->company_id,
                 'documentable_type' => Project::class,
-                'documentable_id' => $vendor->id
+                'documentable_id' => $vendor->id,
             ]);
-
         });
-
     }
 
     private function createInvoice($client)
     {
-
         $faker = \Faker\Factory::create();
 
         $invoice = InvoiceFactory::create($client->company->id, $client->user->id); //stub the company and user_id
@@ -315,7 +287,7 @@ class LoadTest extends TestCase
             $invoice->tax_rate3 = 5;
         }
 
-        $invoice->custom_value1 = $faker->date;
+        $invoice->custom_value1 = $faker->date();
         $invoice->custom_value2 = rand(0, 1) ? 'yes' : 'no';
 
         $invoice->save();
@@ -337,18 +309,14 @@ class LoadTest extends TestCase
             $invoice = $invoice->service()->markPaid()->save();
         }
 
-            Document::factory()->count(5)->create([
-                'user_id' => $invoice->user->id,
-                'company_id' => $invoice->company_id,
-                'documentable_type' => Invoice::class,
-                'documentable_id' => $invoice->id
-            ]);
-
-        
-
+        Document::factory()->count(5)->create([
+            'user_id' => $invoice->user->id,
+            'company_id' => $invoice->company_id,
+            'documentable_type' => Invoice::class,
+            'documentable_id' => $invoice->id,
+        ]);
     }
 
-
     private function createCredit($client)
     {
         $faker = \Faker\Factory::create();
diff --git a/tests/Feature/LoginTest.php b/tests/Feature/LoginTest.php
index 077cfa50655b..54ae95593cef 100644
--- a/tests/Feature/LoginTest.php
+++ b/tests/Feature/LoginTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\DataMapper\CompanySettings;
@@ -28,7 +29,7 @@ class LoginTest extends TestCase
 {
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
         Session::start();
@@ -187,7 +188,7 @@ class LoginTest extends TestCase
 
         try {
             $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-SECRET' => config('ninja.api_secret'),
             ])->post('/api/v1/login', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
@@ -197,7 +198,7 @@ class LoginTest extends TestCase
         $arr = $response->json();
 
         // nlog(print_r($arr, 1));
-        
+
         $response->assertStatus(200);
     }
 }
diff --git a/tests/Feature/MigrationTest.php b/tests/Feature/MigrationTest.php
index 070f67966d6e..e6efa9082c87 100644
--- a/tests/Feature/MigrationTest.php
+++ b/tests/Feature/MigrationTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Models\Client;
@@ -28,7 +29,7 @@ class MigrationTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Feature/MultiPaymentDeleteTest.php b/tests/Feature/MultiPaymentDeleteTest.php
index 6d914a80c2a6..ee42d5fb4bcb 100644
--- a/tests/Feature/MultiPaymentDeleteTest.php
+++ b/tests/Feature/MultiPaymentDeleteTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Factory\CompanyTokenFactory;
@@ -36,20 +37,19 @@ class MultiPaymentDeleteTest extends TestCase
 
     private $faker;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
         $this->faker = \Faker\Factory::create();
-
     }
 
     public function testComplexRefundDeleteScenario()
     {
         $account = Account::factory()->create();
         $company = Company::factory()->create([
-                    'account_id' => $account->id,
-                ]);
+            'account_id' => $account->id,
+        ]);
 
         $account->default_company_id = $company->id;
         $account->save();
@@ -57,7 +57,7 @@ class MultiPaymentDeleteTest extends TestCase
         $user = User::factory()->create([
             'account_id' => $account->id,
             'confirmation_code' => '11',
-            'email' => $this->faker->unique()->safeEmail,
+            'email' => $this->faker->unique()->safeEmail(),
         ]);
 
         $cu = CompanyUserFactory::create($user->id, $company->id, $account->id);
@@ -75,9 +75,9 @@ class MultiPaymentDeleteTest extends TestCase
         $token->save();
 
         $client = Client::factory()->create([
-            'user_id' => $user->id, 
+            'user_id' => $user->id,
             'company_id' => $company->id,
-        ]);  
+        ]);
 
         ClientContact::factory()->create([
             'user_id' => $user->id,
@@ -96,10 +96,10 @@ class MultiPaymentDeleteTest extends TestCase
             'user_id' => $user->id,
             'client_id' => $client->id,
             'company_id' => $company->id,
-            'number' => (string)$this->faker->randomNumber(6),
-        ]);     
+            'number' => (string) $this->faker->randomNumber(6),
+        ]);
 
-        $invoice = InvoiceFactory::create($company->id,$user->id);
+        $invoice = InvoiceFactory::create($company->id, $user->id);
         $invoice->client_id = $client->id;
         $invoice->status_id = Invoice::STATUS_DRAFT;
 
@@ -119,7 +119,7 @@ class MultiPaymentDeleteTest extends TestCase
         $this->assertEquals(0, $client->balance);
         $this->assertEquals(0, $client->paid_to_date);
         $this->assertEquals(0, $invoice->balance);
-//mark sent
+        //mark sent
 
         $invoice = $invoice->service()->markSent()->createInvitations()->save();
 
@@ -130,17 +130,17 @@ class MultiPaymentDeleteTest extends TestCase
         $this->assertEquals(0, $invoice->client->fresh()->paid_to_date);
         $this->assertEquals(325, $invoice->client->balance);
 
-//payment 163
+        //payment 163
 //
         $data = [
             'amount' => 163.0,
             'client_id' => $this->encodePrimaryKey($client->id),
             'invoices' => [
-                    [
-                        'invoice_id' => $this->encodePrimaryKey($invoice->id),
-                        'amount' => 163,
-                    ],
+                [
+                    'invoice_id' => $this->encodePrimaryKey($invoice->id),
+                    'amount' => 163,
                 ],
+            ],
             'date' => '2019/12/12',
         ];
 
@@ -153,21 +153,20 @@ class MultiPaymentDeleteTest extends TestCase
         $payment_id = $arr['data']['id'];
         $payment_1 = Payment::whereId($this->decodePrimaryKey($payment_id))->first();
 
-//payment 162
+        //payment 162
         $this->assertEquals(162, $invoice->fresh()->balance);
         $this->assertEquals(162, $invoice->client->fresh()->balance);
         $this->assertEquals(163, $invoice->client->fresh()->paid_to_date);
 
-
         $data = [
             'amount' => 162.0,
             'client_id' => $this->encodePrimaryKey($client->id),
             'invoices' => [
-                    [
-                        'invoice_id' => $this->encodePrimaryKey($invoice->id),
-                        'amount' => 162,
-                    ],
+                [
+                    'invoice_id' => $this->encodePrimaryKey($invoice->id),
+                    'amount' => 162,
                 ],
+            ],
             'date' => '2019/12/12',
         ];
 
@@ -184,8 +183,7 @@ class MultiPaymentDeleteTest extends TestCase
         $this->assertEquals(0, $invoice->client->fresh()->balance);
         $this->assertEquals(325, $invoice->client->fresh()->paid_to_date);
 
-
-//refund payment 2 by 63 dollars
+        //refund payment 2 by 63 dollars
 
         $data = [
             'id' => $this->encodePrimaryKey($payment_2->id),
@@ -193,80 +191,8 @@ class MultiPaymentDeleteTest extends TestCase
             'date' => '2021/12/12',
             'invoices' => [
                 [
-                'invoice_id' => $invoice->hashed_id,
-                'amount' => 63,
-                ],
-            ],
-        ];
-
-
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $token->token,
-        ])->post('/api/v1/payments/refund', $data);
-
-        $this->assertEquals(63, $invoice->fresh()->balance);
-        $this->assertEquals(63, $invoice->client->fresh()->balance);               
-        $this->assertEquals(262, $invoice->client->fresh()->paid_to_date);
-
-        
-//delete payment 2
-        //
-        $data = [
-            'ids' => [$this->encodePrimaryKey($payment_2->id)],
-        ];
-
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $token->token,
-        ])->post('/api/v1/payments/bulk?action=delete', $data);
-
-        $this->assertEquals(162, $invoice->fresh()->balance);
-        $this->assertEquals(162, $invoice->client->fresh()->balance);   
-        $this->assertEquals(163, $invoice->client->fresh()->paid_to_date);
-
-
-// Pay 162 again and create payment #3
-
-        $data = [
-            'amount' => 162.0,
-            'client_id' => $this->encodePrimaryKey($client->id),
-            'invoices' => [
-                    [
-                        'invoice_id' => $this->encodePrimaryKey($invoice->id),
-                        'amount' => 162,
-                    ],
-                ],
-            'date' => '2019/12/12',
-        ];
-
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $token->token,
-        ])->post('/api/v1/payments/', $data);         
-
-        $arr = $response->json();
-        $payment_id = $arr['data']['id'];
-        $payment_3 = Payment::whereId($this->decodePrimaryKey($payment_id))->first();
-
-        $invoice->fresh();
-        $invoice->client->fresh();
-
-        $this->assertEquals(0, $invoice->fresh()->balance);
-        $this->assertEquals(0, $invoice->client->fresh()->balance);
-        $this->assertEquals(325, $invoice->client->fresh()->paid_to_date);
-
-
-//refund payment 3 by 63
-    
-        $data = [
-            'id' => $this->encodePrimaryKey($payment_3->id),
-            'amount' => 63,
-            'date' => '2021/12/12',
-            'invoices' => [
-                [
-                'invoice_id' => $invoice->hashed_id,
-                'amount' => 63,
+                    'invoice_id' => $invoice->hashed_id,
+                    'amount' => 63,
                 ],
             ],
         ];
@@ -280,35 +206,102 @@ class MultiPaymentDeleteTest extends TestCase
         $this->assertEquals(63, $invoice->client->fresh()->balance);
         $this->assertEquals(262, $invoice->client->fresh()->paid_to_date);
 
-//payment 4 for 63
+        //delete payment 2
+        //
         $data = [
-            'amount' => 63.0,
+            'ids' => [$this->encodePrimaryKey($payment_2->id)],
+        ];
+
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $token->token,
+        ])->post('/api/v1/payments/bulk?action=delete', $data);
+
+        $this->assertEquals(162, $invoice->fresh()->balance);
+        $this->assertEquals(162, $invoice->client->fresh()->balance);
+        $this->assertEquals(163, $invoice->client->fresh()->paid_to_date);
+
+        // Pay 162 again and create payment #3
+
+        $data = [
+            'amount' => 162.0,
             'client_id' => $this->encodePrimaryKey($client->id),
             'invoices' => [
-                    [
-                        'invoice_id' => $this->encodePrimaryKey($invoice->id),
-                        'amount' => 63,
-                    ],
+                [
+                    'invoice_id' => $this->encodePrimaryKey($invoice->id),
+                    'amount' => 162,
                 ],
+            ],
             'date' => '2019/12/12',
         ];
 
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $token->token,
-        ])->post('/api/v1/payments/', $data);         
+        ])->post('/api/v1/payments/', $data);
 
         $arr = $response->json();
         $payment_id = $arr['data']['id'];
-        $payment_4 = Payment::whereId($this->decodePrimaryKey($payment_id))->first();
+        $payment_3 = Payment::whereId($this->decodePrimaryKey($payment_id))->first();
 
+        $invoice->fresh();
+        $invoice->client->fresh();
 
         $this->assertEquals(0, $invoice->fresh()->balance);
         $this->assertEquals(0, $invoice->client->fresh()->balance);
         $this->assertEquals(325, $invoice->client->fresh()->paid_to_date);
 
-// delete payment 3
-// 
+        //refund payment 3 by 63
+
+        $data = [
+            'id' => $this->encodePrimaryKey($payment_3->id),
+            'amount' => 63,
+            'date' => '2021/12/12',
+            'invoices' => [
+                [
+                    'invoice_id' => $invoice->hashed_id,
+                    'amount' => 63,
+                ],
+            ],
+        ];
+
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $token->token,
+        ])->post('/api/v1/payments/refund', $data);
+
+        $this->assertEquals(63, $invoice->fresh()->balance);
+        $this->assertEquals(63, $invoice->client->fresh()->balance);
+        $this->assertEquals(262, $invoice->client->fresh()->paid_to_date);
+
+        //payment 4 for 63
+        $data = [
+            'amount' => 63.0,
+            'client_id' => $this->encodePrimaryKey($client->id),
+            'invoices' => [
+                [
+                    'invoice_id' => $this->encodePrimaryKey($invoice->id),
+                    'amount' => 63,
+                ],
+            ],
+            'date' => '2019/12/12',
+        ];
+
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $token->token,
+        ])->post('/api/v1/payments/', $data);
+
+        $arr = $response->json();
+        $payment_id = $arr['data']['id'];
+        $payment_4 = Payment::whereId($this->decodePrimaryKey($payment_id))->first();
+
+        $this->assertEquals(0, $invoice->fresh()->balance);
+        $this->assertEquals(0, $invoice->client->fresh()->balance);
+        $this->assertEquals(325, $invoice->client->fresh()->paid_to_date);
+
+        // delete payment 3
+//
 
         //
         $data = [
@@ -321,11 +314,10 @@ class MultiPaymentDeleteTest extends TestCase
         ])->post('/api/v1/payments/bulk?action=delete', $data);
 
         $this->assertEquals(63, $invoice->fresh()->balance);
-        $this->assertEquals(63, $invoice->client->fresh()->balance);   
+        $this->assertEquals(63, $invoice->client->fresh()->balance);
         $this->assertEquals(262, $invoice->client->fresh()->paid_to_date);
 
-
-//set discount of 63 to invoice
+        //set discount of 63 to invoice
 
         $invoice = $invoice->fresh();
         $invoice->discount = 63;
@@ -338,27 +330,25 @@ class MultiPaymentDeleteTest extends TestCase
         $invoice->client->service()->updateBalance(-63)->save();
 
         $this->assertEquals(0, $invoice->fresh()->balance);
-        $this->assertEquals(0, $invoice->client->fresh()->balance);  
+        $this->assertEquals(0, $invoice->client->fresh()->balance);
         $this->assertEquals(262, $invoice->client->fresh()->paid_to_date);
 
-
-//now delete the invoice
+        //now delete the invoice
 
         $data = [
             'ids' => [$invoice->hashed_id],
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $token->token,
-            ])->post('/api/v1/invoices/bulk?action=delete', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $token->token,
+        ])->post('/api/v1/invoices/bulk?action=delete', $data);
 
         $this->assertEquals(0, $invoice->fresh()->balance);
-        $this->assertEquals(0, $invoice->client->fresh()->balance);  
+        $this->assertEquals(0, $invoice->client->fresh()->balance);
         $this->assertEquals(0, $invoice->client->fresh()->paid_to_date);
 
-
-//Delete payment 4 which is for $162
+        //Delete payment 4 which is for $162
         $data = [
             'ids' => [$this->encodePrimaryKey($payment_1->id)],
         ];
@@ -369,8 +359,7 @@ class MultiPaymentDeleteTest extends TestCase
         ])->post('/api/v1/payments/bulk?action=delete', $data);
 
         $this->assertEquals(0, $invoice->fresh()->balance);
-        $this->assertEquals(0, $invoice->client->fresh()->balance);  
+        $this->assertEquals(0, $invoice->client->fresh()->balance);
         $this->assertEquals(0, $invoice->client->fresh()->paid_to_date);
-
     }
 }
diff --git a/tests/Feature/Ninja/PlanTest.php b/tests/Feature/Ninja/PlanTest.php
index 85d9fa4be6a3..1253166cc250 100644
--- a/tests/Feature/Ninja/PlanTest.php
+++ b/tests/Feature/Ninja/PlanTest.php
@@ -6,20 +6,21 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature\Ninja;
 
 use App\Factory\SubscriptionFactory;
 use App\Models\Account;
 use App\Models\RecurringInvoice;
 use App\Utils\Traits\MakesHash;
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Session;
 use Tests\MockAccountData;
 use Tests\TestCase;
-use Carbon\Carbon;
 
 /**
  * @test
@@ -30,7 +31,7 @@ class PlanTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -51,9 +52,9 @@ class PlanTest extends TestCase
 
         $this->account->trial_plan = 'enterprise';
         $this->account->trial_started = now();
-        $this->account->trial_duration = 60*60*24*31;
+        $this->account->trial_duration = 60 * 60 * 24 * 31;
         $this->account->save();
-    
+
         $this->assertFalse($this->account->hasFeature(Account::FEATURE_USERS));
 
         $this->account->trial_plan = 'pro';
@@ -61,16 +62,15 @@ class PlanTest extends TestCase
 
         $this->assertFalse($this->account->hasFeature(Account::FEATURE_USERS));
         $this->assertTrue($this->account->hasFeature(Account::FEATURE_CUSTOM_URL));
-
     }
 
     public function testTrialFilter()
     {
-        $plans = collect(['trial_pro','trial_enterprise','no_freebies']);
+        $plans = collect(['trial_pro', 'trial_enterprise', 'no_freebies']);
 
-        $filtered_plans = $plans->filter(function ($plan){
-                                return strpos($plan, 'trial_') !== false;
-                            });
+        $filtered_plans = $plans->filter(function ($plan) {
+            return strpos($plan, 'trial_') !== false;
+        });
 
         $this->assertEquals($filtered_plans->count(), 2);
     }
@@ -87,5 +87,4 @@ class PlanTest extends TestCase
 
         $this->assertEquals($date->addMonthNoOverflow()->startOfDay(), $next_date->startOfDay());
     }
-
 }
diff --git a/tests/Feature/PaymentTermsApiTest.php b/tests/Feature/PaymentTermsApiTest.php
index 5dc53f0e0401..358d9cbd9274 100644
--- a/tests/Feature/PaymentTermsApiTest.php
+++ b/tests/Feature/PaymentTermsApiTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Factory\PaymentTermFactory;
@@ -30,7 +31,7 @@ class PaymentTermsApiTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -50,20 +51,19 @@ class PaymentTermsApiTest extends TestCase
     public function testPaymentTermsGet()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/payment_terms');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/payment_terms');
 
         $response->assertStatus(200);
     }
 
-
     public function testPaymentTermsGetStatusActive()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/payment_terms?status=active');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/payment_terms?status=active');
 
         $response->assertStatus(200);
     }
@@ -71,9 +71,9 @@ class PaymentTermsApiTest extends TestCase
     public function testPaymentTermsGetStatusArchived()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/payment_terms?status=archived');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/payment_terms?status=archived');
 
         $response->assertStatus(200);
     }
@@ -81,13 +81,13 @@ class PaymentTermsApiTest extends TestCase
     public function testPaymentTermsGetStatusDeleted()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/payment_terms?status=deleted');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/payment_terms?status=deleted');
 
         $response->assertStatus(200);
     }
-    
+
     public function testPostPaymentTerm()
     {
         $response = $this->withHeaders([
diff --git a/tests/Feature/PaymentTest.php b/tests/Feature/PaymentTest.php
index 3b5c1eee1e53..a2a9a4d5c49c 100644
--- a/tests/Feature/PaymentTest.php
+++ b/tests/Feature/PaymentTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\DataMapper\ClientSettings;
@@ -43,7 +44,7 @@ class PaymentTest extends TestCase
     use MockAccountData;
     use WithoutEvents;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -85,9 +86,9 @@ class PaymentTest extends TestCase
         );
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/payments');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/payments');
 
         $response->assertStatus(200);
     }
@@ -99,25 +100,23 @@ class PaymentTest extends TestCase
         $Payment = Payment::all()->last();
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/payments/'.$this->encodePrimaryKey($Payment->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/payments/'.$this->encodePrimaryKey($Payment->id));
 
         $response->assertStatus(200);
 
-
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/payments/'.$this->encodePrimaryKey($Payment->id), $Payment->toArray());
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/payments/'.$this->encodePrimaryKey($Payment->id), $Payment->toArray());
 
         $response->assertStatus(200);
 
-
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/payments/'.$this->encodePrimaryKey($Payment->id).'/edit');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/payments/'.$this->encodePrimaryKey($Payment->id).'/edit');
 
         $response->assertStatus(200);
     }
@@ -144,8 +143,8 @@ class PaymentTest extends TestCase
             'amount' => $this->invoice->amount,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => $this->invoice->amount,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => $this->invoice->amount,
                 ],
             ],
             'date' => '2020/12/11',
@@ -189,8 +188,8 @@ class PaymentTest extends TestCase
             'client_id' => $client->hashed_id,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => $this->invoice->amount,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => $this->invoice->amount,
                 ],
             ],
             'date' => '2020/12/12',
@@ -304,8 +303,8 @@ class PaymentTest extends TestCase
             'client_id' => $client->hashed_id,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => 2.0,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => 2.0,
                 ],
             ],
             'date' => '2019/12/12',
@@ -352,12 +351,12 @@ class PaymentTest extends TestCase
         $client->setRelation('company', $this->company);
         $client->save();
 
-        $client_contact =    ClientContact::factory()->create([
-                'user_id' => $this->user->id,
-                'client_id' => $client->id,
-                'company_id' => $this->company->id,
-                'is_primary' => 1,
-            ]);
+        $client_contact = ClientContact::factory()->create([
+            'user_id' => $this->user->id,
+            'client_id' => $client->id,
+            'company_id' => $this->company->id,
+            'is_primary' => 1,
+        ]);
 
         $client->setRelation('contacts', $client_contact);
 
@@ -386,8 +385,8 @@ class PaymentTest extends TestCase
             'client_id' => $client->hashed_id,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => 6.0,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => 6.0,
                 ],
             ],
             'date' => '2019/12/12',
@@ -429,19 +428,19 @@ class PaymentTest extends TestCase
         $client->save();
 
         ClientContact::factory()->create([
-                'user_id' => $this->user->id,
-                'client_id' => $client->id,
-                'company_id' => $this->company->id,
-                'is_primary' => 1,
-                'send_email' => true,
-            ]);
+            'user_id' => $this->user->id,
+            'client_id' => $client->id,
+            'company_id' => $this->company->id,
+            'is_primary' => 1,
+            'send_email' => true,
+        ]);
 
         ClientContact::factory()->create([
-                'user_id' => $this->user->id,
-                'client_id' => $client->id,
-                'company_id' => $this->company->id,
-                'send_email' => true,
-            ]);
+            'user_id' => $this->user->id,
+            'client_id' => $client->id,
+            'company_id' => $this->company->id,
+            'send_email' => true,
+        ]);
 
         $this->invoice = InvoiceFactory::create($this->company->id, $this->user->id); //stub the company and user_id
         $this->invoice->client_id = $client->id;
@@ -464,17 +463,17 @@ class PaymentTest extends TestCase
             'client_id' => $client->hashed_id,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => 2.0,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => 2.0,
                 ],
             ],
             'date' => '2019/12/12',
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/payments?include=invoices', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/payments?include=invoices', $data);
 
         $arr = $response->json();
         $response->assertStatus(200);
@@ -500,20 +499,20 @@ class PaymentTest extends TestCase
         $client = ClientFactory::create($this->company->id, $this->user->id);
         $client->save();
 
-        $contact =             ClientContact::factory()->create([
-                'user_id' => $this->user->id,
-                'client_id' => $this->client->id,
-                'company_id' => $this->company->id,
-                'is_primary' => 1,
-                'send_email' => true,
-            ]);
+        $contact = ClientContact::factory()->create([
+            'user_id' => $this->user->id,
+            'client_id' => $this->client->id,
+            'company_id' => $this->company->id,
+            'is_primary' => 1,
+            'send_email' => true,
+        ]);
 
         ClientContact::factory()->create([
-                'user_id' => $this->user->id,
-                'client_id' => $this->client->id,
-                'company_id' => $this->company->id,
-                'send_email' => true,
-            ]);
+            'user_id' => $this->user->id,
+            'client_id' => $this->client->id,
+            'company_id' => $this->company->id,
+            'send_email' => true,
+        ]);
 
         $client->setRelation('contact', $contact);
 
@@ -540,8 +539,8 @@ class PaymentTest extends TestCase
             'client_id' => $client->hashed_id,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => 2.0,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => 2.0,
                 ],
             ],
             'date' => '2019/12/12',
@@ -586,8 +585,8 @@ class PaymentTest extends TestCase
             'client_id' => $client->hashed_id,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => 2.0,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => 2.0,
                 ],
             ],
             'date' => '2019/12/12',
@@ -705,11 +704,11 @@ class PaymentTest extends TestCase
             'amount' => 10.0,
             'client_id' => $this->encodePrimaryKey($client->id),
             'invoices' => [
-                    [
-                        'invoice_id' => $this->encodePrimaryKey($this->invoice->id),
-                        'amount' => 10,
-                    ],
+                [
+                    'invoice_id' => $this->encodePrimaryKey($this->invoice->id),
+                    'amount' => 10,
                 ],
+            ],
             'date' => '2019/12/12',
         ];
 
@@ -758,11 +757,11 @@ class PaymentTest extends TestCase
             'amount' => 15.0,
             'client_id' => $this->encodePrimaryKey($client->id),
             'invoices' => [
-                    [
-                        'invoice_id' => $this->encodePrimaryKey($this->invoice->id),
-                        'amount' => 10,
-                    ],
+                [
+                    'invoice_id' => $this->encodePrimaryKey($this->invoice->id),
+                    'amount' => 10,
                 ],
+            ],
             'date' => '2019/12/12',
         ];
 
@@ -770,9 +769,9 @@ class PaymentTest extends TestCase
 
         try {
             $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/payments/', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/payments/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             \Log::error(print_r($e->validator->getMessageBag(), 1));
@@ -809,11 +808,11 @@ class PaymentTest extends TestCase
             'amount' => 15.0,
             'client_id' => $this->encodePrimaryKey($client->id),
             'invoices' => [
-                    [
-                        'invoice_id' => $this->encodePrimaryKey($this->invoice->id),
-                        'amount' => 10,
-                    ],
+                [
+                    'invoice_id' => $this->encodePrimaryKey($this->invoice->id),
+                    'amount' => 10,
                 ],
+            ],
             'date' => '2019/12/12',
         ];
 
@@ -857,11 +856,11 @@ class PaymentTest extends TestCase
             'amount' => 20.0,
             'client_id' => $this->encodePrimaryKey($client->id),
             'invoices' => [
-                    [
-                        'invoice_id' => $this->encodePrimaryKey($this->invoice->id),
-                        'amount' => 10,
-                    ],
+                [
+                    'invoice_id' => $this->encodePrimaryKey($this->invoice->id),
+                    'amount' => 10,
                 ],
+            ],
             'date' => '2019/12/12',
         ];
 
@@ -954,8 +953,8 @@ class PaymentTest extends TestCase
             'client_id' => $client->hashed_id,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => $this->invoice->amount,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => $this->invoice->amount,
                 ],
             ],
             'date' => '2020/12/12',
@@ -1015,8 +1014,8 @@ class PaymentTest extends TestCase
             'client_id' => $client->hashed_id,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => $this->invoice->amount,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => $this->invoice->amount,
                 ],
             ],
             'date' => '2020/12/12',
@@ -1087,12 +1086,12 @@ class PaymentTest extends TestCase
             'client_id' => $client1->hashed_id,
             'invoices' => [
                 [
-                'invoice_id' => $invoice1->hashed_id,
-                'amount' => $invoice1->amount,
+                    'invoice_id' => $invoice1->hashed_id,
+                    'amount' => $invoice1->amount,
                 ],
                 [
-                'invoice_id' => $invoice2->hashed_id,
-                'amount' => $invoice2->amount,
+                    'invoice_id' => $invoice2->hashed_id,
+                    'amount' => $invoice2->amount,
                 ],
             ],
             'date' => '2020/12/12',
@@ -1135,12 +1134,12 @@ class PaymentTest extends TestCase
             'client_id' => $client1->hashed_id,
             'invoices' => [
                 [
-                'invoice_id' => $invoice1->hashed_id,
-                'amount' => 1,
+                    'invoice_id' => $invoice1->hashed_id,
+                    'amount' => 1,
                 ],
                 [
-                'invoice_id' => $invoice1->hashed_id,
-                'amount' => 1,
+                    'invoice_id' => $invoice1->hashed_id,
+                    'amount' => 1,
                 ],
             ],
             'date' => '2020/12/12',
@@ -1202,14 +1201,14 @@ class PaymentTest extends TestCase
             'client_id' => $client->hashed_id,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => 5,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => 5,
                 ],
             ],
             'credits' => [
                 [
-                'credit_id' => $credit->id,
-                'amount' => 5,
+                    'credit_id' => $credit->id,
+                    'amount' => 5,
                 ],
             ],
             'date' => '2020/12/12',
@@ -1271,8 +1270,8 @@ class PaymentTest extends TestCase
             'client_id' => $client->hashed_id,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => $this->invoice->amount,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => $this->invoice->amount,
                 ],
             ],
             'date' => '2020/12/12',
@@ -1333,11 +1332,11 @@ class PaymentTest extends TestCase
             'amount' => 20.0,
             'client_id' => $this->encodePrimaryKey($client->id),
             'invoices' => [
-                    [
-                        'invoice_id' => $this->encodePrimaryKey($this->invoice->id),
-                        'amount' => 10,
-                    ],
+                [
+                    'invoice_id' => $this->encodePrimaryKey($this->invoice->id),
+                    'amount' => 10,
                 ],
+            ],
             'date' => '2019/12/12',
         ];
 
@@ -1354,7 +1353,6 @@ class PaymentTest extends TestCase
 
         $payment = Payment::whereId($this->decodePrimaryKey($payment_id))->first();
 
-
         $data = [
             'ids' => [$this->encodePrimaryKey($payment->id)],
         ];
@@ -1387,11 +1385,9 @@ class PaymentTest extends TestCase
         $this->assertEquals(1, $arr['data'][0]['is_deleted']);
     }
 
-
     public function testDeleteRefundedPayment()
     {
-
-       $this->invoice = null;
+        $this->invoice = null;
 
         $client = ClientFactory::create($this->company->id, $this->user->id);
         $client->save();
@@ -1399,18 +1395,17 @@ class PaymentTest extends TestCase
         $this->invoice = InvoiceFactory::create($this->company->id, $this->user->id); //stub the company and user_id
         $this->invoice->client_id = $client->id;
 
+        $item = InvoiceItemFactory::create();
+        $item->quantity = 1;
+        $item->cost = 10;
+        $item->product_key = 'test';
+        $item->notes = 'test';
+        $item->custom_value1 = '';
+        $item->custom_value2 = '';
+        $item->custom_value3 = '';
+        $item->custom_value4 = '';
 
-            $item = InvoiceItemFactory::create();
-            $item->quantity = 1;
-            $item->cost = 10;
-            $item->product_key = 'test';
-            $item->notes = 'test';
-            $item->custom_value1 = '';
-            $item->custom_value2 = '';
-            $item->custom_value3 = '';
-            $item->custom_value4 = '';
-
-            $line_items[] = $item;
+        $line_items[] = $item;
 
         $this->invoice->line_items = $line_items;
         $this->invoice->uses_inclusive_taxes = false;
@@ -1422,8 +1417,7 @@ class PaymentTest extends TestCase
 
         $this->invoice = $this->invoice_calc->getInvoice();
         $this->invoice->save();
-        $this->invoice->service()->markSent()->createInvitations()->save(); 
-
+        $this->invoice->service()->markSent()->createInvitations()->save();
 
         $this->assertEquals(10, $this->invoice->balance);
         $this->assertEquals(10, $this->invoice->client->fresh()->balance);
@@ -1443,8 +1437,8 @@ class PaymentTest extends TestCase
             'date' => '2021/12/12',
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => 10,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => 10,
                 ],
             ],
         ];
@@ -1453,9 +1447,9 @@ class PaymentTest extends TestCase
 
         try {
             $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/payments/refund', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/payments/refund', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
@@ -1476,12 +1470,11 @@ class PaymentTest extends TestCase
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
         ])->post('/api/v1/payments/bulk?action=delete', $data);
-        
+
         $this->assertEquals(10, $this->invoice->fresh()->balance);
         $this->assertEquals(10, $this->invoice->fresh()->balance);
     }
 
-
     public function testUniquePaymentNumbers()
     {
         $data = [
@@ -1493,9 +1486,9 @@ class PaymentTest extends TestCase
 
         try {
             $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/payments', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/payments', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
@@ -1506,23 +1499,19 @@ class PaymentTest extends TestCase
         $response->assertStatus(200);
 
         $response = false;
-        
+
         try {
             $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/payments', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/payments', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
         }
 
-        if($response)
-        $response->assertStatus(302);
-
-
-
-
+        if ($response) {
+            $response->assertStatus(302);
+        }
     }
 }
-
diff --git a/tests/Feature/Payments/CreditPaymentTest.php b/tests/Feature/Payments/CreditPaymentTest.php
index 3bacfdce0faf..bc031be4a235 100644
--- a/tests/Feature/Payments/CreditPaymentTest.php
+++ b/tests/Feature/Payments/CreditPaymentTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature\Payments;
 
 use App\DataMapper\ClientSettings;
@@ -43,7 +44,7 @@ class CreditPaymentTest extends TestCase
     use MockUnitData;
     use WithoutEvents;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -61,9 +62,8 @@ class CreditPaymentTest extends TestCase
         );
     }
 
-   public function testRegularPayment()
+    public function testRegularPayment()
     {
-
         $invoice = Invoice::factory()->create(['user_id' => $this->user->id, 'company_id' => $this->company->id, 'client_id' => $this->client->id]);
 
         $invoice->line_items = $this->buildLineItems();
@@ -81,8 +81,7 @@ class CreditPaymentTest extends TestCase
         $invoice->setRelation('company', $this->company);
         $invoice->service()->markSent()->createInvitations()->save();
 
-
-       $data = [
+        $data = [
             'amount' => 0,
             'client_id' => $this->client->hashed_id,
             'invoices' => [
@@ -98,9 +97,9 @@ class CreditPaymentTest extends TestCase
 
         try {
             $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/payments/', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/payments/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($e->validator->getMessageBag());
@@ -116,14 +115,10 @@ class CreditPaymentTest extends TestCase
 
         $this->assertEquals($payment->amount, 10);
         $this->assertEquals($payment->applied, 10);
-
     }
 
-
-
     public function testCreditPayments()
     {
-
         $invoice = Invoice::factory()->create(['user_id' => $this->user->id, 'company_id' => $this->company->id, 'client_id' => $this->client->id]);
 
         $invoice->line_items = $this->buildLineItems();
@@ -159,8 +154,7 @@ class CreditPaymentTest extends TestCase
         $credit->setRelation('company', $this->company);
         $credit->service()->markSent()->save();
 
-
-       $data = [
+        $data = [
             'amount' => 0,
             'client_id' => $this->client->hashed_id,
             'invoices' => [
@@ -172,8 +166,8 @@ class CreditPaymentTest extends TestCase
             'credits' => [
                 [
                     'credit_id' => $credit->hashed_id,
-                    'amount' => 5
-                ]
+                    'amount' => 5,
+                ],
             ],
             'date' => '2019/12/12',
         ];
@@ -182,9 +176,9 @@ class CreditPaymentTest extends TestCase
 
         try {
             $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/payments/', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/payments/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($e->validator->getMessageBag());
@@ -200,14 +194,13 @@ class CreditPaymentTest extends TestCase
 
         $this->assertEquals($payment->amount, 5);
         $this->assertEquals($payment->applied, 5);
-
     }
 
     /*
 
     public function testDoublePaymentTestWithInvalidAmounts()
     {
- 
+
         $data = [
             'amount' => 15.0,
             'client_id' => $this->encodePrimaryKey($client->id),
@@ -285,6 +278,4 @@ class CreditPaymentTest extends TestCase
         }
     }
     */
-
 }
-
diff --git a/tests/Feature/Payments/StorePaymentValidationTest.php b/tests/Feature/Payments/StorePaymentValidationTest.php
index 9263283f3aad..8b72e985ac1e 100644
--- a/tests/Feature/Payments/StorePaymentValidationTest.php
+++ b/tests/Feature/Payments/StorePaymentValidationTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature\Payments;
 
 use App\DataMapper\ClientSettings;
@@ -43,7 +44,7 @@ class StorePaymentValidationTest extends TestCase
     use MockAccountData;
     use WithoutEvents;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -55,7 +56,6 @@ class StorePaymentValidationTest extends TestCase
 
         $this->makeTestData();
 
-
         $this->withoutMiddleware(
             ThrottleRequests::class
         );
@@ -63,14 +63,12 @@ class StorePaymentValidationTest extends TestCase
 
     public function testNumericParse()
     {
-        $this->assertFalse(is_numeric("2760.0,139.14"));
+        $this->assertFalse(is_numeric('2760.0,139.14'));
     }
 
-
     public function testNoAmountGiven()
     {
-
-       $data = [
+        $data = [
             // 'amount' => 0,
             'client_id' => $this->client->hashed_id,
             'invoices' => [
@@ -82,8 +80,8 @@ class StorePaymentValidationTest extends TestCase
             'credits' => [
                 [
                     'credit_id' => $this->credit->hashed_id,
-                    'amount' => 5
-                ]
+                    'amount' => 5,
+                ],
             ],
             'date' => '2019/12/12',
         ];
@@ -92,24 +90,21 @@ class StorePaymentValidationTest extends TestCase
 
         try {
             $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/payments/', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/payments/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($e->validator->getMessageBag());
         }
 
         $response->assertStatus(200);
-
     }
 
-
     public function testInValidPaymentAmount()
     {
-
-       $data = [
-            'amount' => "10,33",
+        $data = [
+            'amount' => '10,33',
             'client_id' => $this->client->hashed_id,
             'invoices' => [
             ],
@@ -120,23 +115,20 @@ class StorePaymentValidationTest extends TestCase
 
         try {
             $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/payments/', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/payments/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($e->validator->getMessageBag());
         }
 
         $response->assertStatus(302);
-
     }
 
-
     public function testValidPayment()
     {
-
-       $data = [
+        $data = [
             'amount' => 0,
             'client_id' => $this->client->hashed_id,
             'invoices' => [
@@ -148,23 +140,20 @@ class StorePaymentValidationTest extends TestCase
 
         try {
             $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/payments/', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/payments/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($e->validator->getMessageBag());
         }
 
         $response->assertStatus(200);
-
     }
 
-
     public function testValidPaymentWithAmount()
     {
-
-       $data = [
+        $data = [
             'amount' => 0,
             'client_id' => $this->client->hashed_id,
             'invoices' => [
@@ -176,8 +165,8 @@ class StorePaymentValidationTest extends TestCase
             'credits' => [
                 [
                     'credit_id' => $this->credit->hashed_id,
-                    'amount' => 5
-                ]
+                    'amount' => 5,
+                ],
             ],
             'date' => '2019/12/12',
         ];
@@ -186,23 +175,20 @@ class StorePaymentValidationTest extends TestCase
 
         try {
             $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/payments/', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/payments/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($e->validator->getMessageBag());
         }
 
         $response->assertStatus(200);
-
     }
 
     public function testValidPaymentWithInvalidData()
     {
-
-        
-       $data = [
+        $data = [
             'amount' => 0,
             'client_id' => $this->client->hashed_id,
             'invoices' => [
@@ -213,26 +199,21 @@ class StorePaymentValidationTest extends TestCase
             'credits' => [
                 [
                     'credit_id' => $this->credit->hashed_id,
-                    'amount' => 5
-                ]
+                    'amount' => 5,
+                ],
             ],
             'date' => '2019/12/12',
         ];
 
         $response = false;
 
-        try{
+        try {
             $response = $this->withHeaders([
                 'X-API-SECRET' => config('ninja.api_secret'),
                 'X-API-TOKEN' => $this->token,
             ])->post('/api/v1/payments/', $data);
-        }catch(ValidationException $e){
+        } catch (ValidationException $e) {
             $response->assertStatus(302);
         }
-
     }
-
-
-
 }
-
diff --git a/tests/Feature/Payments/UnappliedPaymentDeleteTest.php b/tests/Feature/Payments/UnappliedPaymentDeleteTest.php
index 4a8788d14d56..c79591a163c2 100644
--- a/tests/Feature/Payments/UnappliedPaymentDeleteTest.php
+++ b/tests/Feature/Payments/UnappliedPaymentDeleteTest.php
@@ -6,10 +6,10 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
-namespace Tests\Feature\Payments;
 
+namespace Tests\Feature\Payments;
 
 use App\Factory\InvoiceItemFactory;
 use App\Models\Client;
@@ -34,7 +34,7 @@ class UnappliedPaymentDeleteTest extends TestCase
     use MockUnitData;
     use WithoutEvents;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -48,9 +48,8 @@ class UnappliedPaymentDeleteTest extends TestCase
         );
     }
 
-   public function testUnappliedPaymentDelete()
-   {
-
+    public function testUnappliedPaymentDelete()
+    {
         $data = [
             'amount' => 1000,
             'client_id' => $this->client->hashed_id,
@@ -72,11 +71,10 @@ class UnappliedPaymentDeleteTest extends TestCase
             $this->assertNotNull($message);
         }
 
-        if ($response){
+        if ($response) {
             $arr = $response->json();
             $response->assertStatus(200);
-            
-        
+
             $payment_id = $arr['data']['id'];
             $payment = Payment::with('client')->find($this->decodePrimaryKey($payment_id));
 
@@ -87,7 +85,7 @@ class UnappliedPaymentDeleteTest extends TestCase
                 $response = $this->withHeaders([
                     'X-API-SECRET' => config('ninja.api_secret'),
                     'X-API-TOKEN' => $this->token,
-                ])->delete('/api/v1/payments/'. $payment_id);
+                ])->delete('/api/v1/payments/'.$payment_id);
             } catch (ValidationException $e) {
                 $message = json_decode($e->validator->getMessageBag(), 1);
                 $this->assertNotNull($message);
@@ -96,22 +94,19 @@ class UnappliedPaymentDeleteTest extends TestCase
             $response->assertStatus(200);
 
             $this->assertEquals(0, $this->client->fresh()->paid_to_date);
-
         }
+    }
 
-   }
-
-   public function testUnappliedPaymentWithPaidInvoice()
-   {
-
+    public function testUnappliedPaymentWithPaidInvoice()
+    {
         $data = [
             'name' => 'A Nice Client',
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/clients', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/clients', $data);
 
         $response->assertStatus(200);
 
@@ -119,7 +114,7 @@ class UnappliedPaymentDeleteTest extends TestCase
 
         $client_hash_id = $arr['data']['id'];
         $client = Client::find($this->decodePrimaryKey($client_hash_id));
-        
+
         $this->assertEquals($client->balance, 0);
         $this->assertEquals($client->paid_to_date, 0);
         //create new invoice.
@@ -130,13 +125,13 @@ class UnappliedPaymentDeleteTest extends TestCase
         $item->quantity = 1;
         $item->cost = 10;
 
-        $line_items[] = (array)$item;
+        $line_items[] = (array) $item;
 
         $item = InvoiceItemFactory::create();
         $item->quantity = 1;
         $item->cost = 10;
 
-        $line_items[] = (array)$item;
+        $line_items[] = (array) $item;
 
         $invoice = [
             'status_id' => 1,
@@ -151,17 +146,17 @@ class UnappliedPaymentDeleteTest extends TestCase
             'custom_value3' => 0,
             'custom_value4' => 0,
             'client_id' => $client_hash_id,
-            'line_items' => (array)$line_items,
+            'line_items' => (array) $line_items,
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/invoices/', $invoice)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/invoices/', $invoice)
             ->assertStatus(200);
 
         $arr = $response->json();
-    
+
         $invoice_one_hashed_id = $arr['data']['id'];
 
         $invoice = Invoice::find($this->decodePrimaryKey($invoice_one_hashed_id));
@@ -171,15 +166,14 @@ class UnappliedPaymentDeleteTest extends TestCase
         $this->assertEquals(20, $invoice->balance);
         $this->assertEquals(20, $invoice->client->balance);
 
-
         $data = [
             'amount' => 30,
             'client_id' => $client->hashed_id,
             'invoices' => [
                 [
                     'invoice_id' => $invoice->hashed_id,
-                    'amount' => 20
-                ]
+                    'amount' => 20,
+                ],
             ],
             'date' => '2020/12/12',
 
@@ -213,20 +207,18 @@ class UnappliedPaymentDeleteTest extends TestCase
 
         $this->assertEquals(0, $client->fresh()->paid_to_date);
         $this->assertEquals(20, $client->fresh()->balance);
+    }
 
-   }
-
-   public function testRefundPartialPaymentDeletion()
-   {
-
+    public function testRefundPartialPaymentDeletion()
+    {
         $data = [
             'name' => 'A Nice Client',
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/clients', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/clients', $data);
 
         $response->assertStatus(200);
 
@@ -234,7 +226,7 @@ class UnappliedPaymentDeleteTest extends TestCase
 
         $client_hash_id = $arr['data']['id'];
         $client = Client::find($this->decodePrimaryKey($client_hash_id));
-        
+
         $this->assertEquals($client->balance, 0);
         $this->assertEquals($client->paid_to_date, 0);
         //create new invoice.
@@ -245,13 +237,13 @@ class UnappliedPaymentDeleteTest extends TestCase
         $item->quantity = 1;
         $item->cost = 10;
 
-        $line_items[] = (array)$item;
+        $line_items[] = (array) $item;
 
         $item = InvoiceItemFactory::create();
         $item->quantity = 1;
         $item->cost = 10;
 
-        $line_items[] = (array)$item;
+        $line_items[] = (array) $item;
 
         $invoice = [
             'status_id' => 1,
@@ -266,17 +258,17 @@ class UnappliedPaymentDeleteTest extends TestCase
             'custom_value3' => 0,
             'custom_value4' => 0,
             'client_id' => $client_hash_id,
-            'line_items' => (array)$line_items,
+            'line_items' => (array) $line_items,
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/invoices/', $invoice)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/invoices/', $invoice)
             ->assertStatus(200);
 
         $arr = $response->json();
-    
+
         $invoice_one_hashed_id = $arr['data']['id'];
 
         $invoice = Invoice::find($this->decodePrimaryKey($invoice_one_hashed_id));
@@ -293,8 +285,8 @@ class UnappliedPaymentDeleteTest extends TestCase
             'invoices' => [
                 [
                     'invoice_id' => $invoice->hashed_id,
-                    'amount' => 20
-                ]
+                    'amount' => 20,
+                ],
             ],
         ];
 
@@ -321,8 +313,8 @@ class UnappliedPaymentDeleteTest extends TestCase
             'invoices' => [
                 [
                     'invoice_id' => $invoice->hashed_id,
-                    'amount' => 20
-                ]
+                    'amount' => 20,
+                ],
             ],
         ];
 
@@ -330,9 +322,9 @@ class UnappliedPaymentDeleteTest extends TestCase
 
         try {
             $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/payments/refund', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/payments/refund', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
         }
@@ -352,7 +344,5 @@ class UnappliedPaymentDeleteTest extends TestCase
 
         $this->assertEquals(0, $client->fresh()->paid_to_date);
         $this->assertEquals(20, $client->fresh()->balance);
-
-   }
-
-}
\ No newline at end of file
+    }
+}
diff --git a/tests/Feature/Payments/UnappliedPaymentRefundTest.php b/tests/Feature/Payments/UnappliedPaymentRefundTest.php
index fe4e69448fe4..f2b16336bdef 100644
--- a/tests/Feature/Payments/UnappliedPaymentRefundTest.php
+++ b/tests/Feature/Payments/UnappliedPaymentRefundTest.php
@@ -6,10 +6,10 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
-namespace Tests\Feature\Payments;
 
+namespace Tests\Feature\Payments;
 
 use App\Models\Payment;
 use App\Utils\Traits\MakesHash;
@@ -31,7 +31,7 @@ class UnappliedPaymentRefundTest extends TestCase
     use MockUnitData;
     use WithoutEvents;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -45,9 +45,8 @@ class UnappliedPaymentRefundTest extends TestCase
         );
     }
 
-   public function testUnappliedPaymentRefund()
-   {
-
+    public function testUnappliedPaymentRefund()
+    {
         $data = [
             'amount' => 1000,
             'client_id' => $this->client->hashed_id,
@@ -69,10 +68,10 @@ class UnappliedPaymentRefundTest extends TestCase
             $this->assertNotNull($message);
         }
 
-        if ($response){
+        if ($response) {
             $arr = $response->json();
             $response->assertStatus(200);
-            
+
             $this->assertEquals(1000, $this->client->fresh()->paid_to_date);
 
             $payment_id = $arr['data']['id'];
@@ -100,11 +99,6 @@ class UnappliedPaymentRefundTest extends TestCase
             $response->assertStatus(200);
 
             $this->assertEquals(500, $this->client->fresh()->paid_to_date);
-
         }
-
-
-
-   }
-
-}
\ No newline at end of file
+    }
+}
diff --git a/tests/Feature/PdfCreatorTest.php b/tests/Feature/PdfCreatorTest.php
index ec665199b047..6d42a20e35b0 100644
--- a/tests/Feature/PdfCreatorTest.php
+++ b/tests/Feature/PdfCreatorTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Jobs\Entity\CreateEntityPdf;
@@ -25,7 +26,7 @@ class PdfCreatorTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -38,22 +39,22 @@ class PdfCreatorTest extends TestCase
 
     public function testCreditPdfCreated()
     {
-        $credit_path = CreateEntityPdf::dispatchNow($this->credit->invitations->first());
-    
+        $credit_path = (new CreateEntityPdf($this->credit->invitations->first()))->handle();
+
         $this->assertTrue(Storage::disk('public')->exists($credit_path));
     }
 
     public function testInvoicePdfCreated()
     {
-        $invoice_path = CreateEntityPdf::dispatchNow($this->invoice->invitations->first());
+        $invoice_path = (new CreateEntityPdf($this->invoice->invitations->first()))->handle();
 
         $this->assertTrue(Storage::disk('public')->exists($invoice_path));
-        }
+    }
 
     public function testQuotePdfCreated()
     {
-        $quote_path = CreateEntityPdf::dispatchNow($this->quote->invitations->first());
-    
+        $quote_path = (new CreateEntityPdf($this->quote->invitations->first()))->handle();
+
         $this->assertTrue(Storage::disk('public')->exists($quote_path));
     }
 }
diff --git a/tests/Feature/PdfMaker/ExampleDesign.php b/tests/Feature/PdfMaker/ExampleDesign.php
index 30cd3e430a11..9c8e47f24b38 100644
--- a/tests/Feature/PdfMaker/ExampleDesign.php
+++ b/tests/Feature/PdfMaker/ExampleDesign.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature\PdfMaker;
 
 use App\Services\PdfMaker\Designs\Utilities\DesignHelpers;
diff --git a/tests/Feature/PdfMaker/ExampleIntegrationTest.php b/tests/Feature/PdfMaker/ExampleIntegrationTest.php
index 6f901943cbbe..2c6f2061d5c2 100644
--- a/tests/Feature/PdfMaker/ExampleIntegrationTest.php
+++ b/tests/Feature/PdfMaker/ExampleIntegrationTest.php
@@ -8,6 +8,7 @@
  *
  * @license https://opensource.org/licenses/AAL
  */
+
 namespace Tests\Feature\PdfMaker;
 
 use App\Services\PdfMaker\Design;
@@ -21,7 +22,7 @@ class ExampleIntegrationTest extends TestCase
 {
     use MakesInvoiceValues, MockAccountData;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/Feature/PdfMaker/PdfMakerTest.php b/tests/Feature/PdfMaker/PdfMakerTest.php
index 61cc19b1f65c..76a4515783e8 100644
--- a/tests/Feature/PdfMaker/PdfMakerTest.php
+++ b/tests/Feature/PdfMaker/PdfMakerTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature\PdfMaker;
 
 use App\Services\PdfMaker\Design;
diff --git a/tests/Feature/PingTest.php b/tests/Feature/PingTest.php
index 2c6241c8887c..8c6df4cf9f2c 100644
--- a/tests/Feature/PingTest.php
+++ b/tests/Feature/PingTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -24,12 +25,11 @@ class PingTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
         $this->makeTestData();
 
-
         $this->withoutMiddleware(
             ThrottleRequests::class
         );
@@ -38,8 +38,8 @@ class PingTest extends TestCase
     public function testPingEndPoint()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
         ])->get('/api/v1/ping');
 
         $response->assertStatus(200);
@@ -48,8 +48,8 @@ class PingTest extends TestCase
     public function testHealthCheck()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
         ])->get('/api/v1/health_check');
 
         $response->assertStatus(200);
diff --git a/tests/Feature/PreviewTest.php b/tests/Feature/PreviewTest.php
index 57d86e9bd817..0d031f07d704 100644
--- a/tests/Feature/PreviewTest.php
+++ b/tests/Feature/PreviewTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -24,7 +25,7 @@ class PreviewTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -40,9 +41,9 @@ class PreviewTest extends TestCase
         $data = $this->getData();
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/preview/', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/preview/', $data);
 
         $response->assertStatus(200);
     }
@@ -77,33 +78,32 @@ class PreviewTest extends TestCase
         $data = $this->getData();
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/preview?html=true', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/preview?html=true', $data);
 
         $response->assertStatus(200);
     }
 
-
     private function getData()
     {
         $data =
             [
-            'entity_type' => 'invoice',
-            'entity_id' => '',
-            'design' => [
+                'entity_type' => 'invoice',
+                'entity_id' => '',
+                'design' => [
                     'name' => '',
                     'design' => [
-                    'includes' => '</style>',
-                    'header' => '<div id="header"></div>',
-                    'body' => '<div id="body">',
-                    'product' => '',
-                    'task' => '',
-                    'footer' => '<div id="footer">$entity_footer</div>'
-                       ],
+                        'includes' => '</style>',
+                        'header' => '<div id="header"></div>',
+                        'body' => '<div id="body">',
+                        'product' => '',
+                        'task' => '',
+                        'footer' => '<div id="footer">$entity_footer</div>',
+                    ],
                 ],
-            'is_custom' => 1,
-        ];
+                'is_custom' => 1,
+            ];
 
         return $data;
     }
diff --git a/tests/Feature/ProductTest.php b/tests/Feature/ProductTest.php
index a957bfd96b52..cf49f64b4d4a 100644
--- a/tests/Feature/ProductTest.php
+++ b/tests/Feature/ProductTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Models\Product;
@@ -29,7 +30,7 @@ class ProductTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -49,9 +50,9 @@ class ProductTest extends TestCase
     public function testProductList()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/products');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/products');
 
         $response->assertStatus(200);
 
@@ -78,19 +79,17 @@ class ProductTest extends TestCase
         )
             ->assertStatus(200);
 
-
         $arr = $response->json();
         $product = Product::find($this->decodePrimaryKey($arr['data']['id']));
 
-
         $product_update = [
             'notes' => 'CHANGE',
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/products/'.$this->encodePrimaryKey($product->id), $product_update)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/products/'.$this->encodePrimaryKey($product->id), $product_update)
             ->assertStatus(200);
 
         $response = $this->withHeaders([
diff --git a/tests/Feature/ProjectApiTest.php b/tests/Feature/ProjectApiTest.php
index 39d3c533de17..b4d1b237e7f8 100644
--- a/tests/Feature/ProjectApiTest.php
+++ b/tests/Feature/ProjectApiTest.php
@@ -6,17 +6,18 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Utils\Traits\MakesHash;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Session;
+use Illuminate\Validation\ValidationException;
 use Tests\MockAccountData;
 use Tests\TestCase;
-use Illuminate\Validation\ValidationException;
 
 /**
  * @test
@@ -28,7 +29,7 @@ class ProjectApiTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -44,26 +45,25 @@ class ProjectApiTest extends TestCase
     public function testProjectGet()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/projects/'.$this->encodePrimaryKey($this->project->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/projects/'.$this->encodePrimaryKey($this->project->id));
 
         $response->assertStatus(200);
     }
 
-
     public function testProjectPost()
     {
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'client_id' => $this->client->hashed_id,
             'number' => 'duplicate',
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/projects', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/projects', $data);
 
         $response->assertStatus(200);
 
@@ -74,67 +74,61 @@ class ProjectApiTest extends TestCase
             'X-API-TOKEN' => $this->token,
         ])->put('/api/v1/projects/'.$arr['data']['id'], $data)->assertStatus(200);
 
-        try{
-        $response = $this->withHeaders([
+        try {
+            $response = $this->withHeaders([
                 'X-API-SECRET' => config('ninja.api_secret'),
                 'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/projects', $data);
-        }
-        catch(ValidationException $e){
+            ])->post('/api/v1/projects', $data);
+        } catch (ValidationException $e) {
             $response->assertStatus(302);
         }
-
     }
 
     public function testProjectPostFilters()
     {
         $data = [
-            'name' => "Sherlock",
+            'name' => 'Sherlock',
             'client_id' => $this->client->hashed_id,
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/projects', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/projects', $data);
 
         $response->assertStatus(200);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/projects?filter=Sherlock');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/projects?filter=Sherlock');
 
         $arr = $response->json();
 
         $this->assertEquals(1, count($arr['data']));
-
-
     }
 
-
     public function testProjectPut()
     {
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'public_notes' => 'Coolio',
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/projects/'.$this->encodePrimaryKey($this->project->id), $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/projects/'.$this->encodePrimaryKey($this->project->id), $data);
 
         $response->assertStatus(200);
     }
 
-
     public function testProjectNotArchived()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/projects/'.$this->encodePrimaryKey($this->project->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/projects/'.$this->encodePrimaryKey($this->project->id));
 
         $arr = $response->json();
 
@@ -148,9 +142,9 @@ class ProjectApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/projects/bulk?action=archive', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/projects/bulk?action=archive', $data);
 
         $arr = $response->json();
 
@@ -164,9 +158,9 @@ class ProjectApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/projects/bulk?action=restore', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/projects/bulk?action=restore', $data);
 
         $arr = $response->json();
 
@@ -180,9 +174,9 @@ class ProjectApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/projects/bulk?action=delete', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/projects/bulk?action=delete', $data);
 
         $arr = $response->json();
 
diff --git a/tests/Feature/PurchaseOrderTest.php b/tests/Feature/PurchaseOrderTest.php
index 75e441c93fed..1b7c41d6b410 100644
--- a/tests/Feature/PurchaseOrderTest.php
+++ b/tests/Feature/PurchaseOrderTest.php
@@ -9,9 +9,7 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-
-namespace Tests;
-
+namespace Tests\Feature;
 
 use App\Models\Client;
 use App\Models\PurchaseOrder;
@@ -20,6 +18,8 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Str;
+use Tests\MockAccountData;
+use Tests\TestCase;
 
 class PurchaseOrderTest extends TestCase
 {
@@ -27,7 +27,7 @@ class PurchaseOrderTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -38,7 +38,6 @@ class PurchaseOrderTest extends TestCase
         Model::reguard();
 
         $this->makeTestData();
-
     }
 
     public function testPostNewPurchaseOrderPdf()
@@ -78,21 +77,21 @@ class PurchaseOrderTest extends TestCase
         $x = $purchase_order->service()->markSent()->getPurchaseOrderPdf();
 
         nlog($x);
-    }    
+    }
 
     public function testPurchaseOrderRest()
     {
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->get('/api/v1/purchase_orders/' . $this->encodePrimaryKey($this->purchase_order->id));
+        ])->get('/api/v1/purchase_orders/'.$this->encodePrimaryKey($this->purchase_order->id));
 
         $response->assertStatus(200);
 
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->get('/api/v1/purchase_orders/' . $this->encodePrimaryKey($this->purchase_order->id) . '/edit');
+        ])->get('/api/v1/purchase_orders/'.$this->encodePrimaryKey($this->purchase_order->id).'/edit');
 
         $response->assertStatus(200);
 
@@ -105,7 +104,7 @@ class PurchaseOrderTest extends TestCase
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->put('/api/v1/purchase_orders/' . $this->encodePrimaryKey($this->purchase_order->id), $purchase_order_update)
+        ])->put('/api/v1/purchase_orders/'.$this->encodePrimaryKey($this->purchase_order->id), $purchase_order_update)
             ->assertStatus(200);
     }
 
@@ -138,7 +137,7 @@ class PurchaseOrderTest extends TestCase
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->delete('/api/v1/purchase_orders/' . $this->encodePrimaryKey($this->purchase_order->id));
+        ])->delete('/api/v1/purchase_orders/'.$this->encodePrimaryKey($this->purchase_order->id));
 
         $response->assertStatus(200);
     }
@@ -163,14 +162,14 @@ class PurchaseOrderTest extends TestCase
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->put('/api/v1/purchase_orders/' . $this->encodePrimaryKey($this->purchase_order->id), $data);
+        ])->put('/api/v1/purchase_orders/'.$this->encodePrimaryKey($this->purchase_order->id), $data);
 
         $response->assertStatus(200);
 
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->put('/api/v1/purchase_orders/' . $this->encodePrimaryKey($this->purchase_order->id), $data);
+        ])->put('/api/v1/purchase_orders/'.$this->encodePrimaryKey($this->purchase_order->id), $data);
 
         $response->assertStatus(200);
 
diff --git a/tests/Feature/QuoteTest.php b/tests/Feature/QuoteTest.php
index 90dfbe27b390..81bbe46e196e 100644
--- a/tests/Feature/QuoteTest.php
+++ b/tests/Feature/QuoteTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Models\Client;
@@ -31,7 +32,7 @@ class QuoteTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -51,9 +52,9 @@ class QuoteTest extends TestCase
     public function testQuoteList()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/quotes');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/quotes');
 
         $response->assertStatus(200);
     }
@@ -78,9 +79,9 @@ class QuoteTest extends TestCase
         $this->assertNotNull($response);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/quotes/'.$this->encodePrimaryKey($this->quote->id).'/edit');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/quotes/'.$this->encodePrimaryKey($this->quote->id).'/edit');
 
         $response->assertStatus(200);
 
@@ -93,32 +94,30 @@ class QuoteTest extends TestCase
         $this->assertNotNull($this->quote);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/quotes/'.$this->encodePrimaryKey($this->quote->id), $quote_update);
-
-        $response->assertStatus(200);
-
-
-        $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/quotes/'.$this->encodePrimaryKey($this->quote->id), $quote_update);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/quotes/'.$this->encodePrimaryKey($this->quote->id), $quote_update);
 
         $response->assertStatus(200);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/quotes/', $quote_update);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/quotes/'.$this->encodePrimaryKey($this->quote->id), $quote_update);
+
+        $response->assertStatus(200);
+
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/quotes/', $quote_update);
 
         $response->assertStatus(302);
 
-
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->delete('/api/v1/quotes/'.$this->encodePrimaryKey($this->quote->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->delete('/api/v1/quotes/'.$this->encodePrimaryKey($this->quote->id));
 
         $response->assertStatus(200);
 
@@ -134,9 +133,9 @@ class QuoteTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/quotes', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/quotes', $data);
 
         $response->assertStatus(200);
     }
diff --git a/tests/Feature/RecurringExpenseApiTest.php b/tests/Feature/RecurringExpenseApiTest.php
index c19f7135e543..77ff2cc38ff9 100644
--- a/tests/Feature/RecurringExpenseApiTest.php
+++ b/tests/Feature/RecurringExpenseApiTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Models\RecurringInvoice;
@@ -29,7 +30,7 @@ class RecurringExpenseApiTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -45,19 +46,19 @@ class RecurringExpenseApiTest extends TestCase
     public function testRecurringExpenseGet()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/recurring_expenses/');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/recurring_expenses/');
 
         $response->assertStatus(200);
     }
 
-   public function testRecurringExpenseGetSingleExpense()
+    public function testRecurringExpenseGetSingleExpense()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/recurring_expenses/'.$this->recurring_expense->hashed_id);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/recurring_expenses/'.$this->recurring_expense->hashed_id);
 
         $response->assertStatus(200);
     }
@@ -72,12 +73,12 @@ class RecurringExpenseApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/recurring_expenses', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/recurring_expenses', $data);
 
         $response->assertStatus(200);
-   
+
         $arr = $response->json();
 
         $response = $this->withHeaders([
@@ -85,16 +86,14 @@ class RecurringExpenseApiTest extends TestCase
             'X-API-TOKEN' => $this->token,
         ])->put('/api/v1/recurring_expenses/'.$arr['data']['id'], $data)->assertStatus(200);
 
-        try{
-        $response = $this->withHeaders([
+        try {
+            $response = $this->withHeaders([
                 'X-API-SECRET' => config('ninja.api_secret'),
                 'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/recurring_expenses', $data);
-        }
-        catch(ValidationException $e){
+            ])->post('/api/v1/recurring_expenses', $data);
+        } catch (ValidationException $e) {
             $response->assertStatus(302);
         }
-
     }
 
     public function testRecurringExpensePut()
@@ -105,20 +104,19 @@ class RecurringExpenseApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/recurring_expenses/'.$this->encodePrimaryKey($this->recurring_expense->id), $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/recurring_expenses/'.$this->encodePrimaryKey($this->recurring_expense->id), $data);
 
         $response->assertStatus(200);
     }
 
-
     public function testRecurringExpenseNotArchived()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/recurring_expenses/'.$this->encodePrimaryKey($this->recurring_expense->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/recurring_expenses/'.$this->encodePrimaryKey($this->recurring_expense->id));
 
         $arr = $response->json();
 
@@ -132,9 +130,9 @@ class RecurringExpenseApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/recurring_expenses/bulk?action=archive', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/recurring_expenses/bulk?action=archive', $data);
 
         $arr = $response->json();
 
@@ -148,9 +146,9 @@ class RecurringExpenseApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/recurring_expenses/bulk?action=restore', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/recurring_expenses/bulk?action=restore', $data);
 
         $arr = $response->json();
 
@@ -164,9 +162,9 @@ class RecurringExpenseApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/recurring_expenses/bulk?action=delete', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/recurring_expenses/bulk?action=delete', $data);
 
         $arr = $response->json();
 
@@ -180,16 +178,15 @@ class RecurringExpenseApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/recurring_expenses/bulk?action=start', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/recurring_expenses/bulk?action=start', $data);
 
         $arr = $response->json();
 
         $this->assertEquals(RecurringInvoice::STATUS_ACTIVE, $arr['data'][0]['status_id']);
     }
 
-
     public function testRecurringExpensePaused()
     {
         $data = [
@@ -197,14 +194,14 @@ class RecurringExpenseApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/recurring_expenses/bulk?action=start', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/recurring_expenses/bulk?action=start', $data);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/recurring_expenses/bulk?action=stop', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/recurring_expenses/bulk?action=stop', $data);
 
         $arr = $response->json();
 
@@ -218,23 +215,22 @@ class RecurringExpenseApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/recurring_expenses/'.$this->recurring_expense->hashed_id.'?start=true', []);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/recurring_expenses/'.$this->recurring_expense->hashed_id.'?start=true', []);
 
         $arr = $response->json();
 
         $this->assertEquals(RecurringInvoice::STATUS_ACTIVE, $arr['data']['status_id']);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/recurring_expenses/'.$this->recurring_expense->hashed_id.'?stop=true', []);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/recurring_expenses/'.$this->recurring_expense->hashed_id.'?stop=true', []);
 
         $arr = $response->json();
 
         $this->assertEquals(RecurringInvoice::STATUS_PAUSED, $arr['data']['status_id']);
-
     }
 
     public function testRecurringExpensePostWithStartAction()
@@ -244,23 +240,21 @@ class RecurringExpenseApiTest extends TestCase
             'client_id' => $this->client->hashed_id,
             'number' => '123321',
             'frequency_id' => 5,
-            'remaining_cycles' =>5
+            'remaining_cycles' =>5,
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/recurring_expenses?start=true', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/recurring_expenses?start=true', $data);
 
         $response->assertStatus(200);
-   
+
         $arr = $response->json();
 
         $this->assertEquals(RecurringInvoice::STATUS_ACTIVE, $arr['data']['status_id']);
-
     }
 
-
     public function testRecurringExpensePostWithStopAction()
     {
         $data = [
@@ -271,16 +265,14 @@ class RecurringExpenseApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/recurring_expenses?stop=true', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/recurring_expenses?stop=true', $data);
 
         $response->assertStatus(200);
-   
+
         $arr = $response->json();
 
         $this->assertEquals(RecurringInvoice::STATUS_PAUSED, $arr['data']['status_id']);
-
     }
-
 }
diff --git a/tests/Feature/RecurringInvoiceTest.php b/tests/Feature/RecurringInvoiceTest.php
index a552dab0745c..9170de330c2c 100644
--- a/tests/Feature/RecurringInvoiceTest.php
+++ b/tests/Feature/RecurringInvoiceTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Factory\InvoiceToRecurringInvoiceFactory;
@@ -33,7 +34,7 @@ class RecurringInvoiceTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -70,15 +71,14 @@ class RecurringInvoiceTest extends TestCase
             'remaining_cycles' => -1,
         ];
 
-            $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/recurring_invoices/', $data)
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/recurring_invoices/', $data)
             ->assertStatus(200);
 
         $arr = $response->json();
         $this->assertEquals(RecurringInvoice::STATUS_DRAFT, $arr['data']['status_id']);
-    
     }
 
     public function testPostRecurringInvoiceWithStartAndStop()
@@ -101,28 +101,26 @@ class RecurringInvoiceTest extends TestCase
             'remaining_cycles' => -1,
         ];
 
-            $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/recurring_invoices?start=true', $data)
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/recurring_invoices?start=true', $data)
             ->assertStatus(200);
-    
+
         $arr = $response->json();
 
         $this->assertEquals(RecurringInvoice::STATUS_ACTIVE, $arr['data']['status_id']);
 
-            $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/recurring_invoices/'.$arr['data']['id'].'?stop=true', $data)
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/recurring_invoices/'.$arr['data']['id'].'?stop=true', $data)
             ->assertStatus(200);
-    
+
         $arr = $response->json();
         $this->assertEquals(RecurringInvoice::STATUS_PAUSED, $arr['data']['status_id']);
-
     }
 
-
     public function testRecurringInvoiceList()
     {
         Client::factory()->create(['user_id' => $this->user->id, 'company_id' => $this->company->id])->each(function ($c) {
@@ -145,9 +143,9 @@ class RecurringInvoiceTest extends TestCase
         RecurringInvoice::factory()->create(['user_id' => $this->user->id, 'company_id' => $this->company->id, 'client_id' => $this->client->id]);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/recurring_invoices');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/recurring_invoices');
 
         $response->assertStatus(200);
     }
@@ -176,55 +174,53 @@ class RecurringInvoiceTest extends TestCase
         $RecurringInvoice->save();
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/recurring_invoices/'.$this->encodePrimaryKey($RecurringInvoice->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/recurring_invoices/'.$this->encodePrimaryKey($RecurringInvoice->id));
 
         $response->assertStatus(200);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/recurring_invoices/'.$this->encodePrimaryKey($RecurringInvoice->id).'/edit');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/recurring_invoices/'.$this->encodePrimaryKey($RecurringInvoice->id).'/edit');
 
         $response->assertStatus(200);
 
         $RecurringInvoice_update = [
             'status_id' => RecurringInvoice::STATUS_DRAFT,
             'client_id' => $this->encodePrimaryKey($RecurringInvoice->client_id),
-            'number' => 'customnumber'
+            'number' => 'customnumber',
         ];
 
         $this->assertNotNull($RecurringInvoice);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/recurring_invoices/'.$this->encodePrimaryKey($RecurringInvoice->id), $RecurringInvoice_update)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/recurring_invoices/'.$this->encodePrimaryKey($RecurringInvoice->id), $RecurringInvoice_update)
             ->assertStatus(200);
 
         $arr = $response->json();
 
         $this->assertEquals('customnumber', $arr['data']['number']);
 
-
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/recurring_invoices/'.$this->encodePrimaryKey($RecurringInvoice->id), $RecurringInvoice_update)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/recurring_invoices/'.$this->encodePrimaryKey($RecurringInvoice->id), $RecurringInvoice_update)
             ->assertStatus(200);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/recurring_invoices/', $RecurringInvoice_update)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/recurring_invoices/', $RecurringInvoice_update)
             ->assertStatus(302);
 
-
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->delete('/api/v1/recurring_invoices/'.$this->encodePrimaryKey($RecurringInvoice->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->delete('/api/v1/recurring_invoices/'.$this->encodePrimaryKey($RecurringInvoice->id));
 
         $response->assertStatus(200);
     }
diff --git a/tests/Feature/RecurringInvoicesCronTest.php b/tests/Feature/RecurringInvoicesCronTest.php
index b8902e49c59d..fe3c45ad0d0f 100644
--- a/tests/Feature/RecurringInvoicesCronTest.php
+++ b/tests/Feature/RecurringInvoicesCronTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Models\RecurringInvoice;
@@ -25,21 +26,20 @@ class RecurringInvoicesCronTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
         RecurringInvoice::all()->each(function ($ri) {
             $ri->forceDelete();
         });
-        
+
         $this->makeTestData();
     }
 
     public function testCountCorrectNumberOfRecurringInvoicesDue()
     {
 
-
         //spin up 5 valid and 1 invalid recurring invoices
         $recurring_invoices = RecurringInvoice::where('next_send_date', '<=', Carbon::now()->addMinutes(30))->get();
 
diff --git a/tests/Feature/RecurringQuoteTest.php b/tests/Feature/RecurringQuoteTest.php
index dff6525cd6ab..ecde6a5bc0fd 100644
--- a/tests/Feature/RecurringQuoteTest.php
+++ b/tests/Feature/RecurringQuoteTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Models\RecurringQuote;
@@ -29,7 +30,7 @@ class RecurringQuoteTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -51,9 +52,9 @@ class RecurringQuoteTest extends TestCase
         RecurringQuote::factory()->create(['user_id' => $this->user->id, 'company_id' => $this->company->id, 'client_id' => $this->client->id]);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/recurring_quotes');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/recurring_quotes');
 
         $response->assertStatus(200);
     }
@@ -66,16 +67,16 @@ class RecurringQuoteTest extends TestCase
         $RecurringQuote->save();
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/recurring_quotes/'.$this->encodePrimaryKey($RecurringQuote->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/recurring_quotes/'.$this->encodePrimaryKey($RecurringQuote->id));
 
         $response->assertStatus(200);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/recurring_quotes/'.$this->encodePrimaryKey($RecurringQuote->id).'/edit');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/recurring_quotes/'.$this->encodePrimaryKey($RecurringQuote->id).'/edit');
 
         $response->assertStatus(200);
 
@@ -87,15 +88,15 @@ class RecurringQuoteTest extends TestCase
         $this->assertNotNull($RecurringQuote);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/recurring_quotes/'.$this->encodePrimaryKey($RecurringQuote->id), $RecurringQuote_update)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/recurring_quotes/'.$this->encodePrimaryKey($RecurringQuote->id), $RecurringQuote_update)
             ->assertStatus(200);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->delete('/api/v1/recurring_quotes/'.$this->encodePrimaryKey($RecurringQuote->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->delete('/api/v1/recurring_quotes/'.$this->encodePrimaryKey($RecurringQuote->id));
 
         $response->assertStatus(200);
     }
diff --git a/tests/Feature/RecurringQuotesTest.php b/tests/Feature/RecurringQuotesTest.php
index 5ae07a7f616e..93fdbe9f738a 100644
--- a/tests/Feature/RecurringQuotesTest.php
+++ b/tests/Feature/RecurringQuotesTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Factory\QuoteToRecurringQuoteFactory;
@@ -33,7 +34,7 @@ class RecurringQuotesTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -72,39 +73,38 @@ class RecurringQuotesTest extends TestCase
         // RecurringQuote::factory()->create(['user_id' => $this->user->id, 'company_id' => $this->company->id, 'client_id' => $this->client->id]);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/recurring_quotes');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/recurring_quotes');
 
         $response->assertStatus(200);
     }
 
     public function testRecurringQuoteRESTEndPoints()
     {
-
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/recurring_quotes/'.$this->recurring_quote->hashed_id);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/recurring_quotes/'.$this->recurring_quote->hashed_id);
 
         $response->assertStatus(200);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/recurring_quotes/'.$this->recurring_quote->hashed_id.'/edit');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/recurring_quotes/'.$this->recurring_quote->hashed_id.'/edit');
 
         $response->assertStatus(200);
 
         $RecurringQuote_update = [
             'status_id' => RecurringQuote::STATUS_DRAFT,
-            'number' => 'customnumber'
+            'number' => 'customnumber',
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/recurring_quotes/'.$this->recurring_quote->hashed_id, $RecurringQuote_update);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/recurring_quotes/'.$this->recurring_quote->hashed_id, $RecurringQuote_update);
 
         $response->assertStatus(200);
         $arr = $response->json();
@@ -112,28 +112,27 @@ class RecurringQuotesTest extends TestCase
         $this->assertEquals('customnumber', $arr['data']['number']);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/recurring_quotes/'.$this->recurring_quote->hashed_id, $RecurringQuote_update)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/recurring_quotes/'.$this->recurring_quote->hashed_id, $RecurringQuote_update)
             ->assertStatus(200);
 
         $RecurringQuote_update = [
             'status_id' => RecurringQuote::STATUS_DRAFT,
             'client_id' => $this->recurring_quote->hashed_id,
-            'number' => 'customnumber'
+            'number' => 'customnumber',
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/recurring_quotes/', $RecurringQuote_update)
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/recurring_quotes/', $RecurringQuote_update)
             ->assertStatus(302);
 
-
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->delete('/api/v1/recurring_quotes/'.$this->encodePrimaryKey($this->recurring_quote->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->delete('/api/v1/recurring_quotes/'.$this->encodePrimaryKey($this->recurring_quote->id));
 
         $response->assertStatus(200);
     }
diff --git a/tests/Feature/RefundTest.php b/tests/Feature/RefundTest.php
index a4d4f4e0579f..f697b2a540b3 100644
--- a/tests/Feature/RefundTest.php
+++ b/tests/Feature/RefundTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Factory\ClientFactory;
@@ -36,7 +37,7 @@ class RefundTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -65,11 +66,11 @@ class RefundTest extends TestCase
         $client->save();
 
         $contact = ClientContact::factory()->create([
-                'user_id' => $this->user->id,
-                'client_id' => $client->id,
-                'company_id' => $this->company->id,
-                'is_primary' => 1,
-                'send_email' => true,
+            'user_id' => $this->user->id,
+            'client_id' => $client->id,
+            'company_id' => $this->company->id,
+            'is_primary' => 1,
+            'send_email' => true,
         ]);
 
         $this->invoice = InvoiceFactory::create($this->company->id, $this->user->id); //stub the company and user_id
@@ -120,9 +121,9 @@ class RefundTest extends TestCase
 
         try {
             $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/payments/refund', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/payments/refund', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
         }
@@ -148,14 +149,13 @@ class RefundTest extends TestCase
         $client->save();
 
         $contact = ClientContact::factory()->create([
-                'user_id' => $this->user->id,
-                'client_id' => $client->id,
-                'company_id' => $this->company->id,
-                'is_primary' => 1,
-                'send_email' => true,
+            'user_id' => $this->user->id,
+            'client_id' => $client->id,
+            'company_id' => $this->company->id,
+            'is_primary' => 1,
+            'send_email' => true,
         ]);
 
-
         $this->invoice = InvoiceFactory::create($this->company->id, $this->user->id); //stub the company and user_id
         $this->invoice->client_id = $client->id;
         $this->invoice->status_id = Invoice::STATUS_SENT;
@@ -185,8 +185,8 @@ class RefundTest extends TestCase
             'client_id' => $client->hashed_id,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => $this->invoice->amount,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => $this->invoice->amount,
                 ],
             ],
             'date' => '2020/12/12',
@@ -221,9 +221,9 @@ class RefundTest extends TestCase
 
         try {
             $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/payments/refund', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/payments/refund', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
 
@@ -246,11 +246,11 @@ class RefundTest extends TestCase
         $client->save();
 
         $contact = ClientContact::factory()->create([
-                'user_id' => $this->user->id,
-                'client_id' => $client->id,
-                'company_id' => $this->company->id,
-                'is_primary' => 1,
-                'send_email' => true,
+            'user_id' => $this->user->id,
+            'client_id' => $client->id,
+            'company_id' => $this->company->id,
+            'is_primary' => 1,
+            'send_email' => true,
         ]);
 
         $this->invoice = InvoiceFactory::create($this->company->id, $this->user->id); //stub the company and user_id
@@ -273,8 +273,8 @@ class RefundTest extends TestCase
             'client_id' => $client->hashed_id,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => $this->invoice->amount,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => $this->invoice->amount,
                 ],
             ],
             'date' => '2020/12/12',
@@ -304,8 +304,8 @@ class RefundTest extends TestCase
             'amount' => 50,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => $this->invoice->amount,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => $this->invoice->amount,
                 ],
             ],
             'date' => '2020/12/12',
@@ -330,14 +330,13 @@ class RefundTest extends TestCase
         $client->save();
 
         $contact = ClientContact::factory()->create([
-                'user_id' => $this->user->id,
-                'client_id' => $client->id,
-                'company_id' => $this->company->id,
-                'is_primary' => 1,
-                'send_email' => true,
+            'user_id' => $this->user->id,
+            'client_id' => $client->id,
+            'company_id' => $this->company->id,
+            'is_primary' => 1,
+            'send_email' => true,
         ]);
 
-
         $this->invoice = InvoiceFactory::create($this->company->id, $this->user->id); //stub the company and user_id
         $this->invoice->client_id = $client->id;
         $this->invoice->status_id = Invoice::STATUS_SENT;
@@ -358,8 +357,8 @@ class RefundTest extends TestCase
             'client_id' => $client->hashed_id,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => $this->invoice->amount,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => $this->invoice->amount,
                 ],
             ],
             'date' => '2020/12/12',
@@ -389,8 +388,8 @@ class RefundTest extends TestCase
             'amount' => 50,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => 100,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => 100,
                 ],
             ],
             'date' => '2020/12/12',
@@ -400,9 +399,9 @@ class RefundTest extends TestCase
 
         try {
             $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/payments/refund', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/payments/refund', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
 
@@ -424,14 +423,13 @@ class RefundTest extends TestCase
         $client->save();
 
         $contact = ClientContact::factory()->create([
-                'user_id' => $this->user->id,
-                'client_id' => $client->id,
-                'company_id' => $this->company->id,
-                'is_primary' => 1,
-                'send_email' => true,
+            'user_id' => $this->user->id,
+            'client_id' => $client->id,
+            'company_id' => $this->company->id,
+            'is_primary' => 1,
+            'send_email' => true,
         ]);
 
-
         $this->invoice = InvoiceFactory::create($this->company->id, $this->user->id); //stub the company and user_id
         $this->invoice->client_id = $client->id;
         $this->invoice->status_id = Invoice::STATUS_SENT;
@@ -452,8 +450,8 @@ class RefundTest extends TestCase
             'client_id' => $client->hashed_id,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => $this->invoice->amount,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => $this->invoice->amount,
                 ],
             ],
             'date' => '2020/12/12',
@@ -498,8 +496,8 @@ class RefundTest extends TestCase
             'amount' => 50,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => $this->invoice->amount,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => $this->invoice->amount,
                 ],
             ],
             'date' => '2020/12/12',
@@ -509,9 +507,9 @@ class RefundTest extends TestCase
 
         try {
             $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/payments/refund', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/payments/refund', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
 
@@ -542,14 +540,13 @@ class RefundTest extends TestCase
         $client->save();
 
         $contact = ClientContact::factory()->create([
-                'user_id' => $this->user->id,
-                'client_id' => $client->id,
-                'company_id' => $this->company->id,
-                'is_primary' => 1,
-                'send_email' => true,
+            'user_id' => $this->user->id,
+            'client_id' => $client->id,
+            'company_id' => $this->company->id,
+            'is_primary' => 1,
+            'send_email' => true,
         ]);
 
-
         $this->invoice = InvoiceFactory::create($this->company->id, $this->user->id); //stub the company and user_id
         $this->invoice->client_id = $client->id;
         $this->invoice->status_id = Invoice::STATUS_SENT;
@@ -581,14 +578,14 @@ class RefundTest extends TestCase
             'client_id' => $client->hashed_id,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => $this->invoice->amount,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => $this->invoice->amount,
                 ],
             ],
             'credits' => [
                 [
-                'credit_id' => $this->credit->hashed_id,
-                'amount' => $this->credit->amount,
+                    'credit_id' => $this->credit->hashed_id,
+                    'amount' => $this->credit->amount,
                 ],
             ],
             'date' => '2020/12/12',
@@ -626,8 +623,8 @@ class RefundTest extends TestCase
             'amount' => 50,
             'invoices' => [
                 [
-                'invoice_id' => $this->invoice->hashed_id,
-                'amount' => $this->invoice->amount,
+                    'invoice_id' => $this->invoice->hashed_id,
+                    'amount' => $this->invoice->amount,
                 ],
             ],
             'date' => '2020/12/12',
@@ -637,9 +634,9 @@ class RefundTest extends TestCase
 
         try {
             $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/payments/refund', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/payments/refund', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             \Log::error('refund message error');
diff --git a/tests/Feature/ReminderTest.php b/tests/Feature/ReminderTest.php
index be4292249f7b..5ea9884239c6 100644
--- a/tests/Feature/ReminderTest.php
+++ b/tests/Feature/ReminderTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Jobs\Util\ReminderJob;
@@ -30,7 +31,7 @@ class ReminderTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -79,7 +80,7 @@ class ReminderTest extends TestCase
 
         $this->assertEquals(Carbon::parse($this->invoice->next_send_date)->format('Y-m-d'), Carbon::now()->addDays(7)->format('Y-m-d'));
 
-     //   ReminderJob::dispatchNow();
+        //   ReminderJob::dispatchNow();
     }
 
     public function testReminderHitsScenarioH1()
@@ -104,13 +105,12 @@ class ReminderTest extends TestCase
 
         $this->assertEquals(Carbon::parse($this->invoice->next_send_date)->format('Y-m-d'), Carbon::now()->addDays(30)->subDays(2)->format('Y-m-d'));
 
-     //   ReminderJob::dispatchNow();
+        //   ReminderJob::dispatchNow();
     }
 
     /* Cant set a reminder in the past so need to skip reminder 2 and go straigh to reminder 3*/
     public function testReminderNextSendRecalculation()
     {
-
         $this->invoice->date = now()->subDays(2)->format('Y-m-d');
         $this->invoice->due_date = now()->addDays(30)->format('Y-m-d');
         $this->invoice->reminder1_sent = now()->subDays(1)->format('Y-m-d');
@@ -136,18 +136,15 @@ class ReminderTest extends TestCase
         $this->invoice->fresh();
 
         $this->assertEquals(Carbon::parse($this->invoice->next_send_date)->format('Y-m-d'), now()->addDay()->format('Y-m-d'));
-        
     }
 
-
     public function testReminder3NextSendRecalculation()
     {
-
         $this->invoice->date = now()->subDays(3)->format('Y-m-d');
         $this->invoice->due_date = Carbon::now()->addDays(30)->format('Y-m-d');
         $this->invoice->reminder1_sent = now()->subDays(2)->format('Y-m-d');
         $this->invoice->reminder2_sent = now()->subDays(1)->format('Y-m-d');
-        
+
         $settings = $this->company->settings;
         $settings->enable_reminder1 = true;
         $settings->schedule_reminder1 = 'after_invoice_date';
@@ -164,9 +161,8 @@ class ReminderTest extends TestCase
         $this->invoice->service()->setReminder($settings)->save();
 
         $this->invoice->fresh();
-        
+
         $this->assertEquals(Carbon::parse($this->invoice->next_send_date)->format('Y-m-d'), now()->format('Y-m-d'));
-        
     }
 
     public function testReminderIsSet()
@@ -193,6 +189,4 @@ class ReminderTest extends TestCase
 
         $this->assertNotNull($this->invoice->next_send_date);
     }
-
-
 }
diff --git a/tests/Feature/ReverseInvoiceTest.php b/tests/Feature/ReverseInvoiceTest.php
index 84ccdbefcb80..491610676536 100644
--- a/tests/Feature/ReverseInvoiceTest.php
+++ b/tests/Feature/ReverseInvoiceTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Factory\CreditFactory;
@@ -35,7 +36,7 @@ class ReverseInvoiceTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Feature/Scheduler/SchedulerTest.php b/tests/Feature/Scheduler/SchedulerTest.php
index 638ed3fb1f0a..11561e0f5a49 100644
--- a/tests/Feature/Scheduler/SchedulerTest.php
+++ b/tests/Feature/Scheduler/SchedulerTest.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Tests\Feature\Scheduler;
 
 use App\Export\CSV\ClientExport;
@@ -12,9 +11,9 @@ use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Foundation\Testing\WithoutEvents;
 use Illuminate\Routing\Middleware\ThrottleRequests;
 use Illuminate\Support\Facades\Session;
+use Illuminate\Validation\ValidationException;
 use Tests\MockUnitData;
 use Tests\TestCase;
-use Illuminate\Validation\ValidationException;
 
 class SchedulerTest extends TestCase
 {
@@ -23,7 +22,7 @@ class SchedulerTest extends TestCase
     use WithoutEvents;
     // use RefreshDatabase;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -39,8 +38,7 @@ class SchedulerTest extends TestCase
             ThrottleRequests::class
         );
 
-      //   $this->withoutExceptionHandling();
-
+        //   $this->withoutExceptionHandling();
     }
 
     public function testSchedulerCantBeCreatedWithWrongData()
@@ -61,9 +59,7 @@ class SchedulerTest extends TestCase
             'X-API-TOKEN' => $this->token,
         ])->post('/api/v1/task_scheduler/', $data);
 
-
         $response->assertSessionHasErrors();
-
     }
 
     public function testSchedulerCanBeUpdated()
@@ -76,12 +72,12 @@ class SchedulerTest extends TestCase
         $scheduler = Scheduler::find($this->decodePrimaryKey($id));
 
         $updateData = [
-            'start_from' => 1655934741
+            'start_from' => 1655934741,
         ];
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->put('/api/v1/task_scheduler/' . $this->encodePrimaryKey($scheduler->id), $updateData);
+        ])->put('/api/v1/task_scheduler/'.$this->encodePrimaryKey($scheduler->id), $updateData);
 
         $responseData = $response->json();
         $this->assertEquals($updateData['start_from'], $responseData['data']['start_from']);
@@ -99,17 +95,12 @@ class SchedulerTest extends TestCase
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->get('/api/v1/task_scheduler/' . $this->encodePrimaryKey($scheduler->id));
+        ])->get('/api/v1/task_scheduler/'.$this->encodePrimaryKey($scheduler->id));
 
         $arr = $response->json();
         $this->assertEquals('create_client_report', $arr['data']['action_name']);
-
-
     }
 
-
-
-
     public function testSchedulerJobCanBeUpdated()
     {
         $response = $this->createScheduler();
@@ -124,13 +115,13 @@ class SchedulerTest extends TestCase
         $updateData = [
             'job' => Scheduler::CREATE_CREDIT_REPORT,
             'date_range' => 'all',
-            'report_keys' => ['test1']
+            'report_keys' => ['test1'],
         ];
 
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->put('/api/v1/task_scheduler/' . $this->encodePrimaryKey($scheduler->id), $updateData);
+        ])->put('/api/v1/task_scheduler/'.$this->encodePrimaryKey($scheduler->id), $updateData);
 
         $updatedSchedulerJob = Scheduler::first()->action_name;
         $arr = $response->json();
@@ -146,7 +137,7 @@ class SchedulerTest extends TestCase
             'date_key' => '123',
             'report_keys' => ['test'],
             'date_range' => 'all',
-            'start_from' => '2022-01-01'
+            'start_from' => '2022-01-01',
         ];
 
         return $response = $this->withHeaders([
diff --git a/tests/Feature/Shop/ShopInvoiceTest.php b/tests/Feature/Shop/ShopInvoiceTest.php
index b6b0e8aef28d..9bc064fd1d2f 100644
--- a/tests/Feature/Shop/ShopInvoiceTest.php
+++ b/tests/Feature/Shop/ShopInvoiceTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature\Shop;
 
 use App\Models\Product;
@@ -27,7 +28,7 @@ class ShopInvoiceTest extends TestCase
     use MakesHash;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -69,9 +70,9 @@ class ShopInvoiceTest extends TestCase
         $this->company->save();
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-COMPANY-KEY' => $this->company->company_key,
-            ])->get('/api/v1/products');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-COMPANY-KEY' => $this->company->company_key,
+        ])->get('/api/v1/products');
 
         $response->assertStatus(403);
 
@@ -100,14 +101,14 @@ class ShopInvoiceTest extends TestCase
         Product::truncate();
 
         $product = Product::factory()->create([
-                'user_id' => $this->user->id,
-                'company_id' => $this->company->id,
-            ]);
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+        ]);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-COMPANY-KEY' => $this->company->company_key,
-            ])->get('/api/v1/shop/product/'.$product->product_key);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-COMPANY-KEY' => $this->company->company_key,
+        ])->get('/api/v1/shop/product/'.$product->product_key);
 
         $response->assertStatus(200);
 
@@ -122,9 +123,9 @@ class ShopInvoiceTest extends TestCase
         $this->company->save();
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-COMPANY-KEY' => $this->company->company_key,
-            ])->get('/api/v1/shop/client/'.$this->client->contacts->first()->contact_key);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-COMPANY-KEY' => $this->company->company_key,
+        ])->get('/api/v1/shop/client/'.$this->client->contacts->first()->contact_key);
 
         $response->assertStatus(200);
         $arr = $response->json();
@@ -142,9 +143,9 @@ class ShopInvoiceTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-COMPANY-KEY' => $this->company->company_key,
-            ])->post('/api/v1/shop/clients/', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-COMPANY-KEY' => $this->company->company_key,
+        ])->postJson('/api/v1/shop/clients/', $data);
 
         $response->assertStatus(200);
         $arr = $response->json();
@@ -162,9 +163,9 @@ class ShopInvoiceTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-COMPANY-KEY' => $this->company->company_key,
-            ])->post('/api/v1/shop/clients/', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-COMPANY-KEY' => $this->company->company_key,
+        ])->postJson('/api/v1/shop/clients/', $data);
 
         $response->assertStatus(200);
         $arr = $response->json();
@@ -177,9 +178,9 @@ class ShopInvoiceTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-COMPANY-KEY' => $this->company->company_key,
-            ])->post('/api/v1/shop/invoices/', $invoice_data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-COMPANY-KEY' => $this->company->company_key,
+        ])->postJson('/api/v1/shop/invoices/', $invoice_data);
 
         $response->assertStatus(200);
         $arr = $response->json();
diff --git a/tests/Feature/SubscriptionApiTest.php b/tests/Feature/SubscriptionApiTest.php
index 229c0493de11..8cf835f9767f 100644
--- a/tests/Feature/SubscriptionApiTest.php
+++ b/tests/Feature/SubscriptionApiTest.php
@@ -6,7 +6,7 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace Tests\Feature;
@@ -35,7 +35,7 @@ class SubscriptionApiTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -60,17 +60,16 @@ class SubscriptionApiTest extends TestCase
         $billing_subscription = Subscription::factory()->create([
             'product_ids' => $product->id,
             'company_id' => $this->company->id,
-            'name' => Str::random(5)
+            'name' => Str::random(5),
         ]);
 
-
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $this->token,
-        ])->get('/api/v1/subscriptions/' . $this->encodePrimaryKey($billing_subscription->id));
-        
+        ])->get('/api/v1/subscriptions/'.$this->encodePrimaryKey($billing_subscription->id));
+
         // nlog($response);
-        
+
         $response->assertStatus(200);
     }
 
@@ -98,19 +97,19 @@ class SubscriptionApiTest extends TestCase
         ]);
 
         $response1 = $this
-            ->withHeaders(['X-API-SECRET' => config('ninja.api_secret'),'X-API-TOKEN' => $this->token])
+            ->withHeaders(['X-API-SECRET' => config('ninja.api_secret'), 'X-API-TOKEN' => $this->token])
             ->post('/api/v1/subscriptions', ['product_ids' => $product->id, 'name' => Str::random(5)])
             ->assertStatus(200)
             ->json();
 
         // try {
-            $response2 = $this
-            ->withHeaders(['X-API-SECRET' => config('ninja.api_secret'),'X-API-TOKEN' => $this->token])
-            ->put('/api/v1/subscriptions/' . $response1['data']['id'], ['allow_cancellation' => true])
+        $response2 = $this
+            ->withHeaders(['X-API-SECRET' => config('ninja.api_secret'), 'X-API-TOKEN' => $this->token])
+            ->put('/api/v1/subscriptions/'.$response1['data']['id'], ['allow_cancellation' => true])
             ->assertStatus(200)
             ->json();
-            // }catch(ValidationException $e) {
-            //    nlog($e->validator->getMessageBag());
+        // }catch(ValidationException $e) {
+        //    nlog($e->validator->getMessageBag());
         // }
 
         $this->assertNotEquals($response1['data']['allow_cancellation'], $response2['data']['allow_cancellation']);
@@ -118,7 +117,6 @@ class SubscriptionApiTest extends TestCase
 
     public function testSubscriptionDeleted()
     {
-
         $product = Product::factory()->create([
             'company_id' => $this->company->id,
             'user_id' => $this->user->id,
@@ -127,14 +125,13 @@ class SubscriptionApiTest extends TestCase
         $billing_subscription = Subscription::factory()->create([
             'product_ids' => $product->id,
             'company_id' => $this->company->id,
-            'name' => Str::random(5)
+            'name' => Str::random(5),
         ]);
 
         $response = $this
             ->withHeaders(['X-API-SECRET' => config('ninja.api_secret'), 'X-API-TOKEN' => $this->token])
-            ->delete('/api/v1/subscriptions/' . $this->encodePrimaryKey($billing_subscription->id))
+            ->delete('/api/v1/subscriptions/'.$this->encodePrimaryKey($billing_subscription->id))
             ->assertStatus(200)
             ->json();
-
     }
 }
diff --git a/tests/Feature/SystemLogApiTest.php b/tests/Feature/SystemLogApiTest.php
index 647bb5c2e58c..e91970af014f 100644
--- a/tests/Feature/SystemLogApiTest.php
+++ b/tests/Feature/SystemLogApiTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Models\SystemLog;
@@ -26,7 +27,7 @@ class SystemLogApiTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -48,9 +49,9 @@ class SystemLogApiTest extends TestCase
         SystemLog::create($sl);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/system_logs');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/system_logs');
 
         $response->assertStatus(200);
 
@@ -61,9 +62,9 @@ class SystemLogApiTest extends TestCase
         $hashed_id = $arr['data'][0]['id'];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/system_logs/'.$hashed_id);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/system_logs/'.$hashed_id);
 
         $response->assertStatus(200);
 
@@ -72,14 +73,14 @@ class SystemLogApiTest extends TestCase
         $this->assertEquals($hashed_id, $arr['data']['id']);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/system_logs/'.$hashed_id, $sl)->assertStatus(400);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/system_logs/'.$hashed_id, $sl)->assertStatus(400);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->delete('/api/v1/system_logs/'.$hashed_id)->assertStatus(400);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->delete('/api/v1/system_logs/'.$hashed_id)->assertStatus(400);
     }
 
     public function testStoreRouteFails()
diff --git a/tests/Feature/TaskApiTest.php b/tests/Feature/TaskApiTest.php
index 3b6febab8763..2343a5d562de 100644
--- a/tests/Feature/TaskApiTest.php
+++ b/tests/Feature/TaskApiTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Utils\Traits\MakesHash;
@@ -28,7 +29,7 @@ class TaskApiTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -44,8 +45,8 @@ class TaskApiTest extends TestCase
     public function testStartTask()
     {
         $log = [
-            [2,1],
-            [10,20]
+            [2, 1],
+            [10, 20],
         ];
 
         $last = end($log);
@@ -59,7 +60,6 @@ class TaskApiTest extends TestCase
 
         $this->assertEquals(3, count($log));
 
-
         //test task is started
         $last = end($log);
         $this->assertTrue($last[1] === 0);
@@ -69,22 +69,19 @@ class TaskApiTest extends TestCase
         $last[1] = time();
 
         $this->assertTrue($last[1] !== 0);
-
-
     }
 
-
     public function testTaskPost()
     {
         $data = [
-            'description' => $this->faker->firstName,
-            'number' => 'taskynumber'
+            'description' => $this->faker->firstName(),
+            'number' => 'taskynumber',
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/tasks', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/tasks', $data);
 
         $arr = $response->json();
         $response->assertStatus(200);
@@ -93,20 +90,20 @@ class TaskApiTest extends TestCase
         $this->assertLessThan(5, strlen($arr['data']['time_log']));
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/tasks/'.$arr['data']['id'], $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/tasks/'.$arr['data']['id'], $data);
 
         $response->assertStatus(200);
 
-        try{
-        $response = $this->withHeaders([
+        try {
+            $response = $this->withHeaders([
                 'X-API-SECRET' => config('ninja.api_secret'),
                 'X-API-TOKEN' => $this->token,
             ])->post('/api/v1/tasks', $data);
 
-        $arr = $response->json();
-        }catch(ValidationException $e){
+            $arr = $response->json();
+        } catch (ValidationException $e) {
             $response->assertStatus(302);
         }
 
@@ -116,68 +113,64 @@ class TaskApiTest extends TestCase
     public function testTaskPostNoDefinedTaskNumber()
     {
         $data = [
-            'description' => $this->faker->firstName,
+            'description' => $this->faker->firstName(),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/tasks', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/tasks', $data);
 
         $arr = $response->json();
         $response->assertStatus(200);
         $this->assertNotEmpty($arr['data']['number']);
     }
 
-
     public function testTaskPostWithActionStart()
     {
         $data = [
-            'description' => $this->faker->firstName,
+            'description' => $this->faker->firstName(),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/tasks?action=start', $data);
-        
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/tasks?action=start', $data);
+
         $arr = $response->json();
         $response->assertStatus(200);
-
     }
 
     public function testTaskPut()
     {
         $data = [
-            'description' => $this->faker->firstName,
+            'description' => $this->faker->firstName(),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/tasks/'.$this->encodePrimaryKey($this->task->id), $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/tasks/'.$this->encodePrimaryKey($this->task->id), $data);
 
         $response->assertStatus(200);
     }
 
-
     public function testTasksGet()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/tasks');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/tasks');
 
         $response->assertStatus(200);
     }
 
-
     public function testTaskGet()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/tasks/'.$this->encodePrimaryKey($this->task->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/tasks/'.$this->encodePrimaryKey($this->task->id));
 
         $response->assertStatus(200);
     }
@@ -185,9 +178,9 @@ class TaskApiTest extends TestCase
     public function testTaskNotArchived()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/tasks/'.$this->encodePrimaryKey($this->task->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/tasks/'.$this->encodePrimaryKey($this->task->id));
 
         $arr = $response->json();
 
@@ -201,9 +194,9 @@ class TaskApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/tasks/bulk?action=archive', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/tasks/bulk?action=archive', $data);
 
         $arr = $response->json();
 
@@ -217,9 +210,9 @@ class TaskApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/tasks/bulk?action=restore', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/tasks/bulk?action=restore', $data);
 
         $arr = $response->json();
 
@@ -233,54 +226,48 @@ class TaskApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/tasks/bulk?action=delete', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/tasks/bulk?action=delete', $data);
 
         $arr = $response->json();
 
         $this->assertTrue($arr['data'][0]['is_deleted']);
     }
 
-
     public function testTaskPostWithStartAction()
     {
         $data = [
-            'description' => $this->faker->firstName,
-            'number' => 'taskynumber2'
+            'description' => $this->faker->firstName(),
+            'number' => 'taskynumber2',
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/tasks?start=true', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/tasks?start=true', $data);
 
         $arr = $response->json();
         $response->assertStatus(200);
 
         $this->assertEquals('taskynumber2', $arr['data']['number']);
         $this->assertGreaterThan(5, strlen($arr['data']['time_log']));
-
     }
 
     public function testTaskPostWithStopAction()
     {
         $data = [
-            'description' => $this->faker->firstName,
+            'description' => $this->faker->firstName(),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/tasks?stop=true', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/tasks?stop=true', $data);
 
         $arr = $response->json();
         $response->assertStatus(200);
 
         $this->assertLessThan(5, strlen($arr['data']['time_log']));
-
     }
-
-
-
 }
diff --git a/tests/Feature/TaskStatusApiTest.php b/tests/Feature/TaskStatusApiTest.php
index 0e8a37904783..2d0e4c83c2bd 100644
--- a/tests/Feature/TaskStatusApiTest.php
+++ b/tests/Feature/TaskStatusApiTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Utils\Traits\MakesHash;
@@ -27,7 +28,7 @@ class TaskStatusApiTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -43,13 +44,13 @@ class TaskStatusApiTest extends TestCase
     public function testTaskStatusPost()
     {
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/task_statuses', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/task_statuses', $data);
 
         $response->assertStatus(200);
     }
@@ -57,13 +58,13 @@ class TaskStatusApiTest extends TestCase
     public function testTaskStatusPut()
     {
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/task_statuses/'.$this->encodePrimaryKey($this->task_status->id), $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/task_statuses/'.$this->encodePrimaryKey($this->task_status->id), $data);
 
         $response->assertStatus(200);
     }
@@ -71,9 +72,9 @@ class TaskStatusApiTest extends TestCase
     public function testTaskStatusGet()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/task_statuses/'.$this->encodePrimaryKey($this->task_status->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/task_statuses/'.$this->encodePrimaryKey($this->task_status->id));
 
         $response->assertStatus(200);
     }
@@ -81,9 +82,9 @@ class TaskStatusApiTest extends TestCase
     public function testTaskStatusNotArchived()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/task_statuses/'.$this->encodePrimaryKey($this->task_status->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/task_statuses/'.$this->encodePrimaryKey($this->task_status->id));
 
         $arr = $response->json();
 
@@ -97,9 +98,9 @@ class TaskStatusApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/task_statuses/bulk?action=archive', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/task_statuses/bulk?action=archive', $data);
 
         $arr = $response->json();
 
@@ -113,16 +114,15 @@ class TaskStatusApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/task_statuses/bulk?action=restore', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/task_statuses/bulk?action=restore', $data);
 
         $arr = $response->json();
 
         $this->assertEquals(0, $arr['data'][0]['archived_at']);
     }
 
-
     public function testTaskStatusDeletedFromDELETEROute()
     {
         // $data = [
@@ -130,13 +130,13 @@ class TaskStatusApiTest extends TestCase
         // ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->delete('/api/v1/task_statuses/'.$this->encodePrimaryKey($this->task_status->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->delete('/api/v1/task_statuses/'.$this->encodePrimaryKey($this->task_status->id));
 
         $arr = $response->json();
-// nlog($arr);
- 
+        // nlog($arr);
+
         $this->assertTrue($arr['data']['is_deleted']);
     }
 
@@ -147,9 +147,9 @@ class TaskStatusApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/task_statuses/bulk?action=delete', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/task_statuses/bulk?action=delete', $data);
 
         $arr = $response->json();
 
diff --git a/tests/Feature/TaskStatusSortOnUpdateTest.php b/tests/Feature/TaskStatusSortOnUpdateTest.php
index e40295f99723..3b1f57e5ad3a 100644
--- a/tests/Feature/TaskStatusSortOnUpdateTest.php
+++ b/tests/Feature/TaskStatusSortOnUpdateTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Models\Project;
@@ -28,7 +29,7 @@ class TaskStatusSortOnUpdateTest extends TestCase
     use MockAccountData;
     use MakesHash;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -41,7 +42,7 @@ class TaskStatusSortOnUpdateTest extends TestCase
 
     // public function testTasksSort()
     // {
-        
+
     //     $project = Project::factory()->create([
     //         'user_id' => $this->user->id,
     //         'company_id' => $this->company->id,
@@ -60,9 +61,8 @@ class TaskStatusSortOnUpdateTest extends TestCase
     //         $task->save();
     //     }
 
-
     //     $this->assertTrue($task->project()->exists());
-    //     $this->assertEquals($task->project->tasks->count(), 10);    
+    //     $this->assertEquals($task->project->tasks->count(), 10);
 
     //     $task->status_order = 1;
 
@@ -75,7 +75,6 @@ class TaskStatusSortOnUpdateTest extends TestCase
 
     //     $this->assertEquals($task->fresh()->status_order, 1);
 
-
     //     $task->status_order = 10;
 
     //     $response = $this->withHeaders([
@@ -90,5 +89,4 @@ class TaskStatusSortOnUpdateTest extends TestCase
     //     $this->assertEquals($task->fresh()->status_order, 9);
 
     // }
-
 }
diff --git a/tests/Feature/TaxRateApiTest.php b/tests/Feature/TaxRateApiTest.php
index 6aafb46014e7..cac0c642b1ac 100644
--- a/tests/Feature/TaxRateApiTest.php
+++ b/tests/Feature/TaxRateApiTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Utils\Traits\MakesHash;
@@ -28,7 +29,7 @@ class TaxRateApiTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -43,39 +44,38 @@ class TaxRateApiTest extends TestCase
 
     public function testTaxRatePost()
     {
-        $rate_name = $this->faker->firstName;
-        
+        $rate_name = $this->faker->firstName();
+
         $data = [
             'name' => $rate_name,
-            'rate' => 10
+            'rate' => 10,
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/tax_rates', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/tax_rates', $data);
 
         $arr = $response->json();
         $response->assertStatus(200);
 
         $this->assertEquals($rate_name, $arr['data']['name']);
 
-
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/tax_rates/'.$arr['data']['id'], $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/tax_rates/'.$arr['data']['id'], $data);
 
         $response->assertStatus(200);
 
-        try{
-        $response = $this->withHeaders([
+        try {
+            $response = $this->withHeaders([
                 'X-API-SECRET' => config('ninja.api_secret'),
                 'X-API-TOKEN' => $this->token,
             ])->post('/api/v1/tax_rates', $data);
 
-        $arr = $response->json();
-        }catch(ValidationException $e){
+            $arr = $response->json();
+        } catch (ValidationException $e) {
             $response->assertStatus(302);
         }
 
@@ -85,52 +85,49 @@ class TaxRateApiTest extends TestCase
     public function testTaxRatePostWithActionStart()
     {
         $data = [
-            'name' => $this->faker->firstName,
-            'rate' => rand(1,20),
+            'name' => $this->faker->firstName(),
+            'rate' => rand(1, 20),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/tax_rates', $data);
-        
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/tax_rates', $data);
+
         $arr = $response->json();
         $response->assertStatus(200);
-
     }
 
     public function testTaxRatePut()
     {
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/tax_rates/'.$this->encodePrimaryKey($this->tax_rate->id), $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/tax_rates/'.$this->encodePrimaryKey($this->tax_rate->id), $data);
 
         $response->assertStatus(200);
     }
 
-
     public function testTaxRatesGet()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/tax_rates');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/tax_rates');
 
         $response->assertStatus(200);
     }
 
-
     public function testTaxRateGet()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/tax_rates/'.$this->encodePrimaryKey($this->tax_rate->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/tax_rates/'.$this->encodePrimaryKey($this->tax_rate->id));
 
         $response->assertStatus(200);
     }
@@ -138,9 +135,9 @@ class TaxRateApiTest extends TestCase
     public function testTaxRateNotArchived()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/tax_rates/'.$this->encodePrimaryKey($this->tax_rate->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/tax_rates/'.$this->encodePrimaryKey($this->tax_rate->id));
 
         $arr = $response->json();
 
@@ -154,9 +151,9 @@ class TaxRateApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/tax_rates/bulk?action=archive', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/tax_rates/bulk?action=archive', $data);
 
         $arr = $response->json();
 
@@ -170,9 +167,9 @@ class TaxRateApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/tax_rates/bulk?action=restore', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/tax_rates/bulk?action=restore', $data);
 
         $arr = $response->json();
 
@@ -186,9 +183,9 @@ class TaxRateApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/tax_rates/bulk?action=delete', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/tax_rates/bulk?action=delete', $data);
 
         $arr = $response->json();
 
diff --git a/tests/Feature/UpdateExchangeRatesTest.php b/tests/Feature/UpdateExchangeRatesTest.php
index 10cc061464a5..3420f559ddfa 100644
--- a/tests/Feature/UpdateExchangeRatesTest.php
+++ b/tests/Feature/UpdateExchangeRatesTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Jobs\Util\UpdateExchangeRates;
@@ -31,7 +32,7 @@ class UpdateExchangeRatesTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -54,7 +55,7 @@ class UpdateExchangeRatesTest extends TestCase
 
             $currency_api = json_decode($response->getBody());
 
-            UpdateExchangeRates::dispatchNow();
+            UpdateExchangeRates::dispatchSync();
 
             $currencies = Cache::get('currencies');
 
diff --git a/tests/Feature/UpdatePaymentTest.php b/tests/Feature/UpdatePaymentTest.php
index ceccd857d1be..cc53702ed6fa 100644
--- a/tests/Feature/UpdatePaymentTest.php
+++ b/tests/Feature/UpdatePaymentTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\DataMapper\ClientSettings;
@@ -43,7 +44,7 @@ class UpdatePaymentTest extends TestCase
     use MockAccountData;
     use WithoutEvents;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -64,14 +65,13 @@ class UpdatePaymentTest extends TestCase
 
         //Create new client
         $client = Client::factory()->create([
-                'user_id' => $this->user->id,
-                'company_id' => $this->company->id,
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
         ]);
 
-
         $this->assertEquals(0, $client->balance);
         $this->assertEquals(0, $client->paid_to_date);
-        
+
         //Create Invoice
         $invoice = InvoiceFactory::create($this->company->id, $this->user->id); //stub the company and user_id
         $invoice->client_id = $client->id;
@@ -87,9 +87,8 @@ class UpdatePaymentTest extends TestCase
 
         $this->assertEquals(10, $invoice->balance);
 
-
         //create Unapplied payment via API
-        
+
         // $data = [
         //     'amount' => $this->invoice->amount,
         //     'client_id' => $client->hashed_id,
@@ -105,7 +104,7 @@ class UpdatePaymentTest extends TestCase
 
         $data = [
             'amount' => 10,
-            'client_id' => $client->hashed_id
+            'client_id' => $client->hashed_id,
         ];
 
         $response = null;
@@ -120,18 +119,16 @@ class UpdatePaymentTest extends TestCase
             $this->assertNotNull($message);
         }
 
-            // $arr = $response->json();
-            // $response->assertStatus(200);
-            // $payment_id = $arr['data']['id'];
-            // $payment = Payment::find($this->decodePrimaryKey($payment_id))->first();
-            // $payment->load('invoices');
+        // $arr = $response->json();
+        // $response->assertStatus(200);
+        // $payment_id = $arr['data']['id'];
+        // $payment = Payment::find($this->decodePrimaryKey($payment_id))->first();
+        // $payment->load('invoices');
+
+        // $this->assertNotNull($payment);
+        // $this->assertNotNull($payment->invoices());
+        // $this->assertEquals(1, $payment->invoices()->count());
 
-            // $this->assertNotNull($payment);
-            // $this->assertNotNull($payment->invoices());
-            // $this->assertEquals(1, $payment->invoices()->count());
-        
         $this->assertEquals(10, $client->fresh()->paid_to_date);
-        
     }
-
-}
\ No newline at end of file
+}
diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php
index 7dea80314b73..1766d693c324 100644
--- a/tests/Feature/UserTest.php
+++ b/tests/Feature/UserTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Factory\CompanyUserFactory;
@@ -36,7 +37,7 @@ class UserTest extends TestCase
 
     private $default_email = 'attach@gmail.com';
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -63,9 +64,9 @@ class UserTest extends TestCase
     public function testUserList()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-                'X-API-PASSWORD' => 'ALongAndBriliantPassword',
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+            'X-API-PASSWORD' => 'ALongAndBriliantPassword',
         ])->get('/api/v1/users');
 
         $response->assertStatus(200);
@@ -80,16 +81,16 @@ class UserTest extends TestCase
             'last_name' => 'you',
             'email' => 'bob1@good.ole.boys.com',
             'company_user' => [
-                    'is_admin' => false,
-                    'is_owner' => false,
-                    'permissions' => 'create_client,create_invoice',
-                ],
+                'is_admin' => false,
+                'is_owner' => false,
+                'permissions' => 'create_client,create_invoice',
+            ],
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-                'X-API-PASSWORD' => 'ALongAndBriliantPassword',
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+            'X-API-PASSWORD' => 'ALongAndBriliantPassword',
         ])->post('/api/v1/users?include=company_user', $data);
 
         $response->assertStatus(200);
@@ -101,7 +102,6 @@ class UserTest extends TestCase
 
     public function testUserAttachAndDetach()
     {
-
         $this->withoutMiddleware(PasswordProtection::class);
 
         $data = [
@@ -109,16 +109,15 @@ class UserTest extends TestCase
             'last_name' => 'Palloni',
             'email' => $this->default_email,
         ];
-        
+
         $response = false;
 
         try {
-        $response = $this->withHeaders([
+            $response = $this->withHeaders([
                 'X-API-SECRET' => config('ninja.api_secret'),
                 'X-API-TOKEN' => $this->token,
                 'X-API-PASSWORD' => 'ALongAndBriliantPassword',
-        ])->post('/api/v1/users?include=company_user', $data);
-
+            ])->post('/api/v1/users?include=company_user', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
@@ -134,9 +133,9 @@ class UserTest extends TestCase
         // $this->assertEquals($user->company_user->company_id, $this->company->id);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-                'X-API-PASSWORD' => 'ALongAndBriliantPassword',
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+            'X-API-PASSWORD' => 'ALongAndBriliantPassword',
         ])->delete('/api/v1/users/'.$arr['data']['id'].'/detach_from_company?include=company_user');
 
         $response->assertStatus(200);
@@ -146,7 +145,7 @@ class UserTest extends TestCase
         $cu = CompanyUser::whereUserId($user_id)->whereCompanyId($this->company->id)->first();
         $ct = CompanyToken::whereUserId($user_id)->whereCompanyId($this->company->id)->first();
         $user = User::find($user_id);
-        
+
         $this->assertNull($cu);
         $this->assertNull($ct);
         $this->assertNotNull($user);
@@ -182,7 +181,7 @@ class UserTest extends TestCase
             'last_name' => 'Palloni',
             'email' => $this->default_email,
         ];
-        
+
         $response = $this->withHeaders([
             'X-API-SECRET' => config('ninja.api_secret'),
             'X-API-TOKEN' => $company_token->token,
@@ -199,16 +198,16 @@ class UserTest extends TestCase
             'last_name' => 'you',
             'email' => 'bob@good.ole.boys.co2.com',
             'company_user' => [
-                    'is_admin' => false,
-                    'is_owner' => false,
-                    'permissions' => 'create_client,create_invoice',
-                ],
+                'is_admin' => false,
+                'is_owner' => false,
+                'permissions' => 'create_client,create_invoice',
+            ],
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $company_token->token,
-            ])->post('/api/v1/users?include=company_user', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $company_token->token,
+        ])->post('/api/v1/users?include=company_user', $data);
 
         $response->assertStatus(200);
 
@@ -233,17 +232,17 @@ class UserTest extends TestCase
             'last_name' => 'Morgain',
             'email' => 'bob@good.ole.boys.co2.com',
             'company_user' => [
-                    'is_admin' => true,
-                    'is_owner' => false,
-                    'permissions' => 'create_invoice,create_invoice',
-                ],
+                'is_admin' => true,
+                'is_owner' => false,
+                'permissions' => 'create_invoice,create_invoice',
+            ],
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $company_token->token,
-                'X-API-PASSWORD' => 'ALongAndBriliantPassword',
-            ])->put('/api/v1/users/'.$this->encodePrimaryKey($user->id).'?include=company_user', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $company_token->token,
+            'X-API-PASSWORD' => 'ALongAndBriliantPassword',
+        ])->put('/api/v1/users/'.$this->encodePrimaryKey($user->id).'?include=company_user', $data);
 
         $response->assertStatus(200);
 
diff --git a/tests/Feature/VendorApiTest.php b/tests/Feature/VendorApiTest.php
index ee0691504a25..38f8b1ccf700 100644
--- a/tests/Feature/VendorApiTest.php
+++ b/tests/Feature/VendorApiTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Utils\Traits\MakesHash;
@@ -28,7 +29,7 @@ class VendorApiTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -44,48 +45,13 @@ class VendorApiTest extends TestCase
     public function testAddVendorToInvoice()
     {
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/vendors', $data);
-
-        $response->assertStatus(200);
-
-        $arr = $response->json();
-        $vendor_id =$arr['data']['id'];
-
-        $data = [
-            'vendor_id' => $vendor_id,
-            'client_id' => $this->client->hashed_id   
-        ];
-
-        $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/invoices', $data);
-
-        $response->assertStatus(200);
-
-        $arr = $response->json();
-
-        $this->assertEquals($arr['data']['vendor_id'], $vendor_id);
-
-    }
-
-
-    public function testAddVendorToRecurringInvoice()
-    {
-        $data = [
-            'name' => $this->faker->firstName,
-        ];
-
-        $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/vendors', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/vendors', $data);
 
         $response->assertStatus(200);
 
@@ -95,103 +61,130 @@ class VendorApiTest extends TestCase
         $data = [
             'vendor_id' => $vendor_id,
             'client_id' => $this->client->hashed_id,
-            'frequency_id' => 1,   
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/recurring_invoices', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/invoices', $data);
 
         $response->assertStatus(200);
 
         $arr = $response->json();
 
         $this->assertEquals($arr['data']['vendor_id'], $vendor_id);
+    }
 
+    public function testAddVendorToRecurringInvoice()
+    {
+        $data = [
+            'name' => $this->faker->firstName(),
+        ];
+
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/vendors', $data);
+
+        $response->assertStatus(200);
+
+        $arr = $response->json();
+        $vendor_id = $arr['data']['id'];
+
+        $data = [
+            'vendor_id' => $vendor_id,
+            'client_id' => $this->client->hashed_id,
+            'frequency_id' => 1,
+        ];
+
+        $response = $this->withHeaders([
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/recurring_invoices', $data);
+
+        $response->assertStatus(200);
+
+        $arr = $response->json();
+
+        $this->assertEquals($arr['data']['vendor_id'], $vendor_id);
     }
 
     public function testAddVendorToQuote()
     {
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/vendors', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/vendors', $data);
 
         $response->assertStatus(200);
 
         $arr = $response->json();
-        $vendor_id =$arr['data']['id'];
+        $vendor_id = $arr['data']['id'];
 
         $data = [
             'vendor_id' => $vendor_id,
-            'client_id' => $this->client->hashed_id   
+            'client_id' => $this->client->hashed_id,
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/quotes', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/quotes', $data);
 
         $response->assertStatus(200);
 
         $arr = $response->json();
 
         $this->assertEquals($arr['data']['vendor_id'], $vendor_id);
-
     }
 
-
     public function testAddVendorToCredit()
     {
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/vendors', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/vendors', $data);
 
         $response->assertStatus(200);
 
         $arr = $response->json();
-        $vendor_id =$arr['data']['id'];
+        $vendor_id = $arr['data']['id'];
 
         $data = [
             'vendor_id' => $vendor_id,
-            'client_id' => $this->client->hashed_id   
+            'client_id' => $this->client->hashed_id,
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/credits', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/credits', $data);
 
         $response->assertStatus(200);
 
         $arr = $response->json();
 
         $this->assertEquals($arr['data']['vendor_id'], $vendor_id);
-
     }
 
-
-
     public function testVendorPost()
     {
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/vendors', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/vendors', $data);
 
         $response->assertStatus(200);
     }
@@ -199,15 +192,15 @@ class VendorApiTest extends TestCase
     public function testVendorPut()
     {
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'id_number' => 'Coolio',
-            'number' => 'wiggles'
+            'number' => 'wiggles',
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/vendors/'.$this->encodePrimaryKey($this->vendor->id), $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/vendors/'.$this->encodePrimaryKey($this->vendor->id), $data);
 
         $response->assertStatus(200);
 
@@ -217,34 +210,28 @@ class VendorApiTest extends TestCase
         $this->assertEquals('wiggles', $arr['data']['number']);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/vendors/'.$this->encodePrimaryKey($this->vendor->id), $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/vendors/'.$this->encodePrimaryKey($this->vendor->id), $data);
 
         $response->assertStatus(200);
 
-
-        try{
+        try {
             $response = $this->withHeaders([
                 'X-API-SECRET' => config('ninja.api_secret'),
                 'X-API-TOKEN' => $this->token,
             ])->post('/api/v1/vendors/', $data);
-
-
-        }catch(ValidationException $e){
-
+        } catch (ValidationException $e) {
             $response->assertStatus(302);
-
         }
-
     }
 
     public function testVendorGet()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/vendors/'.$this->encodePrimaryKey($this->vendor->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/vendors/'.$this->encodePrimaryKey($this->vendor->id));
 
         $response->assertStatus(200);
     }
@@ -252,9 +239,9 @@ class VendorApiTest extends TestCase
     public function testVendorNotArchived()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/vendors/'.$this->encodePrimaryKey($this->vendor->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/vendors/'.$this->encodePrimaryKey($this->vendor->id));
 
         $arr = $response->json();
 
@@ -268,9 +255,9 @@ class VendorApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/vendors/bulk?action=archive', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/vendors/bulk?action=archive', $data);
 
         $arr = $response->json();
 
@@ -284,9 +271,9 @@ class VendorApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/vendors/bulk?action=restore', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/vendors/bulk?action=restore', $data);
 
         $arr = $response->json();
 
@@ -300,9 +287,9 @@ class VendorApiTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/vendors/bulk?action=delete', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/vendors/bulk?action=delete', $data);
 
         $arr = $response->json();
 
diff --git a/tests/Feature/WebhookAPITest.php b/tests/Feature/WebhookAPITest.php
index 719e71303ecf..a94e194aac4d 100644
--- a/tests/Feature/WebhookAPITest.php
+++ b/tests/Feature/WebhookAPITest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Feature;
 
 use App\Utils\Traits\MakesHash;
@@ -27,7 +28,7 @@ class WebhookAPITest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -102,18 +103,18 @@ class WebhookAPITest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/webhooks/bulk?action=restore', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/webhooks/bulk?action=restore', $data);
 
         $arr = $response->json();
 
         $this->assertEquals(0, $arr['data'][0]['archived_at']);
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/webhooks/bulk?action=delete', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/webhooks/bulk?action=delete', $data);
 
         $arr = $response->json();
 
diff --git a/tests/Integration/CheckCacheTest.php b/tests/Integration/CheckCacheTest.php
index 39c3c3a5a2e2..37335c535514 100644
--- a/tests/Integration/CheckCacheTest.php
+++ b/tests/Integration/CheckCacheTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration;
 
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -23,7 +24,7 @@ class CheckCacheTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Integration/CheckLockedInvoiceValidationTest.php b/tests/Integration/CheckLockedInvoiceValidationTest.php
index 69d805250848..754904adabff 100644
--- a/tests/Integration/CheckLockedInvoiceValidationTest.php
+++ b/tests/Integration/CheckLockedInvoiceValidationTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration;
 
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -24,7 +25,7 @@ class CheckLockedInvoiceValidationTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -39,9 +40,9 @@ class CheckLockedInvoiceValidationTest extends TestCase
 
         try {
             $response = $this->withHeaders([
-                    'X-API-SECRET' => config('ninja.api_secret'),
-                    'X-API-TOKEN' => $this->token,
-                ])->put('/api/v1/invoices/'.$this->encodePrimaryKey($this->invoice->id), $invoice_update)
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->put('/api/v1/invoices/'.$this->encodePrimaryKey($this->invoice->id), $invoice_update)
                 ->assertStatus(200);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
diff --git a/tests/Integration/CheckRemindersTest.php b/tests/Integration/CheckRemindersTest.php
index a166ac1ad383..ab6478a1fdc1 100644
--- a/tests/Integration/CheckRemindersTest.php
+++ b/tests/Integration/CheckRemindersTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration;
 
 use App\Models\Invoice;
@@ -25,7 +26,7 @@ class CheckRemindersTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Integration/CompanyLedgerTest.php b/tests/Integration/CompanyLedgerTest.php
index 0cb1c2e26f49..de627c13071e 100644
--- a/tests/Integration/CompanyLedgerTest.php
+++ b/tests/Integration/CompanyLedgerTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration;
 
 use App\DataMapper\CompanySettings;
@@ -45,7 +46,7 @@ class CompanyLedgerTest extends TestCase
 
     public $account;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -132,17 +133,17 @@ class CompanyLedgerTest extends TestCase
         $company_token->save();
 
         $this->client = Client::factory()->create([
-                'user_id' => $user->id,
-                'company_id' => $this->company->id,
-            ]);
+            'user_id' => $user->id,
+            'company_id' => $this->company->id,
+        ]);
 
         ClientContact::factory()->create([
-                'user_id' => $user->id,
-                'client_id' => $this->client->id,
-                'company_id' => $this->company->id,
-                'is_primary' => 1,
-                'send_email' => true,
-            ]);
+            'user_id' => $user->id,
+            'client_id' => $this->client->id,
+            'company_id' => $this->company->id,
+            'is_primary' => 1,
+            'send_email' => true,
+        ]);
     }
 
     public function testBaseLine()
@@ -155,14 +156,14 @@ class CompanyLedgerTest extends TestCase
     public function testLedger()
     {
         $this->markTestSkipped();
-        
+
         $line_items = [];
 
         $item = [];
         $item['quantity'] = 1;
         $item['cost'] = 10;
-        $item['type_id'] = "1";
-        
+        $item['type_id'] = '1';
+
         $line_items[] = $item;
 
         $data = [
@@ -218,8 +219,8 @@ class CompanyLedgerTest extends TestCase
             'amount' => $invoice->balance,
             'invoices' => [
                 [
-                'invoice_id' => $this->encodePrimaryKey($invoice->id),
-                'amount' => $invoice->balance,
+                    'invoice_id' => $this->encodePrimaryKey($invoice->id),
+                    'amount' => $invoice->balance,
                 ],
             ],
             'date' => '2020/12/11',
@@ -227,9 +228,9 @@ class CompanyLedgerTest extends TestCase
 
         try {
             $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/payments/', $data);
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/payments/', $data);
         } catch (ValidationException $e) {
             nlog(print_r($e->validator->getMessageBag(), 1));
         }
@@ -258,8 +259,8 @@ class CompanyLedgerTest extends TestCase
             'amount' => $refund,
             'invoices' => [
                 [
-                'invoice_id' => $this->encodePrimaryKey($invoice->id),
-                'amount' => $refund,
+                    'invoice_id' => $this->encodePrimaryKey($invoice->id),
+                    'amount' => $refund,
                 ],
             ],
             'date' => '2020/12/11',
@@ -275,6 +276,5 @@ class CompanyLedgerTest extends TestCase
         $invoice = Invoice::find($invoice->id);
 
         $this->assertEquals($refund, $invoice->balance);
-
     }
 }
diff --git a/tests/Integration/ContainerTest.php b/tests/Integration/ContainerTest.php
index ef40879bd555..c125c3f17088 100644
--- a/tests/Integration/ContainerTest.php
+++ b/tests/Integration/ContainerTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration;
 
 use App\Models\Company;
@@ -21,7 +22,7 @@ class ContainerTest extends TestCase
 {
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Integration/DownloadHistoricalInvoiceTest.php b/tests/Integration/DownloadHistoricalInvoiceTest.php
index 05d23744bdfa..d72c8f84d2c0 100644
--- a/tests/Integration/DownloadHistoricalInvoiceTest.php
+++ b/tests/Integration/DownloadHistoricalInvoiceTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration;
 
 use App\Repositories\ActivityRepository;
@@ -27,7 +28,7 @@ class DownloadHistoricalInvoiceTest extends TestCase
     use DatabaseTransactions;
     use MakesHash;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -69,9 +70,9 @@ class DownloadHistoricalInvoiceTest extends TestCase
         $this->mockActivity();
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/activities/download_entity/'.$this->encodePrimaryKey($this->invoice->activities->first()->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/activities/download_entity/'.$this->encodePrimaryKey($this->invoice->activities->first()->id));
 
         $response->assertStatus(200);
     }
@@ -84,9 +85,9 @@ class DownloadHistoricalInvoiceTest extends TestCase
         $backup->forceDelete();
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/activities/download_entity/'.$this->encodePrimaryKey($this->invoice->activities->first()->id));
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/activities/download_entity/'.$this->encodePrimaryKey($this->invoice->activities->first()->id));
 
         $response->assertStatus(404);
     }
diff --git a/tests/Integration/HtmlGenerationTest.php b/tests/Integration/HtmlGenerationTest.php
index e769802df98c..36f8e8495f09 100644
--- a/tests/Integration/HtmlGenerationTest.php
+++ b/tests/Integration/HtmlGenerationTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration;
 
 use App\Models\Credit;
@@ -32,7 +33,7 @@ class HtmlGenerationTest extends TestCase
     use MockAccountData;
     use MakesHash;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -42,7 +43,7 @@ class HtmlGenerationTest extends TestCase
     public function testHtmlOutput()
     {
         $this->client->fresh();
-        
+
         $html = $this->generateHtml($this->invoice->fresh());
 
         $this->assertNotNull($html);
@@ -69,8 +70,8 @@ class HtmlGenerationTest extends TestCase
 
         if ($design->is_custom) {
             $options = [
-            'custom_partials' => json_decode(json_encode($design->design), true)
-          ];
+                'custom_partials' => json_decode(json_encode($design->design), true),
+            ];
             $template = new PdfMakerDesign(PdfDesignModel::CUSTOM, $options);
         } else {
             $template = new PdfMakerDesign(strtolower($design->name));
diff --git a/tests/Integration/InvoiceUploadTest.php b/tests/Integration/InvoiceUploadTest.php
index dee30be8e873..e0222290d355 100644
--- a/tests/Integration/InvoiceUploadTest.php
+++ b/tests/Integration/InvoiceUploadTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration;
 
 use App\Jobs\Entity\CreateEntityPdf;
@@ -24,7 +25,7 @@ class InvoiceUploadTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -33,7 +34,7 @@ class InvoiceUploadTest extends TestCase
 
     public function testInvoiceUploadWorks()
     {
-        CreateEntityPdf::dispatchNow($this->invoice->invitations->first());
+        CreateEntityPdf::dispatchSync($this->invoice->invitations->first());
 
         $this->assertNotNull($this->invoice->service()->getInvoicePdf($this->invoice->client->primary_contact()->first()));
     }
diff --git a/tests/Integration/MarkInvoicePaidTest.php b/tests/Integration/MarkInvoicePaidTest.php
index 9d500cb5db7d..c0921c0b2832 100644
--- a/tests/Integration/MarkInvoicePaidTest.php
+++ b/tests/Integration/MarkInvoicePaidTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration;
 
 use App\Models\Invoice;
@@ -23,7 +24,7 @@ class MarkInvoicePaidTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Integration/MultiDBUserTest.php b/tests/Integration/MultiDBUserTest.php
index 3fd5e263ce9e..b61c0662e6f6 100644
--- a/tests/Integration/MultiDBUserTest.php
+++ b/tests/Integration/MultiDBUserTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration;
 
 use App\Factory\CompanyUserFactory;
@@ -30,7 +31,7 @@ use Tests\TestCase;
  */
 class MultiDBUserTest extends TestCase
 {
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -74,7 +75,7 @@ class MultiDBUserTest extends TestCase
             'remember_token' => \Illuminate\Support\Str::random(10),
             'email' => 'db1@example.com',
             'oauth_user_id' => '123',
-       //     'account_id' => $account->id,
+            //     'account_id' => $account->id,
         ];
 
         $user2 = [
@@ -87,7 +88,7 @@ class MultiDBUserTest extends TestCase
             'remember_token'    => \Illuminate\Support\Str::random(10),
             'email'             => 'db2@example.com',
             'oauth_user_id'     => 'abc',
-      //      'account_id' => $account2->id,
+            //      'account_id' => $account2->id,
 
         ];
 
@@ -117,7 +118,6 @@ class MultiDBUserTest extends TestCase
             'is_admin' => true,
         ]);
 
-
         $this->token = \Illuminate\Support\Str::random(40);
 
         $this->company_token = CompanyToken::on('db-ninja-01')->create([
@@ -188,10 +188,10 @@ class MultiDBUserTest extends TestCase
             'last_name' => 'you',
             'email' => 'db2@example.com',
             'company_user' => [
-                    'is_admin' => true,
-                    'is_owner' => false,
-                    'permissions' => 'create_client,create_invoice',
-                ],
+                'is_admin' => true,
+                'is_owner' => false,
+                'permissions' => 'create_client,create_invoice',
+            ],
         ];
 
         $response = false;
@@ -244,12 +244,11 @@ class MultiDBUserTest extends TestCase
     //     }
     // }
 
-    public function tearDown() :void
+    protected function tearDown() :void
     {
         DB::connection('db-ninja-01')->table('users')->delete();
         DB::connection('db-ninja-02')->table('users')->delete();
 
         config(['database.default' => config('ninja.db.default')]);
-
     }
 }
diff --git a/tests/Integration/PaymentDrivers/AuthorizeTest.php b/tests/Integration/PaymentDrivers/AuthorizeTest.php
index 88c6f5f82706..592ef312c464 100644
--- a/tests/Integration/PaymentDrivers/AuthorizeTest.php
+++ b/tests/Integration/PaymentDrivers/AuthorizeTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration\PaymentDrivers;
 
 use net\authorize\api\contract\v1 as AnetAPI;
@@ -43,14 +44,13 @@ class AuthorizeTest extends TestCase
 
     public $customer_payment_profile = 1512424103;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
         if (! config('ninja.testvars.authorize')) {
             $this->markTestSkipped('authorize.net not configured');
         }
-
     }
 
     public function testUnpackingVars()
@@ -318,8 +318,8 @@ class AuthorizeTest extends TestCase
 
         $code = '';
         $description = '';
-        
-        if($response->getTransactionResponse()->getMessages() !== null){
+
+        if ($response->getTransactionResponse()->getMessages() !== null) {
             $code = $response->getTransactionResponse()->getMessages()[0]->getCode();
             $description = $response->getTransactionResponse()->getMessages()[0]->getDescription();
         }
@@ -331,7 +331,6 @@ class AuthorizeTest extends TestCase
             'description' => $description,
         ];
 
-
         if ($response != null) {
             if ($response->getMessages()->getResultCode() == 'Ok') {
                 $tresponse = $response->getTransactionResponse();
diff --git a/tests/Integration/PostmarkWebhookTest.php b/tests/Integration/PostmarkWebhookTest.php
index 49aee28cae24..c56996c4e8b0 100644
--- a/tests/Integration/PostmarkWebhookTest.php
+++ b/tests/Integration/PostmarkWebhookTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration;
 
 use App\Jobs\PostMark\ProcessPostmarkWebhook;
@@ -24,32 +25,32 @@ class PostmarkWebhookTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
-        if(!config('postmark.secret'))
+        if (! config('postmark.secret')) {
             $this->markTestSkipped('Postmark Secret Set');
+        }
 
         $this->makeTestData();
     }
 
     public function testDeliveryReport()
     {
-
         $invitation = $this->invoice->invitations->first();
         $invitation->message_id = '00000000-0000-0000-0000-000000000000';
         $invitation->save();
 
         $data = [
-            'RecordType' => "Delivery",
-            'ServerID' => "23",
-            'MessageStream' => "outbound",
-            'MessageID' => "00000000-0000-0000-0000-000000000000",
-            'Recipient' => "john@example.com",
+            'RecordType' => 'Delivery',
+            'ServerID' => '23',
+            'MessageStream' => 'outbound',
+            'MessageID' => '00000000-0000-0000-0000-000000000000',
+            'Recipient' => 'john@example.com',
             'Tag' => $this->company->company_key,
-            'DeliveredAt' => "2021-02-21T16:34:52Z",
-            'Details' => "Test delivery webhook details",
+            'DeliveredAt' => '2021-02-21T16:34:52Z',
+            'Details' => 'Test delivery webhook details',
         ];
 
         $response = $this->post('/api/v1/postmark_webhook', $data);
@@ -57,51 +58,47 @@ class PostmarkWebhookTest extends TestCase
         $response->assertStatus(403);
 
         $response = $this->withHeaders([
-            'X-API-SECURITY' => config('postmark.secret')
+            'X-API-SECURITY' => config('postmark.secret'),
         ])->post('/api/v1/postmark_webhook', $data);
 
         $response->assertStatus(200);
-
     }
 
     public function testDeliveryJob()
     {
-
         $invitation = $this->invoice->invitations->first();
         $invitation->message_id = '00000000-0000-0000-0000-000000000000';
         $invitation->save();
 
-        ProcessPostmarkWebhook::dispatchNow([
-            'RecordType' => "Delivery",
-            'ServerID' => "23",
-            'MessageStream' => "outbound",
-            'MessageID' => "00000000-0000-0000-0000-000000000000",
-            'Recipient' => "john@example.com",
+        ProcessPostmarkWebhook::dispatchSync([
+            'RecordType' => 'Delivery',
+            'ServerID' => '23',
+            'MessageStream' => 'outbound',
+            'MessageID' => '00000000-0000-0000-0000-000000000000',
+            'Recipient' => 'john@example.com',
             'Tag' => $this->company->company_key,
-            'DeliveredAt' => "2021-02-21T16:34:52Z",
-            'Details' => "Test delivery webhook details",
+            'DeliveredAt' => '2021-02-21T16:34:52Z',
+            'Details' => 'Test delivery webhook details',
         ]);
 
         $this->assertEquals('delivered', $invitation->fresh()->email_status);
-
     }
 
     public function testSpamReport()
     {
-
         $invitation = $this->invoice->invitations->first();
         $invitation->message_id = '00000000-0000-0000-0000-000000000001';
         $invitation->save();
 
         $data = [
-            'RecordType' => "SpamComplaint",
-            'ServerID' => "23",
-            'MessageStream' => "outbound",
-            'MessageID' => "00000000-0000-0000-0000-000000000001",
-            'Recipient' => "john@example.com",
+            'RecordType' => 'SpamComplaint',
+            'ServerID' => '23',
+            'MessageStream' => 'outbound',
+            'MessageID' => '00000000-0000-0000-0000-000000000001',
+            'Recipient' => 'john@example.com',
             'Tag' => $this->company->company_key,
-            'DeliveredAt' => "2021-02-21T16:34:52Z",
-            'Details' => "Test delivery webhook details",
+            'DeliveredAt' => '2021-02-21T16:34:52Z',
+            'Details' => 'Test delivery webhook details',
         ];
 
         $response = $this->post('/api/v1/postmark_webhook', $data);
@@ -109,33 +106,29 @@ class PostmarkWebhookTest extends TestCase
         $response->assertStatus(403);
 
         $response = $this->withHeaders([
-            'X-API-SECURITY' => config('postmark.secret')
+            'X-API-SECURITY' => config('postmark.secret'),
         ])->post('/api/v1/postmark_webhook', $data);
 
         $response->assertStatus(200);
-
     }
 
     public function testSpamJob()
     {
-
         $invitation = $this->invoice->invitations->first();
         $invitation->message_id = '00000000-0000-0000-0000-000000000001';
         $invitation->save();
 
-        ProcessPostmarkWebhook::dispatchNow([
-            'RecordType' => "SpamComplaint",
-            'ServerID' => "23",
-            'MessageStream' => "outbound",
-            'MessageID' => "00000000-0000-0000-0000-000000000001",
-            'From' => "john@example.com",
+        ProcessPostmarkWebhook::dispatchSync([
+            'RecordType' => 'SpamComplaint',
+            'ServerID' => '23',
+            'MessageStream' => 'outbound',
+            'MessageID' => '00000000-0000-0000-0000-000000000001',
+            'From' => 'john@example.com',
             'Tag' => $this->company->company_key,
-            'DeliveredAt' => "2021-02-21T16:34:52Z",
-            'Details' => "Test delivery webhook details",
+            'DeliveredAt' => '2021-02-21T16:34:52Z',
+            'Details' => 'Test delivery webhook details',
         ]);
 
         $this->assertEquals('spam', $invitation->fresh()->email_status);
-
     }
-
 }
diff --git a/tests/Integration/SendFailedEmailsTest.php b/tests/Integration/SendFailedEmailsTest.php
index f9f0050fec07..0e4e706ab1d9 100644
--- a/tests/Integration/SendFailedEmailsTest.php
+++ b/tests/Integration/SendFailedEmailsTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration;
 
 use App\Jobs\Util\SendFailedEmails;
@@ -25,7 +26,7 @@ class SendFailedEmailsTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Integration/SystemHealthTest.php b/tests/Integration/SystemHealthTest.php
index 4a2535f9af31..0805a4240078 100644
--- a/tests/Integration/SystemHealthTest.php
+++ b/tests/Integration/SystemHealthTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration;
 
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -22,7 +23,7 @@ class SystemHealthTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -32,9 +33,9 @@ class SystemHealthTest extends TestCase
     public function testSystemHealthRouteAvailable()
     {
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->get('/api/v1/health_check');
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->get('/api/v1/health_check');
 
         $response->assertStatus(200);
     }
diff --git a/tests/Integration/UniqueEmailTest.php b/tests/Integration/UniqueEmailTest.php
index 094b5dad5757..28828791579d 100644
--- a/tests/Integration/UniqueEmailTest.php
+++ b/tests/Integration/UniqueEmailTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration;
 
 use App\Http\ValidationRules\NewUniqueUserRule;
@@ -29,7 +30,7 @@ class UniqueEmailTest extends TestCase
 
     protected $rule;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -103,7 +104,7 @@ class UniqueEmailTest extends TestCase
         $this->assertTrue($this->rule->passes('email', 'nohit@example.com'));
     }
 
-    public function tearDown() :void
+    protected function tearDown() :void
     {
         DB::connection('db-ninja-01')->table('users')->delete();
         DB::connection('db-ninja-02')->table('users')->delete();
diff --git a/tests/Integration/UpdateCompanyLedgerTest.php b/tests/Integration/UpdateCompanyLedgerTest.php
index e680c1fff144..800dd026d6d2 100644
--- a/tests/Integration/UpdateCompanyLedgerTest.php
+++ b/tests/Integration/UpdateCompanyLedgerTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration;
 
 use App\Models\CompanyLedger;
@@ -21,7 +22,7 @@ class UpdateCompanyLedgerTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Integration/UpdateCompanyUserTest.php b/tests/Integration/UpdateCompanyUserTest.php
index a948215d2d3a..63c0ad09e663 100644
--- a/tests/Integration/UpdateCompanyUserTest.php
+++ b/tests/Integration/UpdateCompanyUserTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration;
 
 use App\Models\CompanyUser;
@@ -27,7 +28,7 @@ class UpdateCompanyUserTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -59,7 +60,7 @@ class UpdateCompanyUserTest extends TestCase
             $message = json_decode($e->validator->getMessageBag(), 1);
             $this->assertNotNull($message);
         }
-        
+
         $response->assertStatus(200);
 
         $arr = $response->json();
diff --git a/tests/Integration/UploadFileTest.php b/tests/Integration/UploadFileTest.php
index 19ddb3ec8080..7af89ba79e58 100644
--- a/tests/Integration/UploadFileTest.php
+++ b/tests/Integration/UploadFileTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration;
 
 use App\Jobs\Util\UploadFile;
@@ -26,7 +27,7 @@ class UploadFileTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -41,13 +42,13 @@ class UploadFileTest extends TestCase
     {
         $image = UploadedFile::fake()->image('avatar.jpg');
 
-        $document = UploadFile::dispatchNow(
+        $document = (new UploadFile(
             $image,
             UploadFile::IMAGE,
             $this->invoice->user,
             $this->invoice->company,
             $this->invoice
-        );
+        ))->handle();
 
         $this->assertNotNull($document);
     }
diff --git a/tests/Integration/UploadLogoTest.php b/tests/Integration/UploadLogoTest.php
index 28865ae25d82..1f6bcda8cbd3 100644
--- a/tests/Integration/UploadLogoTest.php
+++ b/tests/Integration/UploadLogoTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration;
 
 use App\Models\Company;
@@ -27,7 +28,7 @@ class UploadLogoTest extends TestCase
     use DatabaseTransactions;
     use MakesHash;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -46,9 +47,9 @@ class UploadLogoTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $data);
 
         $response->assertStatus(200);
 
@@ -71,9 +72,9 @@ class UploadLogoTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $data);
 
         //$acc = $response->json();
 
@@ -89,9 +90,9 @@ class UploadLogoTest extends TestCase
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->put('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->put('/api/v1/companies/'.$this->encodePrimaryKey($this->company->id), $data);
 
         $response->assertStatus(200);
     }
diff --git a/tests/Integration/Validation/AmountValidationRuleTest.php b/tests/Integration/Validation/AmountValidationRuleTest.php
index 1dc8d04444fc..5ab8fbbc5dcc 100644
--- a/tests/Integration/Validation/AmountValidationRuleTest.php
+++ b/tests/Integration/Validation/AmountValidationRuleTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Integration\Validation;
 
 use App\Http\ValidationRules\ValidAmount;
@@ -18,23 +19,21 @@ use Tests\TestCase;
  */
 class AmountValidationRuleTest extends TestCase
 {
-
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
-
     }
 
     public function testSimpleAmountValid()
     {
         $rules = [
-            'amount' => [new ValidAmount()]
+            'amount' => [new ValidAmount()],
         ];
-        
+
         $data = [
             'amount' => 1,
         ];
-        
+
         $v = $this->app['validator']->make($data, $rules);
         $this->assertTrue($v->passes());
     }
@@ -42,13 +41,13 @@ class AmountValidationRuleTest extends TestCase
     public function testInvalidAmountValid()
     {
         $rules = [
-            'amount' => [new ValidAmount()]
+            'amount' => [new ValidAmount()],
         ];
-        
+
         $data = [
-            'amount' => "aa",
+            'amount' => 'aa',
         ];
-        
+
         $v = $this->app['validator']->make($data, $rules);
         $this->assertFalse($v->passes());
     }
@@ -56,13 +55,13 @@ class AmountValidationRuleTest extends TestCase
     public function testIllegalChars()
     {
         $rules = [
-            'amount' => [new ValidAmount()]
+            'amount' => [new ValidAmount()],
         ];
-        
+
         $data = [
-            'amount' => "5+5",
+            'amount' => '5+5',
         ];
-        
+
         $v = $this->app['validator']->make($data, $rules);
         $this->assertFalse($v->passes());
     }
@@ -70,28 +69,27 @@ class AmountValidationRuleTest extends TestCase
     public function testIllegalCharsNaked()
     {
         $rules = [
-            'amount' => [new ValidAmount()]
+            'amount' => [new ValidAmount()],
         ];
-        
+
         $data = [
-            'amount' => 5+5, //resolves as 10 - but in practice, i believe this amount is wrapped in quotes so interpreted as a string
+            'amount' => 5 + 5, //resolves as 10 - but in practice, i believe this amount is wrapped in quotes so interpreted as a string
         ];
-        
+
         $v = $this->app['validator']->make($data, $rules);
         $this->assertTrue($v->passes());
     }
 
-
     public function testinValidScenario1()
     {
         $rules = [
-            'amount' => [new ValidAmount()]
+            'amount' => [new ValidAmount()],
         ];
-        
+
         $data = [
-            'amount' => "-10x",
+            'amount' => '-10x',
         ];
-        
+
         $v = $this->app['validator']->make($data, $rules);
         $this->assertFalse($v->passes());
     }
@@ -99,28 +97,27 @@ class AmountValidationRuleTest extends TestCase
     public function testValidScenario2()
     {
         $rules = [
-            'amount' => [new ValidAmount()]
+            'amount' => [new ValidAmount()],
         ];
-        
+
         $data = [
             'amount' => -10,
         ];
-        
+
         $v = $this->app['validator']->make($data, $rules);
         $this->assertTrue($v->passes());
     }
 
-
     public function testValidScenario3()
     {
         $rules = [
-            'amount' => [new ValidAmount()]
+            'amount' => [new ValidAmount()],
         ];
-        
+
         $data = [
-            'amount' => "-10",
+            'amount' => '-10',
         ];
-        
+
         $v = $this->app['validator']->make($data, $rules);
         $this->assertTrue($v->passes());
     }
@@ -128,16 +125,14 @@ class AmountValidationRuleTest extends TestCase
     public function testInValidScenario4()
     {
         $rules = [
-            'amount' => [new ValidAmount()]
+            'amount' => [new ValidAmount()],
         ];
-        
+
         $data = [
-            'amount' => "-0 1",
+            'amount' => '-0 1',
         ];
-        
+
         $v = $this->app['validator']->make($data, $rules);
         $this->assertFalse($v->passes());
-    }    
+    }
 }
-
-
diff --git a/tests/MockAccountData.php b/tests/MockAccountData.php
index 1cb37e72733a..db38a80a05a4 100644
--- a/tests/MockAccountData.php
+++ b/tests/MockAccountData.php
@@ -6,7 +6,7 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace Tests;
@@ -144,13 +144,8 @@ trait MockAccountData
     /**
      * @var
      */
-
     public $tax_rate;
 
-
-    /**
-     *
-     */
     public function makeTestData()
     {
         config(['database.default' => config('ninja.db.default')]);
@@ -183,15 +178,15 @@ trait MockAccountData
 
         $this->account = Account::factory()->create([
             'hosted_client_count' => 1000,
-            'hosted_company_count' => 1000
+            'hosted_company_count' => 1000,
         ]);
 
         $this->account->num_users = 3;
         $this->account->save();
 
         $this->company = Company::factory()->create([
-                'account_id' => $this->account->id,
-            ]);
+            'account_id' => $this->account->id,
+        ]);
 
         $this->company->client_registration_fields = ClientRegistrationFields::generate();
 
@@ -241,7 +236,7 @@ trait MockAccountData
 
         // auth()->login($user);
 
-        CreateCompanyTaskStatuses::dispatchNow($this->company, $this->user);
+        CreateCompanyTaskStatuses::dispatchSync($this->company, $this->user);
 
         $this->cu = CompanyUserFactory::create($user->id, $this->company->id, $this->account->id);
         $this->cu->is_owner = true;
@@ -264,13 +259,13 @@ trait MockAccountData
         //todo create one token with token name TOKEN - use firstOrCreate
 
         Product::factory()->create([
-                'user_id' => $user_id,
-                'company_id' => $this->company->id,
+            'user_id' => $user_id,
+            'company_id' => $this->company->id,
         ]);
 
         $this->client = Client::factory()->create([
-                'user_id' => $user_id,
-                'company_id' => $this->company->id,
+            'user_id' => $user_id,
+            'company_id' => $this->company->id,
         ]);
 
         Storage::makeDirectory($this->company->company_key.'/'.$this->client->client_hash.'/invoices', 0755, true);
@@ -278,47 +273,45 @@ trait MockAccountData
         Storage::makeDirectory($this->company->company_key.'/'.$this->client->client_hash.'/quotes', 0755, true);
 
         $contact = ClientContact::factory()->create([
-                'user_id' => $user_id,
-                'client_id' => $this->client->id,
-                'company_id' => $this->company->id,
-                'is_primary' => 1,
-                'send_email' => true,
+            'user_id' => $user_id,
+            'client_id' => $this->client->id,
+            'company_id' => $this->company->id,
+            'is_primary' => 1,
+            'send_email' => true,
         ]);
 
-
         $contact2 = ClientContact::factory()->create([
-                'user_id' => $user_id,
-                'client_id' => $this->client->id,
-                'company_id' => $this->company->id,
-                'send_email' => true,
+            'user_id' => $user_id,
+            'client_id' => $this->client->id,
+            'company_id' => $this->company->id,
+            'send_email' => true,
         ]);
 
         $this->vendor = Vendor::factory()->create([
             'user_id' => $user_id,
             'company_id' => $this->company->id,
-            'currency_id' => 1
+            'currency_id' => 1,
         ]);
 
-
         $vendor_contact = VendorContact::factory()->create([
-                'user_id' => $user_id,
-                'vendor_id' => $this->vendor->id,
-                'company_id' => $this->company->id,
-                'is_primary' => 1,
-                'send_email' => true,
+            'user_id' => $user_id,
+            'vendor_id' => $this->vendor->id,
+            'company_id' => $this->company->id,
+            'is_primary' => 1,
+            'send_email' => true,
         ]);
 
         $vendor_contact2 = VendorContact::factory()->create([
-                'user_id' => $user_id,
-                'vendor_id' => $this->vendor->id,
-                'company_id' => $this->company->id,
-                'send_email' => true,
+            'user_id' => $user_id,
+            'vendor_id' => $this->vendor->id,
+            'company_id' => $this->company->id,
+            'send_email' => true,
         ]);
 
         $this->project = Project::factory()->create([
-                'user_id' => $user_id,
-                'company_id' => $this->company->id,
-                'client_id' => $this->client->id,
+            'user_id' => $user_id,
+            'company_id' => $this->company->id,
+            'client_id' => $this->client->id,
         ]);
 
         $this->expense = Expense::factory()->create([
@@ -326,7 +319,6 @@ trait MockAccountData
             'company_id' => $this->company->id,
         ]);
 
-
         $this->recurring_expense = RecurringExpense::factory()->create([
             'user_id' => $user_id,
             'company_id' => $this->company->id,
@@ -394,30 +386,30 @@ trait MockAccountData
 
         $this->invoice->save();
 
-        $this->invoice->load("client");
+        $this->invoice->load('client');
 
         InvoiceInvitation::factory()->create([
-                'user_id' => $this->invoice->user_id,
-                'company_id' => $this->company->id,
-                'client_contact_id' => $contact->id,
-                'invoice_id' => $this->invoice->id,
-            ]);
+            'user_id' => $this->invoice->user_id,
+            'company_id' => $this->company->id,
+            'client_contact_id' => $contact->id,
+            'invoice_id' => $this->invoice->id,
+        ]);
 
         InvoiceInvitation::factory()->create([
-                'user_id' => $this->invoice->user_id,
-                'company_id' => $this->company->id,
-                'client_contact_id' => $contact2->id,
-                'invoice_id' => $this->invoice->id,
-            ]);
+            'user_id' => $this->invoice->user_id,
+            'company_id' => $this->company->id,
+            'client_contact_id' => $contact2->id,
+            'invoice_id' => $this->invoice->id,
+        ]);
 
         $this->invoice->fresh()->service()->markSent();
         // $this->invoice->service()->markSent();
 
         $this->quote = Quote::factory()->create([
-                'user_id' => $user_id,
-                'client_id' => $this->client->id,
-                'company_id' => $this->company->id,
-            ]);
+            'user_id' => $user_id,
+            'client_id' => $this->client->id,
+            'company_id' => $this->company->id,
+        ]);
 
         $this->quote->line_items = $this->buildLineItems();
         $this->quote->uses_inclusive_taxes = false;
@@ -435,18 +427,18 @@ trait MockAccountData
         //$this->quote->service()->createInvitations()->markSent();
 
         QuoteInvitation::factory()->create([
-                'user_id' => $user_id,
-                'company_id' => $this->company->id,
-                'client_contact_id' => $contact->id,
-                'quote_id' => $this->quote->id,
-            ]);
+            'user_id' => $user_id,
+            'company_id' => $this->company->id,
+            'client_contact_id' => $contact->id,
+            'quote_id' => $this->quote->id,
+        ]);
 
         QuoteInvitation::factory()->create([
-                'user_id' => $user_id,
-                'company_id' => $this->company->id,
-                'client_contact_id' => $contact2->id,
-                'quote_id' => $this->quote->id,
-            ]);
+            'user_id' => $user_id,
+            'company_id' => $this->company->id,
+            'client_contact_id' => $contact2->id,
+            'quote_id' => $this->quote->id,
+        ]);
 
         $this->quote->setRelation('client', $this->client);
         $this->quote->setRelation('company', $this->company);
@@ -470,7 +462,6 @@ trait MockAccountData
         $this->purchase_order->uses_inclusive_taxes = false;
         $this->purchase_order->save();
 
-
         PurchaseOrderInvitation::factory()->create([
             'user_id' => $user_id,
             'company_id' => $this->company->id,
@@ -478,8 +469,6 @@ trait MockAccountData
             'purchase_order_id' => $this->purchase_order->id,
         ]);
 
-
-
         $purchase_order_invitations = PurchaseOrderInvitation::whereCompanyId($this->purchase_order->company_id)
             ->wherePurchaseOrderId($this->purchase_order->id);
 
@@ -492,7 +481,6 @@ trait MockAccountData
 
         $this->purchase_order->save();
 
-
         $this->credit = CreditFactory::create($this->company->id, $user_id);
         $this->credit->client_id = $this->client->id;
 
@@ -513,7 +501,6 @@ trait MockAccountData
         $this->credit->uses_inclusive_taxes = false;
         $this->credit->save();
 
-
         $this->credit_calc = new InvoiceSum($this->credit);
         $this->credit_calc->build();
 
@@ -523,20 +510,19 @@ trait MockAccountData
         $this->credit->ledger()->updateCreditBalance($this->credit->balance)->save();
         $this->credit->number = $this->getNextCreditNumber($this->client, $this->credit);
 
+        CreditInvitation::factory()->create([
+            'user_id' => $user_id,
+            'company_id' => $this->company->id,
+            'client_contact_id' => $contact->id,
+            'credit_id' => $this->credit->id,
+        ]);
 
         CreditInvitation::factory()->create([
-                'user_id' => $user_id,
-                'company_id' => $this->company->id,
-                'client_contact_id' => $contact->id,
-                'credit_id' => $this->credit->id,
-            ]);
-
-        CreditInvitation::factory()->create([
-                'user_id' => $user_id,
-                'company_id' => $this->company->id,
-                'client_contact_id' => $contact2->id,
-                'credit_id' => $this->credit->id,
-            ]);
+            'user_id' => $user_id,
+            'company_id' => $this->company->id,
+            'client_contact_id' => $contact2->id,
+            'credit_id' => $this->credit->id,
+        ]);
 
         $invitations = CreditInvitation::whereCompanyId($this->credit->company_id)
                                         ->whereCreditId($this->credit->id);
@@ -694,7 +680,6 @@ trait MockAccountData
             $cg->save();
         }
 
-
         $this->client = $this->client->fresh();
         $this->invoice = $this->invoice->fresh();
     }
diff --git a/tests/MockUnitData.php b/tests/MockUnitData.php
index 411065293c71..4ca402d23a6c 100644
--- a/tests/MockUnitData.php
+++ b/tests/MockUnitData.php
@@ -6,7 +6,7 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace Tests;
@@ -20,6 +20,7 @@ use App\Models\ClientContact;
 use App\Models\Company;
 use App\Models\CompanyToken;
 use App\Models\User;
+
 /**
  * Class MockUnitData.
  */
@@ -41,18 +42,17 @@ trait MockUnitData
 
     public function makeTestData()
     {
-
         $this->faker = \Faker\Factory::create();
 
         $this->account = Account::factory()->create();
 
         $this->user = User::factory()->create([
-            'account_id' => $this->account->id, 
-            'email' => $this->faker->safeEmail
+            'account_id' => $this->account->id,
+            'email' => $this->faker->safeEmail(),
         ]);
 
         $this->company = Company::factory()->create([
-            'account_id' => $this->account->id
+            'account_id' => $this->account->id,
         ]);
 
         $userPermissions = collect([
@@ -76,7 +76,6 @@ trait MockUnitData
             'is_locked' => 0,
         ]);
 
-
         $this->token = \Illuminate\Support\Str::random(64);
 
         $company_token = new CompanyToken;
@@ -89,10 +88,10 @@ trait MockUnitData
         $company_token->save();
 
         $this->client = Client::factory()->create([
-            'user_id' => $this->user->id, 
-            'company_id' => $this->company->id
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
         ]);
-            
+
         $this->primary_contact = ClientContact::factory()->create([
             'user_id' => $this->user->id,
             'client_id' => $this->client->id,
@@ -105,10 +104,8 @@ trait MockUnitData
             'client_id' => $this->client->id,
             'company_id' => $this->company->id,
         ]);
-
     }
 
-
     public function buildLineItems()
     {
         $line_items = [];
@@ -120,4 +117,4 @@ trait MockUnitData
 
         return $line_items;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Pdf/PdfGenerationTest.php b/tests/Pdf/PdfGenerationTest.php
index c2f6a7f788e2..66d8e77cd5c2 100644
--- a/tests/Pdf/PdfGenerationTest.php
+++ b/tests/Pdf/PdfGenerationTest.php
@@ -7,7 +7,7 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace Tests\Pdf;
@@ -21,7 +21,7 @@ use Tests\TestCase;
  */
 class PdfGenerationTest extends TestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
     }
diff --git a/tests/Unit/AutoBillInvoiceTest.php b/tests/Unit/AutoBillInvoiceTest.php
index 667e7503bbd1..df73de11f07a 100644
--- a/tests/Unit/AutoBillInvoiceTest.php
+++ b/tests/Unit/AutoBillInvoiceTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Models\Invoice;
@@ -24,7 +25,7 @@ class AutoBillInvoiceTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -33,7 +34,6 @@ class AutoBillInvoiceTest extends TestCase
 
     public function testAutoBillFunctionality()
     {
-
         $this->assertEquals($this->client->balance, 10);
         $this->assertEquals($this->client->paid_to_date, 0);
         $this->assertEquals($this->client->credit_balance, 10);
@@ -48,13 +48,12 @@ class AutoBillInvoiceTest extends TestCase
         $this->assertEquals($this->client->fresh()->credit_balance, 0);
     }
 
-
     // public function testAutoBillSetOffFunctionality()
     // {
 
     //     $settings = $this->company->settings;
     //     $settings->use_credits_payment = 'off';
-        
+
     //     $this->company->settings = $settings;
     //     $this->company->save();
 
@@ -70,6 +69,6 @@ class AutoBillInvoiceTest extends TestCase
     //     $this->assertEquals($this->client->balance, 10);
     //     $this->assertEquals($this->client->paid_to_date, 0);
     //     $this->assertEquals($this->client->credit_balance, 10);
-    
+
     // }
 }
diff --git a/tests/Unit/Base64Test.php b/tests/Unit/Base64Test.php
index 1224f9385a8b..eb8f81fd597d 100644
--- a/tests/Unit/Base64Test.php
+++ b/tests/Unit/Base64Test.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Utils\Ninja;
@@ -24,7 +25,7 @@ class Base64Test extends TestCase
      *
      * No method can guarantee against false positives.
      */
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
     }
@@ -53,5 +54,4 @@ class Base64Test extends TestCase
     {
         $this->assertFalse(Ninja::isBase64Encoded('aaa'));
     }
-
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/BaseSettingsTest.php b/tests/Unit/BaseSettingsTest.php
index ebe04698c356..bd0dac3b9d61 100644
--- a/tests/Unit/BaseSettingsTest.php
+++ b/tests/Unit/BaseSettingsTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\DataMapper\ClientSettings;
@@ -19,7 +20,7 @@ use Tests\TestCase;
  */
 class BaseSettingsTest extends TestCase
 {
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Unit/CentConversionTest.php b/tests/Unit/CentConversionTest.php
index de1be1ef598a..ec166fd680d6 100644
--- a/tests/Unit/CentConversionTest.php
+++ b/tests/Unit/CentConversionTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\DataMapper\ClientSettings;
@@ -18,40 +19,36 @@ use Tests\TestCase;
  */
 class CentConversionTest extends TestCase
 {
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
-
     }
 
     public function testConversionOfDecimalValues()
     {
-
         $precision = 2;
 
         $amount = 10.20;
-        $amount = round(($amount * pow(10, $precision)),0);
+        $amount = round(($amount * pow(10, $precision)), 0);
 
         $this->assertEquals(1020, $amount);
 
         $amount = 2;
-        $amount = round(($amount * pow(10, $precision)),0);
+        $amount = round(($amount * pow(10, $precision)), 0);
 
         $this->assertEquals(200, $amount);
 
         $amount = 2.12;
-        $amount = round(($amount * pow(10, $precision)),0);
+        $amount = round(($amount * pow(10, $precision)), 0);
 
         $this->assertEquals(212, $amount);
     }
 
-
     public function testBcMathWay()
     {
-
         $amount = 64.99;
         $amount = bcmul($amount, 100);
-        
+
         $this->assertEquals(6499, $amount);
 
         $amount = 2;
diff --git a/tests/Unit/Chart/ChartCurrencyTest.php b/tests/Unit/Chart/ChartCurrencyTest.php
index 4578d9eba650..2f30dfd57964 100644
--- a/tests/Unit/Chart/ChartCurrencyTest.php
+++ b/tests/Unit/Chart/ChartCurrencyTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit\Chart;
 
 use App\DataMapper\ClientSettings;
@@ -28,7 +29,7 @@ class ChartCurrencyTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -37,7 +38,6 @@ class ChartCurrencyTest extends TestCase
 
     public function testRevenueValues()
     {
-
         Invoice::factory()->create([
             'client_id' => $this->client->id,
             'user_id' => $this->user->id,
@@ -46,33 +46,31 @@ class ChartCurrencyTest extends TestCase
             'status_id' => 4,
             'date' => now(),
             'due_date'=> now(),
-            'number' => 'db_record'
+            'number' => 'db_record',
         ]);
 
-        $this->assertDatabaseHas('invoices', ['number' => 'db_record']);  
+        $this->assertDatabaseHas('invoices', ['number' => 'db_record']);
 
         $cs = new ChartService($this->company);
         // nlog($cs->getRevenueQuery(now()->subDays(20)->format('Y-m-d'), now()->addDays(100)->format('Y-m-d')));
 
         $data = [
             'start_date' => now()->subDays(30)->format('Y-m-d'),
-            'end_date' => now()->addDays(100)->format('Y-m-d')
+            'end_date' => now()->addDays(100)->format('Y-m-d'),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/charts/totals', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/charts/totals', $data);
 
         $response->assertStatus(200);
-
     }
 
-
     public function testgetCurrencyCodes()
     {
         $settings = ClientSettings::defaults();
-        $settings->currency_id = "1"; //USD
+        $settings->currency_id = '1'; //USD
 
         Client::factory()->create([
             'user_id' => $this->user->id,
@@ -81,7 +79,7 @@ class ChartCurrencyTest extends TestCase
         ]);
 
         $settings = ClientSettings::defaults();
-        $settings->currency_id = "2"; //GBP
+        $settings->currency_id = '2'; //GBP
 
         Client::factory()->create([
             'user_id' => $this->user->id,
@@ -93,47 +91,44 @@ class ChartCurrencyTest extends TestCase
 
         $this->assertTrue(is_array($cs->getCurrencyCodes()));
 
-        $this->assertTrue(in_array("GBP", $cs->getCurrencyCodes()));
-        $this->assertTrue(in_array("USD", $cs->getCurrencyCodes()));
-        $this->assertFalse(in_array("AUD", $cs->getCurrencyCodes()));
+        $this->assertTrue(in_array('GBP', $cs->getCurrencyCodes()));
+        $this->assertTrue(in_array('USD', $cs->getCurrencyCodes()));
+        $this->assertFalse(in_array('AUD', $cs->getCurrencyCodes()));
     }
 
     public function testGetChartTotalsApi()
     {
-
         $data = [
             'start_date' => now()->subDays(30)->format('Y-m-d'),
-            'end_date' => now()->format('Y-m-d')
+            'end_date' => now()->format('Y-m-d'),
         ];
 
         $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-                'X-API-TOKEN' => $this->token,
-            ])->post('/api/v1/charts/totals', $data);
+            'X-API-SECRET' => config('ninja.api_secret'),
+            'X-API-TOKEN' => $this->token,
+        ])->post('/api/v1/charts/totals', $data);
 
         $response->assertStatus(200);
-
     }
 
     public function testClientServiceDataSetBuild()
     {
-
         $haystack = [
             [
-            'currency_id' => null,
-            'amount' => 10
+                'currency_id' => null,
+                'amount' => 10,
             ],
             [
-            'currency_id' => 1,
-            'amount' => 11
+                'currency_id' => 1,
+                'amount' => 11,
             ],
             [
-            'currency_id' => 2,
-            'amount' => 12
+                'currency_id' => 2,
+                'amount' => 12,
             ],
             [
-            'currency_id' => 3,
-            'amount' => 13
+                'currency_id' => 3,
+                'amount' => 13,
             ],
         ];
 
@@ -142,40 +137,38 @@ class ChartCurrencyTest extends TestCase
         // nlog($cs->totals(now()->subYears(10), now()));
 
         $this->assertTrue(is_array($cs->totals(now()->subYears(10), now())));
-
     }
 
     /* coalesces the company currency with the null currencies */
     public function testFindNullValueinArray()
     {
-
         $haystack = [
             [
-            'currency_id' => null,
-            'amount' => 10
+                'currency_id' => null,
+                'amount' => 10,
             ],
             [
-            'currency_id' => 1,
-            'amount' => 11
+                'currency_id' => 1,
+                'amount' => 11,
             ],
             [
-            'currency_id' => 2,
-            'amount' => 12
+                'currency_id' => 2,
+                'amount' => 12,
             ],
             [
-            'currency_id' => 3,
-            'amount' => 13
+                'currency_id' => 3,
+                'amount' => 13,
             ],
         ];
 
         $company_currency_id = 1;
 
-        $c_key = array_search($company_currency_id , array_column($haystack, 'currency_id')); 
+        $c_key = array_search($company_currency_id, array_column($haystack, 'currency_id'));
 
         $this->assertNotEquals($c_key, 2);
         $this->assertEquals($c_key, 1);
 
-        $key = array_search(null , array_column($haystack, 'currency_id')); 
+        $key = array_search(null, array_column($haystack, 'currency_id'));
 
         $this->assertNotEquals($key, 39);
         $this->assertEquals($key, 0);
@@ -187,15 +180,13 @@ class ChartCurrencyTest extends TestCase
         $haystack[$c_key]['amount'] += $null_currency_amount;
 
         $this->assertEquals($haystack[$c_key]['amount'], 21);
-
     }
 
-
     public function testCollectionMerging()
     {
-        $currencies = collect([1,2,3,4,5,6]);
+        $currencies = collect([1, 2, 3, 4, 5, 6]);
 
-        $expense_currencies = collect([4,5,6,7,8]);
+        $expense_currencies = collect([4, 5, 6, 7, 8]);
 
         $currencies = $currencies->merge($expense_currencies);
 
@@ -204,8 +195,5 @@ class ChartCurrencyTest extends TestCase
         $currencies = $currencies->unique();
 
         $this->assertEquals($currencies->count(), 8);
-
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/ClientSettingsTest.php b/tests/Unit/ClientSettingsTest.php
index 79fef36b7b36..f7ca65ca4eb1 100644
--- a/tests/Unit/ClientSettingsTest.php
+++ b/tests/Unit/ClientSettingsTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\DataMapper\ClientSettings;
@@ -24,7 +25,7 @@ class ClientSettingsTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -34,22 +35,20 @@ class ClientSettingsTest extends TestCase
 
     }
 
-
     public function testClientBaseline()
     {
-
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'id_number' => 'Coolio',
         ];
 
         $response = false;
 
-        try{
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/clients/', $data);
+        try {
+            $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
@@ -59,16 +58,13 @@ class ClientSettingsTest extends TestCase
 
         $arr = $response->json();
 
-        $this->assertEquals("1", $arr['data']['settings']['currency_id']);
-
+        $this->assertEquals('1', $arr['data']['settings']['currency_id']);
     }
 
-
     public function testClientValidSettings()
     {
-
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'id_number' => 'Coolio',
             'settings' => [
                 'currency_id' => '1',
@@ -76,17 +72,17 @@ class ClientSettingsTest extends TestCase
                 'payment_terms' => '1',
                 'valid_until' => '1',
                 'default_task_rate' => 10,
-                'send_reminders' => true
-            ]
+                'send_reminders' => true,
+            ],
         ];
 
         $response = false;
 
-        try{
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/clients/', $data);
+        try {
+            $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
@@ -96,52 +92,49 @@ class ClientSettingsTest extends TestCase
 
         $arr = $response->json();
 
-        $this->assertEquals("1", $arr['data']['settings']['currency_id']);
-        $this->assertEquals("1", $arr['data']['settings']['language_id']);
-        $this->assertEquals("1", $arr['data']['settings']['payment_terms']);
+        $this->assertEquals('1', $arr['data']['settings']['currency_id']);
+        $this->assertEquals('1', $arr['data']['settings']['language_id']);
+        $this->assertEquals('1', $arr['data']['settings']['payment_terms']);
         $this->assertEquals(10, $arr['data']['settings']['default_task_rate']);
         $this->assertEquals(true, $arr['data']['settings']['send_reminders']);
-        $this->assertEquals("1", $arr['data']['settings']['valid_until']);
-
+        $this->assertEquals('1', $arr['data']['settings']['valid_until']);
     }
 
     public function testClientIllegalCurrency()
     {
 
         $data = [
-            'name' => $this->faker->firstName,
-            'id_number' => 'Coolio',
+            'name' => $this->faker->firstName(),
+            'id_number' => 'Cooliox2',
             'settings' => [
                 'currency_id' => 'a',
                 'language_id' => '1',
                 'payment_terms' => '1',
-                'valid_until' => '1',
+                'valid_until' => '2',
                 'default_task_rate' => 10,
-                'send_reminders' => true
-            ]
+                'send_reminders' => true,
+            ],
         ];
 
         $response = false;
 
-        try{
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/clients/', $data);
+        try {
+            $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
         }
 
         $response->assertStatus(302);
-
     }
 
     public function testClientIllegalLanguage()
     {
-
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'id_number' => 'Coolio',
             'settings' => [
                 'currency_id' => '1',
@@ -149,31 +142,29 @@ class ClientSettingsTest extends TestCase
                 'payment_terms' => '1',
                 'valid_until' => '1',
                 'default_task_rate' => 10,
-                'send_reminders' => true
-            ]
+                'send_reminders' => true,
+            ],
         ];
 
         $response = false;
 
-        try{
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/clients/', $data);
+        try {
+            $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
         }
 
         $response->assertStatus(302);
-
     }
 
     public function testClientIllegalPaymenTerms()
     {
-
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'id_number' => 'Coolio',
             'settings' => [
                 'currency_id' => '1',
@@ -181,32 +172,29 @@ class ClientSettingsTest extends TestCase
                 'payment_terms' => 'a',
                 'valid_until' => '1',
                 'default_task_rate' => 10,
-                'send_reminders' => true
-            ]
+                'send_reminders' => true,
+            ],
         ];
 
         $response = false;
 
-        try{
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/clients/', $data);
+        try {
+            $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
         }
 
         $response->assertStatus(302);
-
     }
 
-
     public function testClientIllegalValidUntil()
     {
-
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'id_number' => 'Coolio',
             'settings' => [
                 'currency_id' => '1',
@@ -214,49 +202,47 @@ class ClientSettingsTest extends TestCase
                 'payment_terms' => '1',
                 'valid_until' => 'a',
                 'default_task_rate' => 10,
-                'send_reminders' => true
-            ]
+                'send_reminders' => true,
+            ],
         ];
 
         $response = false;
 
-        try{
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/clients/', $data);
+        try {
+            $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
         }
 
         $response->assertStatus(302);
-
     }
 
     public function testClientIllegalDefaultTaskRate()
     {
-
         $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'id_number' => 'Coolio',
             'settings' => [
                 'currency_id' => '1',
                 'language_id' => '1',
                 'payment_terms' => '1',
                 'valid_until' => '1',
-                'default_task_rate' => "a",
-                'send_reminders' => true
-            ]
+                'default_task_rate' => 'a',
+                'send_reminders' => true,
+            ],
         ];
 
         $response = false;
 
-        try{
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/clients/', $data);
+        try {
+            $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
@@ -266,72 +252,65 @@ class ClientSettingsTest extends TestCase
         $arr = $response->json();
 
         $this->assertFalse(array_key_exists('default_task_rate', $arr));
-
     }
 
     public function testClientIllegalSendReminderBool()
     {
-
         $data = [
-            'name' => $this->faker->firstName,
-            'id_number' => 'Coolio',
-            'settings' => [
-            'currency_id' => '1',
-            'language_id' => '1',
-            'payment_terms' => '1',
-            'valid_until' => '1',
-            'default_task_rate' => "a",
-            'send_reminders' => "faaalse"
-            ]
-        ];
-
-        $response = false;
-
-        try{
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/clients/', $data);
-        } catch (ValidationException $e) {
-            $message = json_decode($e->validator->getMessageBag(), 1);
-            nlog($message);
-        }
-
-        $response->assertStatus(302);
-
-    }
-
-    public function testClientSettingBools()
-    {
-
-        $data = [
-            'name' => $this->faker->firstName,
+            'name' => $this->faker->firstName(),
             'id_number' => 'Coolio',
             'settings' => [
                 'currency_id' => '1',
                 'language_id' => '1',
                 'payment_terms' => '1',
                 'valid_until' => '1',
-                'default_task_rate' => "a",
-                'send_reminders' => "true"
-            ]
+                'default_task_rate' => 'a',
+                'send_reminders' => 'faaalse',
+            ],
         ];
 
         $response = false;
 
-        try{
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->post('/api/v1/clients/', $data);
+        try {
+            $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
+        } catch (ValidationException $e) {
+            $message = json_decode($e->validator->getMessageBag(), 1);
+            nlog($message);
+        }
+
+        $response->assertStatus(302);
+    }
+
+    public function testClientSettingBools()
+    {
+        $data = [
+            'name' => $this->faker->firstName(),
+            'id_number' => 'Coolio',
+            'settings' => [
+                'currency_id' => '1',
+                'language_id' => '1',
+                'payment_terms' => '1',
+                'valid_until' => '1',
+                'default_task_rate' => 'a',
+                'send_reminders' => 'true',
+            ],
+        ];
+
+        $response = false;
+
+        try {
+            $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/clients/', $data);
         } catch (ValidationException $e) {
             $message = json_decode($e->validator->getMessageBag(), 1);
             nlog($message);
         }
 
         $response->assertStatus(200);
-
-        
     }
-
 }
diff --git a/tests/Unit/CloneQuoteToInvoiceFactoryTest.php b/tests/Unit/CloneQuoteToInvoiceFactoryTest.php
index 6b489a219a73..a3100210f786 100644
--- a/tests/Unit/CloneQuoteToInvoiceFactoryTest.php
+++ b/tests/Unit/CloneQuoteToInvoiceFactoryTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Factory\CloneQuoteToInvoiceFactory;
@@ -24,7 +25,7 @@ class CloneQuoteToInvoiceFactoryTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Unit/CollectionMergingTest.php b/tests/Unit/CollectionMergingTest.php
index 46abe5461e06..a4afd8993f8e 100644
--- a/tests/Unit/CollectionMergingTest.php
+++ b/tests/Unit/CollectionMergingTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Factory\ClientContactFactory;
@@ -21,8 +22,7 @@ use Tests\TestCase;
  */
 class CollectionMergingTest extends TestCase
 {
-
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
     }
@@ -64,55 +64,50 @@ class CollectionMergingTest extends TestCase
 
     public function testExistenceInCollection()
     {
-
         $items = InvoiceItemFactory::generate(5);
 
-        $this->assertFalse(collect($items)->contains('type_id', "3"));
+        $this->assertFalse(collect($items)->contains('type_id', '3'));
         $this->assertFalse(collect($items)->contains('type_id', 3));
 
         $item = InvoiceItemFactory::create();
-        $item->type_id = "3";
+        $item->type_id = '3';
         $items[] = $item;
 
-        $this->assertTrue(collect($items)->contains('type_id', "3"));
+        $this->assertTrue(collect($items)->contains('type_id', '3'));
         $this->assertTrue(collect($items)->contains('type_id', 3));
-
     }
 
     public function testClientContactSendEmailExists()
     {
         $new_collection = collect();
 
-        $cc = ClientContactFactory::create(1,1);
+        $cc = ClientContactFactory::create(1, 1);
         $cc->send_email = true;
 
         $new_collection->push($cc);
 
-        $cc_false = ClientContactFactory::create(1,1);
+        $cc_false = ClientContactFactory::create(1, 1);
         $cc_false->send_email = false;
 
         $new_collection->push($cc_false);
 
         $this->assertTrue($new_collection->contains('send_email', true));
-
     }
 
     public function testClientContactSendEmailDoesNotExists()
     {
         $new_collection = collect();
 
-        $cc = ClientContactFactory::create(1,1);
+        $cc = ClientContactFactory::create(1, 1);
         $cc->send_email = false;
 
         $new_collection->push($cc);
 
-        $cc_false = ClientContactFactory::create(1,1);
+        $cc_false = ClientContactFactory::create(1, 1);
         $cc_false->send_email = false;
 
         $new_collection->push($cc_false);
 
         $this->assertFalse($new_collection->contains('send_email', true));
-
     }
-
 }
diff --git a/tests/Unit/CompanyDocumentsTest.php b/tests/Unit/CompanyDocumentsTest.php
index bd5cfa3e1d72..f03bc34a6252 100644
--- a/tests/Unit/CompanyDocumentsTest.php
+++ b/tests/Unit/CompanyDocumentsTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Jobs\Util\UploadFile;
@@ -24,7 +25,7 @@ class CompanyDocumentsTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -43,13 +44,13 @@ class CompanyDocumentsTest extends TestCase
 
         $image = UploadedFile::fake()->image('avatar.jpg');
 
-        $document = UploadFile::dispatchNow(
+
+        $document = (new UploadFile(
             $image,
             UploadFile::IMAGE,
             $this->user,
             $this->company,
-            $this->invoice
-        );
+            $this->invoice))->handle();
 
         $this->assertNotNull($document);
 
diff --git a/tests/Unit/CompanySettingsSaveableTest.php b/tests/Unit/CompanySettingsSaveableTest.php
index 507151000fa3..88ced5912d93 100644
--- a/tests/Unit/CompanySettingsSaveableTest.php
+++ b/tests/Unit/CompanySettingsSaveableTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\DataMapper\CompanySettings;
@@ -19,7 +20,7 @@ use Tests\TestCase;
  */
 class CompanySettingsSaveableTest extends TestCase
 {
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
     }
diff --git a/tests/Unit/CompanySettingsTest.php b/tests/Unit/CompanySettingsTest.php
index 4201ae1fb3f7..56dc48b9a30f 100644
--- a/tests/Unit/CompanySettingsTest.php
+++ b/tests/Unit/CompanySettingsTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\DataMapper\CompanySettings;
@@ -19,7 +20,7 @@ use Tests\TestCase;
  */
 class CompanySettingsTest extends TestCase
 {
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -58,7 +59,6 @@ class CompanySettingsTest extends TestCase
 
     public function testStringEquivalence()
     {
-
         $value = (strval(4) != strval(3));
 
         $this->assertTrue($value);
@@ -85,6 +85,5 @@ class CompanySettingsTest extends TestCase
         $value = (strval('4') != strval('3'));
 
         $this->assertTrue($value);
-
     }
 }
diff --git a/tests/Unit/CompareCollectionTest.php b/tests/Unit/CompareCollectionTest.php
index 9c99d2d6de5d..f699b2c002fc 100644
--- a/tests/Unit/CompareCollectionTest.php
+++ b/tests/Unit/CompareCollectionTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use Tests\TestCase;
@@ -18,19 +19,19 @@ use Tests\TestCase;
  */
 class CompareCollectionTest extends TestCase
 {
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
         $this->map = collect([
-        ['action' => 'view_client_client_id', 'permission' => 'view_client', 'route' => 'clients.show', 'key' => 'client_id', 'name' => trans('texts.view')],
-        ['action' => 'edit_client_client_id', 'permission' => 'edit_client', 'route' => 'clients.edit', 'key' => 'client_id', 'name' => trans('texts.edit')],
-        ['action' => 'create_task_client_id', 'permission' => 'create_task', 'route' => 'task.create', 'key' => 'client_id', 'name' => trans('texts.new_task')],
-        ['action' => 'create_invoice_client_id', 'permission' => 'create_invoice', 'route' => 'invoice.create', 'key' => 'client_id', 'name' => trans('texts.new_invoice')],
-        ['action' => 'enter_payment_client_id', 'permission' => 'create_payment', 'route' => 'payment.create', 'key' => 'client_id', 'name' => trans('texts.enter_payment')],
-        ['action' => 'enter_credit_client_id', 'permission' => 'create_credit', 'route' => 'credit.create', 'key' => 'client_id', 'name' => trans('texts.enter_credit')],
-        ['action' => 'enter_expense_client_id', 'permission' => 'create_expense', 'route' => 'expense.create', 'key' => 'client_id', 'name' => trans('texts.enter_expense')],
-    ]);
+            ['action' => 'view_client_client_id', 'permission' => 'view_client', 'route' => 'clients.show', 'key' => 'client_id', 'name' => trans('texts.view')],
+            ['action' => 'edit_client_client_id', 'permission' => 'edit_client', 'route' => 'clients.edit', 'key' => 'client_id', 'name' => trans('texts.edit')],
+            ['action' => 'create_task_client_id', 'permission' => 'create_task', 'route' => 'task.create', 'key' => 'client_id', 'name' => trans('texts.new_task')],
+            ['action' => 'create_invoice_client_id', 'permission' => 'create_invoice', 'route' => 'invoice.create', 'key' => 'client_id', 'name' => trans('texts.new_invoice')],
+            ['action' => 'enter_payment_client_id', 'permission' => 'create_payment', 'route' => 'payment.create', 'key' => 'client_id', 'name' => trans('texts.enter_payment')],
+            ['action' => 'enter_credit_client_id', 'permission' => 'create_credit', 'route' => 'credit.create', 'key' => 'client_id', 'name' => trans('texts.enter_credit')],
+            ['action' => 'enter_expense_client_id', 'permission' => 'create_expense', 'route' => 'expense.create', 'key' => 'client_id', 'name' => trans('texts.enter_expense')],
+        ]);
 
         $this->view_permission = ['view_client'];
 
diff --git a/tests/Unit/CompareObjectTest.php b/tests/Unit/CompareObjectTest.php
index 9e83972cadbd..04c43b35080c 100644
--- a/tests/Unit/CompareObjectTest.php
+++ b/tests/Unit/CompareObjectTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\DataMapper\ClientSettings;
@@ -20,7 +21,7 @@ use Tests\TestCase;
  */
 class CompareObjectTest extends TestCase
 {
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Unit/CreditBalanceTest.php b/tests/Unit/CreditBalanceTest.php
index 3d1292844b17..ea780f8d5fd9 100644
--- a/tests/Unit/CreditBalanceTest.php
+++ b/tests/Unit/CreditBalanceTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Models\Account;
@@ -28,22 +29,21 @@ class CreditBalanceTest extends TestCase
     use MockUnitData;
     use AppSetup;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
-        
-        Credit::all()->each(function ($credit){
+
+        Credit::all()->each(function ($credit) {
             $credit->forceDelete();
         });
 
         $this->makeTestData();
-    
+
         $this->buildCache(true);
     }
 
     public function testCreditBalance()
     {
-
         $credit = Credit::factory()->create([
             'user_id' => $this->user->id,
             'company_id' => $this->company->id,
@@ -56,10 +56,8 @@ class CreditBalanceTest extends TestCase
         $this->assertEquals($this->client->service()->getCreditBalance(), 10);
     }
 
-
     public function testExpiredCreditBalance()
     {
-
         $credit = Credit::factory()->create([
             'user_id' => $this->user->id,
             'company_id' => $this->company->id,
@@ -71,6 +69,5 @@ class CreditBalanceTest extends TestCase
         ]);
 
         $this->assertEquals($this->client->service()->getCreditBalance(), 0);
-        
     }
 }
diff --git a/tests/Unit/CurrencyApiTest.php b/tests/Unit/CurrencyApiTest.php
index b7f607729e17..153e566b25df 100644
--- a/tests/Unit/CurrencyApiTest.php
+++ b/tests/Unit/CurrencyApiTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Libraries\Currency\Conversion\CurrencyApi;
@@ -20,7 +21,7 @@ use Tests\TestCase;
  */
 class CurrencyApiTest extends TestCase
 {
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
     }
diff --git a/tests/Unit/DatesTest.php b/tests/Unit/DatesTest.php
index 417f39fa941e..5aa3e2c40e06 100644
--- a/tests/Unit/DatesTest.php
+++ b/tests/Unit/DatesTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Helpers\Invoice\InvoiceSum;
@@ -24,12 +25,11 @@ class DatesTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
         // $this->makeTestData();
-
     }
 
     public function testDaysDiff()
@@ -42,7 +42,6 @@ class DatesTest extends TestCase
         $diff_in_days = $start_date->diffInDays($current_date);
 
         $this->assertEquals(19, $diff_in_days);
-
     }
 
     public function testDiffInDaysRange()
@@ -61,7 +60,6 @@ class DatesTest extends TestCase
         $date_in_future = Carbon::parse('2020-01-16');
 
         $this->assertTrue($date_in_future->gt(Carbon::parse($date_in_past)->addDays(14)));
-
     }
 
     public function testThirteenteenDaysFromNow()
@@ -71,6 +69,5 @@ class DatesTest extends TestCase
         $date_in_future = Carbon::parse('2020-01-15');
 
         $this->assertFalse($date_in_future->gt(Carbon::parse($date_in_past)->addDays(14)));
-
     }
 }
diff --git a/tests/Unit/EncryptionSettingsTest.php b/tests/Unit/EncryptionSettingsTest.php
index 668cb8f39aa5..478d549f5713 100644
--- a/tests/Unit/EncryptionSettingsTest.php
+++ b/tests/Unit/EncryptionSettingsTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use Tests\TestCase;
@@ -17,7 +18,7 @@ use Tests\TestCase;
  */
 class EncryptionSettingsTest extends TestCase
 {
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Unit/EntityTest.php b/tests/Unit/EntityTest.php
index c5221d08e8aa..99076e906109 100644
--- a/tests/Unit/EntityTest.php
+++ b/tests/Unit/EntityTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Helpers\Invoice\InvoiceSum;
@@ -29,7 +30,7 @@ class EntityTest extends TestCase
 
     public $settings;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Unit/EntityTranslationTest.php b/tests/Unit/EntityTranslationTest.php
index 54ad6619a599..82a1cc12738a 100644
--- a/tests/Unit/EntityTranslationTest.php
+++ b/tests/Unit/EntityTranslationTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Models\Account;
@@ -35,36 +36,34 @@ use Tests\TestCase;
  */
 class EntityTranslationTest extends TestCase
 {
-
     public $faker;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
-         $this->faker = \Faker\Factory::create();
+        $this->faker = \Faker\Factory::create();
     }
 
     public function testTranslations()
     {
         $account = Account::factory()->create([
             'hosted_client_count' => 1000,
-            'hosted_company_count' => 1000
+            'hosted_company_count' => 1000,
         ]);
-        
-        
+
         $company = Company::factory()->create([
-                'account_id' => $account->id,
-            ]);
+            'account_id' => $account->id,
+        ]);
 
         $u = User::factory()->create([
-            'email' => $this->faker->email,
-            'account_id' => $account->id
+            'email' => $this->faker->email(),
+            'account_id' => $account->id,
         ]);
 
         $client = Client::factory()->create([
             'company_id' => $company->id,
-            'user_id' => $u->id
+            'user_id' => $u->id,
         ]);
 
         $credit = Credit::factory()->create([
@@ -90,7 +89,7 @@ class EntityTranslationTest extends TestCase
             'user_id' => $u->id,
             'client_id' => $client->id,
         ]);
-        
+
         $product = Product::factory()->create([
             'company_id' => $company->id,
             'user_id' => $u->id,
@@ -118,24 +117,24 @@ class EntityTranslationTest extends TestCase
             'company_id' => $company->id,
             'user_id' => $u->id,
             'client_id' => $client->id,
-        ]);        
+        ]);
 
         $recurring_quote = RecurringQuote::factory()->create([
             'company_id' => $company->id,
             'user_id' => $u->id,
             'client_id' => $client->id,
-        ]);  
+        ]);
 
         $task = Task::factory()->create([
             'company_id' => $company->id,
             'user_id' => $u->id,
             'client_id' => $client->id,
-        ]);  
+        ]);
 
         $vendor = Vendor::factory()->create([
             'company_id' => $company->id,
             'user_id' => $u->id,
-        ]);          
+        ]);
 
         $this->assertEquals(ctrans('texts.user'), $u->translate_entity());
         $this->assertEquals(ctrans('texts.company'), $company->translate_entity());
@@ -153,5 +152,4 @@ class EntityTranslationTest extends TestCase
         $this->assertEquals(ctrans('texts.task'), $task->translate_entity());
         $this->assertEquals(ctrans('texts.vendor'), $vendor->translate_entity());
     }
-
 }
diff --git a/tests/Unit/EvaluateStringTest.php b/tests/Unit/EvaluateStringTest.php
index 23c16be810ff..d7d61e67f0c8 100644
--- a/tests/Unit/EvaluateStringTest.php
+++ b/tests/Unit/EvaluateStringTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Models\Client;
diff --git a/tests/Unit/FactoryCreationTest.php b/tests/Unit/FactoryCreationTest.php
index acbad3e99d55..639799c9e290 100644
--- a/tests/Unit/FactoryCreationTest.php
+++ b/tests/Unit/FactoryCreationTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Factory\ClientFactory;
@@ -32,7 +33,7 @@ class FactoryCreationTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -141,7 +142,7 @@ class FactoryCreationTest extends TestCase
     public function testUserCreate()
     {
         $new_user = UserFactory::create($this->account->id);
-        $new_user->email = $this->faker->freeEmail;
+        $new_user->email = $this->faker->freeEmail();
         $new_user->save();
 
         $this->assertNotNull($new_user);
diff --git a/tests/Unit/GeneratesConvertedQuoteCounterTest.php b/tests/Unit/GeneratesConvertedQuoteCounterTest.php
index c10827f94dc9..5c6e701b3f28 100644
--- a/tests/Unit/GeneratesConvertedQuoteCounterTest.php
+++ b/tests/Unit/GeneratesConvertedQuoteCounterTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\DataMapper\ClientSettings;
@@ -42,24 +43,22 @@ class GeneratesConvertedQuoteCounterTest extends TestCase
     use DatabaseTransactions;
     use MakesHash;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
         Session::start();
         $this->faker = \Faker\Factory::create();
         Model::reguard();
-
     }
 
     public function testCounterExtraction()
     {
-
         $this->account = Account::factory()->create([
             'hosted_client_count' => 1000,
-            'hosted_company_count' => 1000
+            'hosted_company_count' => 1000,
         ]);
-        
+
         $this->account->num_users = 3;
         $this->account->save();
 
@@ -74,22 +73,22 @@ class GeneratesConvertedQuoteCounterTest extends TestCase
         }
 
         $user_id = $user->id;
-        
+
         $this->company = Company::factory()->create([
-                'account_id' => $this->account->id,
-            ]);
+            'account_id' => $this->account->id,
+        ]);
 
         $this->client = Client::factory()->create([
-                'user_id' => $user_id,
-                'company_id' => $this->company->id,
+            'user_id' => $user_id,
+            'company_id' => $this->company->id,
         ]);
 
         $contact = ClientContact::factory()->create([
-                'user_id' => $user_id,
-                'client_id' => $this->client->id,
-                'company_id' => $this->company->id,
-                'is_primary' => 1,
-                'send_email' => true,
+            'user_id' => $user_id,
+            'client_id' => $this->client->id,
+            'company_id' => $this->company->id,
+            'is_primary' => 1,
+            'send_email' => true,
         ]);
 
         $settings = $this->client->getMergedSettings();
@@ -105,9 +104,9 @@ class GeneratesConvertedQuoteCounterTest extends TestCase
         $this->client->save();
 
         $quote = Quote::factory()->create([
-            'user_id' => $this->client->user_id, 
-            'company_id' => $this->client->company_id, 
-            'client_id' => $this->client->id
+            'user_id' => $this->client->user_id,
+            'company_id' => $this->client->company_id,
+            'client_id' => $this->client->id,
         ]);
 
         $quote = $quote->service()->markSent()->convert()->save();
@@ -119,7 +118,6 @@ class GeneratesConvertedQuoteCounterTest extends TestCase
         $this->assertEquals('2022-Q0001', $quote->number);
         $this->assertEquals('2022-I0001', $invoice->number);
 
-
         $settings = $this->client->getMergedSettings();
         $settings->invoice_number_counter = 100;
         $settings->invoice_number_pattern = 'I{$counter}';
@@ -133,9 +131,9 @@ class GeneratesConvertedQuoteCounterTest extends TestCase
         $this->client->save();
 
         $quote = Quote::factory()->create([
-            'user_id' => $this->client->user_id, 
-            'company_id' => $this->client->company_id, 
-            'client_id' => $this->client->id
+            'user_id' => $this->client->user_id,
+            'company_id' => $this->client->company_id,
+            'client_id' => $this->client->id,
         ]);
 
         $quote = $quote->service()->markSent()->convert()->save();
@@ -146,8 +144,5 @@ class GeneratesConvertedQuoteCounterTest extends TestCase
 
         $this->assertEquals('Q0100', $quote->number);
         $this->assertEquals('I0100', $invoice->number);
-
     }
-
-
 }
diff --git a/tests/Unit/GeneratesCounterTest.php b/tests/Unit/GeneratesCounterTest.php
index b988de84647a..cf5de6224436 100644
--- a/tests/Unit/GeneratesCounterTest.php
+++ b/tests/Unit/GeneratesCounterTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\DataMapper\ClientSettings;
@@ -40,7 +41,7 @@ class GeneratesCounterTest extends TestCase
     use MakesHash;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -67,13 +68,13 @@ class GeneratesCounterTest extends TestCase
         $this->client->save();
 
         $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
-        $this->assertEquals($date_formatted."-0001", $invoice_number);
+        $this->assertEquals($date_formatted.'-0001', $invoice_number);
         $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
-        $this->assertEquals($date_formatted."-0002", $invoice_number);
+        $this->assertEquals($date_formatted.'-0002', $invoice_number);
         $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
-        $this->assertEquals($date_formatted."-0003", $invoice_number);
+        $this->assertEquals($date_formatted.'-0003', $invoice_number);
         $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
-        $this->assertEquals($date_formatted."-0004", $invoice_number);
+        $this->assertEquals($date_formatted.'-0004', $invoice_number);
 
         $settings->reset_counter_date = now($timezone->name)->format('Y-m-d');
         $settings->reset_counter_frequency_id = RecurringInvoice::FREQUENCY_DAILY;
@@ -82,15 +83,15 @@ class GeneratesCounterTest extends TestCase
 
         $this->client->settings = $settings;
         $this->client->save();
-        
+
         $this->travel(5)->days();
         $date_formatted = now($timezone->name)->format('Ymd');
 
         $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
-        $this->assertEquals($date_formatted."-0001", $invoice_number);
-        
+        $this->assertEquals($date_formatted.'-0001', $invoice_number);
+
         $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
-        $this->assertEquals($date_formatted."-0002", $invoice_number);
+        $this->assertEquals($date_formatted.'-0002', $invoice_number);
 
         $settings->reset_counter_date = now($timezone->name)->format('Y-m-d');
         $settings->reset_counter_frequency_id = RecurringInvoice::FREQUENCY_DAILY;
@@ -101,15 +102,14 @@ class GeneratesCounterTest extends TestCase
         $date_formatted = now($timezone->name)->format('Ymd');
 
         $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
-        $this->assertEquals($date_formatted."-0001", $invoice_number);
+        $this->assertEquals($date_formatted.'-0001', $invoice_number);
 
         $this->travelBack();
-
     }
 
     public function testHasSharedCounter()
     {
-        $this->assertFalse($this->hasSharedCounter($this->client,));
+        $this->assertFalse($this->hasSharedCounter($this->client, ));
     }
 
     public function testHasTrueSharedCounter()
@@ -148,7 +148,6 @@ class GeneratesCounterTest extends TestCase
         $invoice_number = $this->getNextInvoiceNumber($this->client, $this->invoice);
 
         $this->assertEquals('test-0001', $invoice_number);
-
     }
 
     public function testNoCounterBeingSpecifiedInCounterStringWithFix()
@@ -167,13 +166,10 @@ class GeneratesCounterTest extends TestCase
         $invoice_number = $this->getNextInvoiceNumber($this->client, $this->invoice);
 
         $this->assertEquals('test-0100', $invoice_number);
-
     }
 
-
     public function testInvoiceNumberValue()
     {
-
         $invoice_number = $this->getNextInvoiceNumber($this->client->fresh(), $this->invoice->fresh());
 
         $this->assertEquals($invoice_number, '0002');
@@ -186,21 +182,18 @@ class GeneratesCounterTest extends TestCase
     public function testQuoteNumberValue()
     {
         $quote = Quote::factory()->create([
-            'user_id' => $this->client->user_id, 
-            'company_id' => $this->client->company_id, 
-            'client_id' => $this->client->id
+            'user_id' => $this->client->user_id,
+            'company_id' => $this->client->company_id,
+            'client_id' => $this->client->id,
         ]);
 
         $quote_number = $this->getNextQuoteNumber($this->client->fresh(), $quote);
 
         $this->assertEquals($quote_number, 0002);
-
-
     }
 
     public function testInvoiceNumberPattern()
     {
-
         $settings = $this->client->company->settings;
         $settings->invoice_number_counter = 1;
         $settings->invoice_number_pattern = '{$year}-{$counter}';
@@ -234,12 +227,11 @@ class GeneratesCounterTest extends TestCase
         $this->client->fresh();
 
         $quote = Quote::factory()->create([
-            'user_id' => $this->client->user_id, 
-            'company_id' => $this->client->company_id, 
-            'client_id' => $this->client->id
+            'user_id' => $this->client->user_id,
+            'company_id' => $this->client->company_id,
+            'client_id' => $this->client->id,
         ]);
 
-
         $quote_number = $this->getNextQuoteNumber($this->client, $quote);
         $quote_number2 = $this->getNextQuoteNumber($this->client, $quote);
 
@@ -264,9 +256,9 @@ class GeneratesCounterTest extends TestCase
         $gs->save();
 
         $quote = Quote::factory()->create([
-            'user_id' => $this->client->user_id, 
-            'company_id' => $this->client->company_id, 
-            'client_id' => $this->client->id
+            'user_id' => $this->client->user_id,
+            'company_id' => $this->client->company_id,
+            'client_id' => $this->client->id,
         ]);
 
         $quote_number = $this->getNextQuoteNumber($this->client, $quote);
@@ -426,7 +418,6 @@ class GeneratesCounterTest extends TestCase
         $this->assertEquals($vendor_number, date('Y').'-'.str_pad($vendor->user_id, 2, '0', STR_PAD_LEFT).'-0002');
     }
 
-
     /*
 
         public function testClientNextNumber()
diff --git a/tests/Unit/GoogleAnalyticsTest.php b/tests/Unit/GoogleAnalyticsTest.php
index 6c9f8a4ea7e7..0f2991f5971b 100644
--- a/tests/Unit/GoogleAnalyticsTest.php
+++ b/tests/Unit/GoogleAnalyticsTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Utils\Ninja;
@@ -24,7 +25,7 @@ class GoogleAnalyticsTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Unit/GroupSettingsTest.php b/tests/Unit/GroupSettingsTest.php
index 05ffa3a4b063..6dd5b662eba0 100644
--- a/tests/Unit/GroupSettingsTest.php
+++ b/tests/Unit/GroupSettingsTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\DataMapper\ClientSettings;
@@ -27,7 +28,7 @@ class GroupSettingsTest extends TestCase
     use DatabaseTransactions;
     use ClientGroupSettingsSaver;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Unit/GroupTest.php b/tests/Unit/GroupTest.php
index e7b9f7d23a5a..abeb06282620 100644
--- a/tests/Unit/GroupTest.php
+++ b/tests/Unit/GroupTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\DataMapper\ClientSettings;
@@ -19,7 +20,7 @@ use Tests\TestCase;
  */
 class GroupTest extends TestCase
 {
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Unit/HelpersTest.php b/tests/Unit/HelpersTest.php
index 99107d0b3220..c12bc8835306 100644
--- a/tests/Unit/HelpersTest.php
+++ b/tests/Unit/HelpersTest.php
@@ -7,7 +7,7 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace Tests\Unit;
diff --git a/tests/Unit/InvitationTest.php b/tests/Unit/InvitationTest.php
index 7cc7297d2f4a..08a84ee35ef0 100644
--- a/tests/Unit/InvitationTest.php
+++ b/tests/Unit/InvitationTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Factory\InvoiceInvitationFactory;
@@ -24,8 +25,8 @@ class InvitationTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
     use MakesHash;
-    
-    public function setUp() :void
+
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -36,12 +37,10 @@ class InvitationTest extends TestCase
         );
 
         $this->withoutExceptionHandling();
-
     }
 
     public function testInvitationSanity()
     {
-        
         $this->assertEquals($this->invoice->invitations->count(), 2);
 
         $invitations = $this->invoice->invitations()->get();
@@ -59,13 +58,11 @@ class InvitationTest extends TestCase
         $response = null;
 
         try {
-
-        $response = $this->withHeaders([
-            'X-API-SECRET' => config('ninja.api_secret'),
-            'X-API-TOKEN' => $this->token,
-        ])->put('/api/v1/invoices/'.$this->encodePrimaryKey($this->invoice->id), $this->invoice->toArray());
+            $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->put('/api/v1/invoices/'.$this->encodePrimaryKey($this->invoice->id), $this->invoice->toArray());
         } catch (ValidationException $e) {
-
             nlog($e->getMessage());
         }
 
diff --git a/tests/Unit/InvoiceActionsTest.php b/tests/Unit/InvoiceActionsTest.php
index 351392d05032..68e17ada0aa2 100644
--- a/tests/Unit/InvoiceActionsTest.php
+++ b/tests/Unit/InvoiceActionsTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Factory\PaymentFactory;
@@ -26,7 +27,7 @@ class InvoiceActionsTest extends TestCase
     use DatabaseTransactions;
     use ActionsInvoice;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Unit/InvoiceInclusiveTest.php b/tests/Unit/InvoiceInclusiveTest.php
index 27c2b9157e7f..e4b6b5d870d8 100644
--- a/tests/Unit/InvoiceInclusiveTest.php
+++ b/tests/Unit/InvoiceInclusiveTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Factory\InvoiceItemFactory;
@@ -31,7 +32,7 @@ class InvoiceInclusiveTest extends TestCase
 
     public $settings;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -275,9 +276,9 @@ class InvoiceInclusiveTest extends TestCase
         $this->assertEquals($this->invoice_calc->getSubTotal(), 19);
         $this->assertEquals($this->invoice_calc->getTotalDiscount(), 0.95);
         $this->assertEquals($this->invoice_calc->getTotalTaxes(), 4.92);
-        
+
         // nlog($this->invoice_calc->getTaxMap());
-        
+
         $this->assertEquals(count($this->invoice_calc->getTaxMap()), 1);
         $this->assertEquals($this->invoice_calc->getTotal(), 18.05);
         $this->assertEquals($this->invoice_calc->getBalance(), 18.05);
diff --git a/tests/Unit/InvoiceItemInclusiveTest.php b/tests/Unit/InvoiceItemInclusiveTest.php
index e0e85d53d3e9..9811bd2a9b09 100644
--- a/tests/Unit/InvoiceItemInclusiveTest.php
+++ b/tests/Unit/InvoiceItemInclusiveTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Factory\InvoiceItemFactory;
@@ -25,7 +26,7 @@ class InvoiceItemInclusiveTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Unit/InvoiceItemTest.php b/tests/Unit/InvoiceItemTest.php
index 8261b30525e4..802c825531cc 100644
--- a/tests/Unit/InvoiceItemTest.php
+++ b/tests/Unit/InvoiceItemTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Factory\InvoiceItemFactory;
@@ -25,7 +26,7 @@ class InvoiceItemTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -72,8 +73,6 @@ class InvoiceItemTest extends TestCase
         $this->assertEquals($item_calc->getGrossLineTotal(), 11);
     }
 
-
-
     public function testInvoiceItemTotalSimpleWithDiscount()
     {
         $item = InvoiceItemFactory::create();
@@ -114,8 +113,7 @@ class InvoiceItemTest extends TestCase
 
         $this->assertEquals($item_calc->getLineTotal(), 8);
         $this->assertEquals($item_calc->getGrossLineTotal(), 8.8);
-
-    }    
+    }
 
     public function testInvoiceItemTotalSimpleWithDiscountWithPrecision()
     {
@@ -208,9 +206,9 @@ class InvoiceItemTest extends TestCase
         $item->cost = 10;
         $item->is_amount_discount = true;
         $item->discount = 2.521254522145214511;
-        $item->tax_name1 = "GST";
+        $item->tax_name1 = 'GST';
         $item->tax_rate1 = 10;
-        $item->tax_name2 = "VAT";
+        $item->tax_name2 = 'VAT';
         $item->tax_rate2 = 17.5;
 
         $this->invoice->line_items = [$item];
diff --git a/tests/Unit/InvoiceItemV2Test.php b/tests/Unit/InvoiceItemV2Test.php
index 28cd71e4add3..d9ad75db669c 100644
--- a/tests/Unit/InvoiceItemV2Test.php
+++ b/tests/Unit/InvoiceItemV2Test.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Factory\InvoiceItemFactory;
@@ -25,7 +26,7 @@ class InvoiceItemV2Test extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Unit/InvoiceStatusTest.php b/tests/Unit/InvoiceStatusTest.php
index 1ea941f0c7d2..90d9000492fa 100644
--- a/tests/Unit/InvoiceStatusTest.php
+++ b/tests/Unit/InvoiceStatusTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Factory\InvoiceItemFactory;
@@ -32,12 +33,11 @@ class InvoiceStatusTest extends TestCase
 
     public $settings;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
         $this->makeTestData();
-
     }
 
     public function testSentStatus()
diff --git a/tests/Unit/InvoiceTest.php b/tests/Unit/InvoiceTest.php
index 7be9776c6cf0..aff6437a5395 100644
--- a/tests/Unit/InvoiceTest.php
+++ b/tests/Unit/InvoiceTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Factory\InvoiceItemFactory;
@@ -32,7 +33,7 @@ class InvoiceTest extends TestCase
 
     public $settings;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -223,6 +224,4 @@ class InvoiceTest extends TestCase
         //$this->assertEquals($this->invoice_calc->getTotalTaxes(), 4);
         //$this->assertEquals(count($this->invoice_calc->getTaxMap()), 1);
     }
-
-
 }
diff --git a/tests/Unit/MakesDatesTest.php b/tests/Unit/MakesDatesTest.php
index 1823bff1e2d2..fa3f5a2007a6 100644
--- a/tests/Unit/MakesDatesTest.php
+++ b/tests/Unit/MakesDatesTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Utils\Traits\MakesDates;
diff --git a/tests/Unit/MakesInvoiceValuesTest.php b/tests/Unit/MakesInvoiceValuesTest.php
index 1d4499f1d337..fd8c5d1c7445 100644
--- a/tests/Unit/MakesInvoiceValuesTest.php
+++ b/tests/Unit/MakesInvoiceValuesTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use Tests\TestCase;
diff --git a/tests/Unit/Migration/FeesAndLimitsTest.php b/tests/Unit/Migration/FeesAndLimitsTest.php
index 94b8733943d1..7201439d387d 100644
--- a/tests/Unit/Migration/FeesAndLimitsTest.php
+++ b/tests/Unit/Migration/FeesAndLimitsTest.php
@@ -6,7 +6,7 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace Tests\Unit\Migration;
@@ -17,7 +17,7 @@ use Tests\TestCase;
 
 class FeesAndLimitsTest extends TestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
     }
@@ -36,7 +36,7 @@ class FeesAndLimitsTest extends TestCase
         $data['fee_tax_name3'] = '';
         $data['fee_tax_rate3'] = 0;
         $data['fee_cap'] = 0;
-        
+
         $fees_and_limits_array = [];
         $fees_and_limits_array[] = $data;
 
diff --git a/tests/Unit/Migration/ImportTest.php b/tests/Unit/Migration/ImportTest.php
index 3be2eceb0512..0cf8c1168565 100644
--- a/tests/Unit/Migration/ImportTest.php
+++ b/tests/Unit/Migration/ImportTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit\Migration;
 
 use App\Exceptions\ResourceDependencyMissing;
@@ -40,7 +41,7 @@ class ImportTest extends TestCase
 
     public $migration_array;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -66,12 +67,12 @@ class ImportTest extends TestCase
 
     //     $this->user->setCompany($this->company);
     //     auth()->login($this->user, true);
-        
+
     //     Import::dispatchNow($this->migration_array, $this->company, $this->user);
 
     //     $this->assertTrue(true);
     // }
-    
+
 //     public function testExceptionOnUnavailableResource()
 //     {
 //         $data['panda_bears'] = [
@@ -151,8 +152,6 @@ class ImportTest extends TestCase
 
 //     }
 
-
-
 //     public function testClientAttributes()
 //     {
 //         $original_number = Client::count();
diff --git a/tests/Unit/MollieAmountFormatTest.php b/tests/Unit/MollieAmountFormatTest.php
index 147d4e21218b..464843320491 100644
--- a/tests/Unit/MollieAmountFormatTest.php
+++ b/tests/Unit/MollieAmountFormatTest.php
@@ -17,16 +17,16 @@ use PHPUnit\Framework\TestCase;
 class MollieAmountFormatTest extends TestCase
 {
     /**
-     * @covers \App\PaymentDrivers\MolliePaymentDriver::convertToMollieAmount() 
+     * @covers \App\PaymentDrivers\MolliePaymentDriver::convertToMollieAmount()
      */
     public function testFormatterIsWorkingCorrectly()
     {
         $this->assertEquals('1000.00', \number_format((float) 1000, 2, '.', ''));
 
-        $this->assertEquals('1000.00', \number_format((float) "1000", 2, '.', ''));
+        $this->assertEquals('1000.00', \number_format((float) '1000', 2, '.', ''));
 
-        $this->assertEquals('1000.00', \number_format((float) "1000.00", 2, '.', ''));
+        $this->assertEquals('1000.00', \number_format((float) '1000.00', 2, '.', ''));
 
-        $this->assertEquals('1000.00', \number_format((float) "1000.00000", 2, '.', ''));
+        $this->assertEquals('1000.00', \number_format((float) '1000.00000', 2, '.', ''));
     }
 }
diff --git a/tests/Unit/NestedCollectionTest.php b/tests/Unit/NestedCollectionTest.php
index 41cc04580123..832e6760cf24 100644
--- a/tests/Unit/NestedCollectionTest.php
+++ b/tests/Unit/NestedCollectionTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use Tests\TestCase;
@@ -18,7 +19,7 @@ use Tests\TestCase;
  */
 class NestedCollectionTest extends TestCase
 {
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Unit/NumberTest.php b/tests/Unit/NumberTest.php
index 4be5e1d19451..4d5587b0b407 100644
--- a/tests/Unit/NumberTest.php
+++ b/tests/Unit/NumberTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Models\Currency;
@@ -44,7 +45,7 @@ class NumberTest extends TestCase
     //this method proved an error! removing this method from production
     // public function testImportFloatConversion()
     // {
-        
+
     //     $amount = '€7,99';
 
     //     $converted_amount = Number::parseStringFloat($amount);
@@ -96,7 +97,7 @@ class NumberTest extends TestCase
         $x = Number::formatValueNoTrailingZeroes(0.00005, $currency);
 
         $this->assertEquals(0.00005, $x);
-    }    
+    }
 
     public function testRoundingDecimalsSix()
     {
@@ -123,8 +124,7 @@ class NumberTest extends TestCase
         $x = Number::formatValueNoTrailingZeroes(0.00000005, $currency);
 
         $this->assertEquals(0.00000005, $x);
-    }    
-
+    }
 
     public function testRoundingPositive()
     {
@@ -144,5 +144,5 @@ class NumberTest extends TestCase
 
         $x = Number::formatValueNoTrailingZeroes(1.50000005, $currency);
         $this->assertEquals(1.50000005, $x);
-    }  
+    }
 }
diff --git a/tests/Unit/PdfVariablesTest.php b/tests/Unit/PdfVariablesTest.php
index 609d7c6043e2..5c00d88f4a1b 100644
--- a/tests/Unit/PdfVariablesTest.php
+++ b/tests/Unit/PdfVariablesTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\DataMapper\CompanySettings;
@@ -18,7 +19,7 @@ use Tests\TestCase;
  */
 class PdfVariablesTest extends TestCase
 {
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Unit/Phantom/PhantomJsTest.php b/tests/Unit/Phantom/PhantomJsTest.php
index bc0e668a1953..2af4892c0069 100644
--- a/tests/Unit/Phantom/PhantomJsTest.php
+++ b/tests/Unit/Phantom/PhantomJsTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit\Phantom;
 
 use Tests\TestCase;
@@ -18,30 +19,26 @@ use Tests\TestCase;
  */
 class PhantomJsTest extends TestCase
 {
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
     }
 
     public function testValidPdfMime()
     {
-    	$pdf = file_get_contents(base_path('/tests/Unit/Phantom/valid.pdf'));
+        $pdf = file_get_contents(base_path('/tests/Unit/Phantom/valid.pdf'));
 
         $finfo = new \finfo(FILEINFO_MIME);
 
-		$this->assertEquals('application/pdf; charset=binary', $finfo->buffer($pdf));
-
+        $this->assertEquals('application/pdf; charset=binary', $finfo->buffer($pdf));
     }
 
     public function testInValidPdfMime()
     {
-
-    	$pdf = file_get_contents(base_path('/tests/Unit/Phantom/invalid.pdf'));
+        $pdf = file_get_contents(base_path('/tests/Unit/Phantom/invalid.pdf'));
 
         $finfo = new \finfo(FILEINFO_MIME);
 
-		$this->assertNotEquals('application/pdf; charset=binary', $finfo->buffer($pdf));
-
+        $this->assertNotEquals('application/pdf; charset=binary', $finfo->buffer($pdf));
     }
-
 }
diff --git a/tests/Unit/PrimaryKeyTransformationTest.php b/tests/Unit/PrimaryKeyTransformationTest.php
index 4b39cfebe604..f29e6b622a34 100644
--- a/tests/Unit/PrimaryKeyTransformationTest.php
+++ b/tests/Unit/PrimaryKeyTransformationTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Utils\Traits\MakesHash;
@@ -21,7 +22,7 @@ class PrimaryKeyTransformationTest extends TestCase
 {
     use MakesHash;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
     }
diff --git a/tests/Unit/RangeDetectionTest.php b/tests/Unit/RangeDetectionTest.php
index b0a6979f0905..afb9e9c211d9 100644
--- a/tests/Unit/RangeDetectionTest.php
+++ b/tests/Unit/RangeDetectionTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -18,8 +19,7 @@ use Tests\TestCase;
  */
 class RangeDetectionTest extends TestCase
 {
-
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
     }
@@ -33,9 +33,8 @@ class RangeDetectionTest extends TestCase
 
         $expanded_ranges = [];
 
-        foreach($ranges as $range)
-        {
-            $expanded_ranges = array_merge(array_values($expanded_ranges),array_values($this->makeRanges($range)));
+        foreach ($ranges as $range) {
+            $expanded_ranges = array_merge(array_values($expanded_ranges), array_values($this->makeRanges($range)));
         }
 
         $value_count_array = array_count_values($expanded_ranges);
@@ -45,11 +44,8 @@ class RangeDetectionTest extends TestCase
         $this->assertEquals(count($value_count_array), 1);
     }
 
-
     private function makeRanges(array $range)
     {
         return range($range[0], $range[1]);
-
     }
-
 }
diff --git a/tests/Unit/RecurringDateTest.php b/tests/Unit/RecurringDateTest.php
index e2aab295e041..8276f9a17902 100644
--- a/tests/Unit/RecurringDateTest.php
+++ b/tests/Unit/RecurringDateTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Models\Invoice;
@@ -24,7 +25,7 @@ class RecurringDateTest extends TestCase
     use DatabaseTransactions;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -33,12 +34,12 @@ class RecurringDateTest extends TestCase
 
     public function testNextDay()
     {
-    	$trial = 60*60*24;
+        $trial = 60 * 60 * 24;
 
-    	$now = Carbon::parse('2021-12-01');
+        $now = Carbon::parse('2021-12-01');
 
-    	$trial_ends = $now->addSeconds($trial)->addDays(1);
+        $trial_ends = $now->addSeconds($trial)->addDays(1);
 
-    	$this->assertequals($trial_ends->format('Y-m-d'), '2021-12-03');
+        $this->assertequals($trial_ends->format('Y-m-d'), '2021-12-03');
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/RecurringDatesTest.php b/tests/Unit/RecurringDatesTest.php
index 3e744f00180d..c996694f58a4 100644
--- a/tests/Unit/RecurringDatesTest.php
+++ b/tests/Unit/RecurringDatesTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Factory\RecurringInvoiceFactory;
@@ -26,7 +27,7 @@ class RecurringDatesTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -64,7 +65,6 @@ class RecurringDatesTest extends TestCase
         $this->assertEquals(5, count($recurring_invoice->recurringDates()));
     }
 
-
     public function testRecurringDatesPendingInvoiceWithNoDueDate()
     {
         $recurring_invoice = RecurringInvoiceFactory::create($this->company->id, $this->user->id);
@@ -76,7 +76,7 @@ class RecurringDatesTest extends TestCase
         $recurring_invoice->remaining_cycles = 5;
         $recurring_invoice->due_date_days = null;
         $recurring_invoice->next_send_date = now();
-        
+
         $recurring_invoice->save();
 
         $recurring_invoice->calc()->getInvoice();
diff --git a/tests/Unit/RecurringDueDatesTest.php b/tests/Unit/RecurringDueDatesTest.php
index 8f56a4abdbe7..cb1494ff8fb4 100644
--- a/tests/Unit/RecurringDueDatesTest.php
+++ b/tests/Unit/RecurringDueDatesTest.php
@@ -6,7 +6,7 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace Tests\Unit;
@@ -23,7 +23,6 @@ class RecurringDueDatesTest extends TestCase
 {
     use HasRecurrence;
 
-
     public function testFirstDate()
     {
         $date = Carbon::parse('2020-02-15');
@@ -42,7 +41,6 @@ class RecurringDueDatesTest extends TestCase
         $this->assertEquals('2020-03-01', $due_date->format('Y-m-d'));
     }
 
-
     public function testFirstOfMonthOnLast()
     {
         $date = Carbon::parse('2020-03-31');
@@ -106,7 +104,6 @@ class RecurringDueDatesTest extends TestCase
         $this->assertEquals('2020-03-01', $due_date->format('Y-m-d'));
     }
 
-
     public function testDayOfMonthWithOverflow()
     {
         $date = Carbon::parse('2020-1-31');
diff --git a/tests/Unit/RecurringExpenseCloneTest.php b/tests/Unit/RecurringExpenseCloneTest.php
index 94648c35a6c6..6fc877068ad5 100644
--- a/tests/Unit/RecurringExpenseCloneTest.php
+++ b/tests/Unit/RecurringExpenseCloneTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Factory\RecurringExpenseFactory;
@@ -25,25 +26,23 @@ use Tests\TestCase;
  */
 class RecurringExpenseCloneTest extends TestCase
 {
-
     public $faker;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
         $this->faker = \Faker\Factory::create();
-
     }
 
     public function testBadBase64String()
     {
         $account = Account::factory()->create();
-        $user = User::factory()->create(['account_id' => $account->id, 'email' => $this->faker->unique()->safeEmail]);
+        $user = User::factory()->create(['account_id' => $account->id, 'email' => $this->faker->unique()->safeEmail()]);
         $company = Company::factory()->create(['account_id' => $account->id]);
 
         $client = Client::factory()->create([
-                'user_id' => $user->id,
-                'company_id' => $company->id,
+            'user_id' => $user->id,
+            'company_id' => $company->id,
         ]);
 
         $recurring_expense = RecurringExpenseFactory::create($company->id, $user->id);
@@ -51,9 +50,9 @@ class RecurringExpenseCloneTest extends TestCase
         $recurring_expense->amount = 10;
         $recurring_expense->foreign_amount = 20;
         $recurring_expense->exchange_rate = 0.5;
-        $recurring_expense->private_notes = "private";
-        $recurring_expense->public_notes = "public";
-        $recurring_expense->custom_value4 = "custom4";
+        $recurring_expense->private_notes = 'private';
+        $recurring_expense->public_notes = 'public';
+        $recurring_expense->custom_value4 = 'custom4';
         $recurring_expense->should_be_invoiced = true;
 
         $recurring_expense->save();
@@ -65,5 +64,4 @@ class RecurringExpenseCloneTest extends TestCase
         $this->assertEquals(20, $expense->foreign_amount);
         $this->assertEquals(10, $expense->amount);
     }
-
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/RedisVsDatabaseTest.php b/tests/Unit/RedisVsDatabaseTest.php
index c10ddde44c23..d53a479d268d 100644
--- a/tests/Unit/RedisVsDatabaseTest.php
+++ b/tests/Unit/RedisVsDatabaseTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Models\Currency;
@@ -22,19 +23,16 @@ use Tests\TestCase;
  */
 class RedisVsDatabaseTest extends TestCase
 {
-
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
         // $this->markTestSkipped('Skip test no company gateways installed');
-
-
     }
 
     public function testRedisSpeed()
     {
-    	$start = microtime(true);
+        $start = microtime(true);
 
         $currencies = Cache::get('currencies');
 
@@ -46,13 +44,12 @@ class RedisVsDatabaseTest extends TestCase
 
         $this->assertTrue(true);
         // nlog($total_time);
-        //0.0012960433959961  
+        //0.0012960433959961
     }
 
-
     public function testDbSpeed()
     {
-    	$start = microtime(true);
+        $start = microtime(true);
 
         $currency = Currency::find(17);
 
@@ -60,15 +57,6 @@ class RedisVsDatabaseTest extends TestCase
 
         $this->assertTrue(true);
         // nlog($total_time);
-		// 0.006152868270874  
-
+        // 0.006152868270874
     }
-
-
-
 }
-
-
-
-
-    
\ No newline at end of file
diff --git a/tests/Unit/RefundUnitTest.php b/tests/Unit/RefundUnitTest.php
index b9ee3f7e7823..c2a375543124 100644
--- a/tests/Unit/RefundUnitTest.php
+++ b/tests/Unit/RefundUnitTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Helpers\Invoice\ProRata;
@@ -21,8 +22,7 @@ use Tests\TestCase;
  */
 class RefundUnitTest extends TestCase
 {
-
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
     }
@@ -49,9 +49,6 @@ class RefundUnitTest extends TestCase
 
     public function testDiffInDays()
     {
-
         $this->assertEquals(30, Carbon::parse('2021-01-01')->diffInDays(Carbon::parse('2021-01-31')));
-
     }
-
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/RelationExistsTest.php b/tests/Unit/RelationExistsTest.php
index 0494fec8e384..047dc5ec8ce0 100644
--- a/tests/Unit/RelationExistsTest.php
+++ b/tests/Unit/RelationExistsTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Factory\CloneQuoteToInvoiceFactory;
@@ -48,7 +49,7 @@ class RelationExistsTest extends TestCase
         Vendor::class,
     ];
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -57,9 +58,7 @@ class RelationExistsTest extends TestCase
 
     public function testAssignedUserRelationExists()
     {
-
-        foreach($this->models as $model){
-
+        foreach ($this->models as $model) {
             $class = new $model;
 
             $this->assertTrue(method_exists($class, 'assigned_user'));
diff --git a/tests/Unit/S3CleanupTest.php b/tests/Unit/S3CleanupTest.php
index 61c87d3c3b81..c49ed358a184 100644
--- a/tests/Unit/S3CleanupTest.php
+++ b/tests/Unit/S3CleanupTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\DataMapper\ClientSettings;
@@ -18,22 +19,21 @@ use Tests\TestCase;
  */
 class S3CleanupTest extends TestCase
 {
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
     }
 
     public function testMergeCollections()
     {
-        $c1 = collect(["1","2","3","4"]);
-        $c2 = collect(["5","6","7","8"]);
+        $c1 = collect(['1', '2', '3', '4']);
+        $c2 = collect(['5', '6', '7', '8']);
 
-        $c3 = collect(["1","2","10"]);
+        $c3 = collect(['1', '2', '10']);
 
         $merged = $c1->merge($c2)->toArray();
 
-        $this->assertTrue(in_array("1", $merged));
-        $this->assertFalse(in_array("10", $merged));
-           
+        $this->assertTrue(in_array('1', $merged));
+        $this->assertFalse(in_array('10', $merged));
     }
 }
diff --git a/tests/Unit/SentryTest.php b/tests/Unit/SentryTest.php
index d3dc02c259ca..0dd7d8ae822c 100644
--- a/tests/Unit/SentryTest.php
+++ b/tests/Unit/SentryTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use Tests\TestCase;
diff --git a/tests/Unit/SettingsSaverTest.php b/tests/Unit/SettingsSaverTest.php
index 7162961bbf43..051bb415ebf5 100644
--- a/tests/Unit/SettingsSaverTest.php
+++ b/tests/Unit/SettingsSaverTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\DataMapper\CompanySettings;
@@ -21,7 +22,7 @@ class SettingsSaverTest extends TestCase
 {
     use SettingsSaver;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
     }
@@ -34,6 +35,5 @@ class SettingsSaverTest extends TestCase
         $result = $this->checkAttribute($key, $value);
 
         $this->assertFalse($result);
-
     }
 }
diff --git a/tests/Unit/Shop/ShopProfileTest.php b/tests/Unit/Shop/ShopProfileTest.php
index d7c8afad0f28..6e6e773c3103 100644
--- a/tests/Unit/Shop/ShopProfileTest.php
+++ b/tests/Unit/Shop/ShopProfileTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit\Shop;
 
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -23,7 +24,7 @@ class ShopProfileTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
diff --git a/tests/Unit/SubscriptionsCalcTest.php b/tests/Unit/SubscriptionsCalcTest.php
index a5f1906aebe0..8b41565e1b77 100644
--- a/tests/Unit/SubscriptionsCalcTest.php
+++ b/tests/Unit/SubscriptionsCalcTest.php
@@ -25,13 +25,14 @@ use Tests\TestCase;
 class SubscriptionsCalcTest extends TestCase
 {
     use MockUnitData;
+
     /**
      * Important consideration with Base64
      * encoding checks.
      *
      * No method can guarantee against false positives.
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -40,14 +41,12 @@ class SubscriptionsCalcTest extends TestCase
 
     public function testCalcUpgradePrice()
     {
-
         $subscription = Subscription::factory()->create([
             'company_id' => $this->company->id,
             'user_id' => $this->user->id,
             'price' => 10,
         ]);
 
-
         $target = Subscription::factory()->create([
             'company_id' => $this->company->id,
             'user_id' => $this->user->id,
@@ -101,6 +100,5 @@ class SubscriptionsCalcTest extends TestCase
         $upgrade = $pro_rata->charge($target->price, Carbon::parse('2021-01-01'), Carbon::parse('2021-01-06'), $subscription->frequency_id);
 
         // $this->assertEquals(3.23, $upgrade);
-
     }
 }
diff --git a/tests/Unit/SystemHealthTest.php b/tests/Unit/SystemHealthTest.php
index a6a1fee08d52..6628e4553f93 100644
--- a/tests/Unit/SystemHealthTest.php
+++ b/tests/Unit/SystemHealthTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Utils\SystemHealth;
@@ -19,7 +20,7 @@ use Tests\TestCase;
  */
 class SystemHealthTest extends TestCase
 {
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
     }
diff --git a/tests/Unit/TaskSortingTest.php b/tests/Unit/TaskSortingTest.php
index edeb59a27542..a6f260149421 100644
--- a/tests/Unit/TaskSortingTest.php
+++ b/tests/Unit/TaskSortingTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use Tests\TestCase;
@@ -19,7 +20,7 @@ class TaskSortingTest extends TestCase
 {
     public $collection;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -32,25 +33,24 @@ class TaskSortingTest extends TestCase
             ['id' => 6, 'name' =>'alpha', 'order' => 9999],
             ['id' => 7, 'name' =>'ninja', 'order' => 9999],
         ]);
-
     }
 
     public function testSorting()
     {
-
         $index = 3;
         $item = $this->collection->where('id', 7)->first();
 
-        $new_collection = $this->collection->reject(function ($task)use($item){
+        $new_collection = $this->collection->reject(function ($task) use ($item) {
             return $item['id'] == $task['id'];
         });
 
-        $sorted_tasks = $new_collection->filter(function($task, $key)use($index){
+        $sorted_tasks = $new_collection->filter(function ($task, $key) use ($index) {
             return $key < $index;
-        })->push($item)->merge($new_collection->filter(function($task, $key)use($index){
+        })->push($item)->merge($new_collection->filter(function ($task, $key) use ($index) {
             return $key >= $index;
-        }))->map(function ($item,$key){
+        }))->map(function ($item, $key) {
             $item['order'] = $key;
+
             return $item;
         });
 
@@ -58,7 +58,6 @@ class TaskSortingTest extends TestCase
 
         $this->assertEquals($sorted_tasks->first()['name'], 'pizza');
         $this->assertEquals($sorted_tasks->last()['name'], 'alpha');
-        $this->assertEquals($index_item[0]['name'],'ninja');
-
+        $this->assertEquals($index_item[0]['name'], 'ninja');
     }
 }
diff --git a/tests/Unit/TranslationTest.php b/tests/Unit/TranslationTest.php
index 9a23d5476097..154f242e2f62 100644
--- a/tests/Unit/TranslationTest.php
+++ b/tests/Unit/TranslationTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use Illuminate\Support\Facades\Lang;
@@ -18,7 +19,7 @@ use Tests\TestCase;
  */
 class TranslationTest extends TestCase
 {
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
     }
diff --git a/tests/Unit/UBLInvoiceTest.php b/tests/Unit/UBLInvoiceTest.php
index 125e6c609dd6..99e363ba960b 100644
--- a/tests/Unit/UBLInvoiceTest.php
+++ b/tests/Unit/UBLInvoiceTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Jobs\Invoice\CreateUbl;
@@ -25,7 +26,7 @@ class UBLInvoiceTest extends TestCase
     use MockAccountData;
     use DatabaseTransactions;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -37,8 +38,7 @@ class UBLInvoiceTest extends TestCase
 
     public function testUblGenerates()
     {
-        $ubl = CreateUbl::dispatchNow($this->invoice);
-
+        $ubl = (new CreateUbl($this->invoice))->handle();
         $this->assertNotNull($ubl);
     }
 }
diff --git a/tests/Unit/UrlTest.php b/tests/Unit/UrlTest.php
index b0a4c8a652dc..10efdaa82aa3 100644
--- a/tests/Unit/UrlTest.php
+++ b/tests/Unit/UrlTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use Tests\TestCase;
@@ -17,43 +18,38 @@ use Tests\TestCase;
  */
 class UrlTest extends TestCase
 {
-
-   	public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
     }
 
     public function testNoScheme()
     {
-    	$url = 'google.com';
+        $url = 'google.com';
 
-    	$this->assertEquals("https://google.com", $this->addScheme($url));
+        $this->assertEquals('https://google.com', $this->addScheme($url));
     }
 
     public function testNoSchemeAndTrailingSlash()
     {
-    	$url = 'google.com/';
+        $url = 'google.com/';
 
-    	$this->assertEquals("https://google.com", $this->addScheme($url));
+        $this->assertEquals('https://google.com', $this->addScheme($url));
     }
 
-
     public function testNoSchemeAndTrailingSlashAndHttp()
     {
-    	$url = 'http://google.com/';
+        $url = 'http://google.com/';
 
-    	$this->assertEquals("https://google.com", $this->addScheme($url));
+        $this->assertEquals('https://google.com', $this->addScheme($url));
     }
 
-	private function addScheme($url, $scheme = 'https://')
-	{
+    private function addScheme($url, $scheme = 'https://')
+    {
+        $url = str_replace('http://', '', $url);
 
-	  $url = str_replace("http://", "", $url);
+        $url = parse_url($url, PHP_URL_SCHEME) === null ? $scheme.$url : $url;
 
-	  $url =  parse_url($url, PHP_URL_SCHEME) === null ? $scheme . $url : $url;
-
-	  return rtrim($url, '/');
-
-	}
-
-}
\ No newline at end of file
+        return rtrim($url, '/');
+    }
+}
diff --git a/tests/Unit/ValidationRules/BlacklistValidationTest.php b/tests/Unit/ValidationRules/BlacklistValidationTest.php
index a06adfa91429..68a1ba915b15 100644
--- a/tests/Unit/ValidationRules/BlacklistValidationTest.php
+++ b/tests/Unit/ValidationRules/BlacklistValidationTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit\ValidationRules;
 
 use App\Http\ValidationRules\Account\BlackListRule;
@@ -22,46 +23,36 @@ use Tests\TestCase;
  */
 class BlacklistValidationTest extends TestCase
 {
-
-
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
-
     }
 
     public function testValidEmailRule()
     {
-
         $rules = [
-            'email' => [new BlackListRule]
+            'email' => [new BlackListRule],
         ];
-        
+
         $data = [
-            'email' => "jimmy@gmail.com",
+            'email' => 'jimmy@gmail.com',
         ];
-        
+
         $v = $this->app['validator']->make($data, $rules);
         $this->assertTrue($v->passes());
     }
 
-
     public function testInValidEmailRule()
     {
-
         $rules = [
-            'email' => [new BlackListRule]
+            'email' => [new BlackListRule],
         ];
-        
+
         $data = [
-            'email' => "jimmy@candassociates.com",
+            'email' => 'jimmy@candassociates.com',
         ];
-        
+
         $v = $this->app['validator']->make($data, $rules);
         $this->assertFalse($v->passes());
     }
-
-
-
-
 }
diff --git a/tests/Unit/ValidationRules/EmailBlacklistValidationTest.php b/tests/Unit/ValidationRules/EmailBlacklistValidationTest.php
index a833c1d21834..57504cc7c107 100644
--- a/tests/Unit/ValidationRules/EmailBlacklistValidationTest.php
+++ b/tests/Unit/ValidationRules/EmailBlacklistValidationTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit\ValidationRules;
 
 use App\Http\ValidationRules\Account\BlackListRule;
@@ -23,12 +24,9 @@ use Tests\TestCase;
  */
 class EmailBlacklistValidationTest extends TestCase
 {
-
-
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
-
     }
 
     public function testValidEmailRule()
@@ -37,34 +35,28 @@ class EmailBlacklistValidationTest extends TestCase
         $email_rule->blacklist = ['gimmy@gmail.com'];
 
         $rules = [
-            'email' => [$email_rule]
+            'email' => [$email_rule],
         ];
-        
+
         $data = [
-            'email' => "gimmy@gmail.com",
+            'email' => 'gimmy@gmail.com',
         ];
-        
+
         $v = $this->app['validator']->make($data, $rules);
         $this->assertFalse($v->passes());
     }
 
-
     public function testInValidEmailRule()
     {
-
         $rules = [
-            'email' => [new EmailBlackListRule]
+            'email' => [new EmailBlackListRule],
         ];
-        
+
         $data = [
-            'email' => "jimmy@candassociates.com",
+            'email' => 'jimmy@candassociates.com',
         ];
-        
+
         $v = $this->app['validator']->make($data, $rules);
         $this->assertTrue($v->passes());
     }
-
-
-
-
 }
diff --git a/tests/Unit/ValidationRules/UniqueInvoiceNumberValidationTest.php b/tests/Unit/ValidationRules/UniqueInvoiceNumberValidationTest.php
index fbf37216cc0b..79782df52c6a 100644
--- a/tests/Unit/ValidationRules/UniqueInvoiceNumberValidationTest.php
+++ b/tests/Unit/ValidationRules/UniqueInvoiceNumberValidationTest.php
@@ -6,8 +6,9 @@
  *
  * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
  *
- * @license https://www.elastic.co/licensing/elastic-license 
+ * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit\ValidationRules;
 
 use App\Http\Requests\Invoice\StoreInvoiceRequest;
@@ -24,11 +25,10 @@ use Tests\TestCase;
  */
 class UniqueInvoiceNumberValidationTest extends TestCase
 {
-
     use MakesHash;
     use MockAccountData;
 
-    public function setUp() :void
+    protected function setUp() :void
     {
         parent::setUp();
 
@@ -39,7 +39,6 @@ class UniqueInvoiceNumberValidationTest extends TestCase
         $this->makeTestData();
 
         $this->withoutExceptionHandling();
-
     }
 
     public function testValidEmailRule()
@@ -55,7 +54,7 @@ class UniqueInvoiceNumberValidationTest extends TestCase
             'status_id' => 4,
             'date' => now(),
             'due_date'=> now(),
-            'number' => 'db_record'
+            'number' => 'db_record',
         ]);
 
         $data = [
@@ -64,7 +63,7 @@ class UniqueInvoiceNumberValidationTest extends TestCase
             'status_id' => 4,
             'date' => now(),
             'due_date'=> now(),
-            'number' => 'db_record'
+            'number' => 'db_record',
         ];
 
         $rules = (new StoreInvoiceRequest())->rules();
@@ -72,10 +71,5 @@ class UniqueInvoiceNumberValidationTest extends TestCase
         $validator = Validator::make($data, $rules);
 
         $this->assertFalse($validator->passes());
-
     }
-
-
 }
-
-
diff --git a/tests/Unit/ZeroDecimalTest.php b/tests/Unit/ZeroDecimalTest.php
index 2c9260e27483..4efc7864a74f 100644
--- a/tests/Unit/ZeroDecimalTest.php
+++ b/tests/Unit/ZeroDecimalTest.php
@@ -8,6 +8,7 @@
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
+
 namespace Tests\Unit;
 
 use App\Jobs\Util\UploadFile;
@@ -21,38 +22,24 @@ use Tests\TestCase;
 
 class ZeroDecimalTest extends TestCase
 {
+    public array $currencies = ['BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'UGX', 'VND', 'VUV', 'XAF', 'XOF', 'XPF'];
 
-
-    public array $currencies = ["BIF","CLP","DJF","GNF","JPY","KMF","KRW","MGA","PYG","RWF","UGX","VND","VUV","XAF","XOF","XPF"];
-    
-    public function setUp() :void
+    protected function setUp() :void
     {
-
     }
 
     public function testCurrencyHit()
     {
-
-        $this->assertTrue(in_array("KRW", $this->currencies));
-
+        $this->assertTrue(in_array('KRW', $this->currencies));
     }
 
-
     public function testCurrencyMiss()
     {
-
-        $this->assertFalse(in_array("USD", $this->currencies));
-
+        $this->assertFalse(in_array('USD', $this->currencies));
     }
 
     public function testCurrencyNotexist()
     {
-
-        $this->assertFalse(in_array("USDddd", $this->currencies));
-
+        $this->assertFalse(in_array('USDddd', $this->currencies));
     }
-
-
-
 }
-