Merge pull request #8967 from invoiceninja/v5-develop

5.7.47 - Stable Release

VERSION.txt

@@ -1 +1 @@
-5.7.33
+5.7.47

app/Casts/EncryptedCast.php

@@ -16,12 +16,12 @@ use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 class EncryptedCast implements CastsAttributes
 {
     public function get($model, string $key, $value, array $attributes)
-    {   
+    {
         return is_string($value) && strlen($value) > 1 ? decrypt($value) : null;
     }
 
     public function set($model, string $key, $value, array $attributes)
-    {   
+    {
         return [$key => ! is_null($value) ? encrypt($value) : null];
     }
 }

app/Console/Commands/BackupUpdate.php

@@ -11,13 +11,13 @@
 
 namespace App\Console\Commands;
 
-use App\Utils\Ninja;
+use App\Libraries\MultiDB;
 use App\Models\Backup;
 use App\Models\Client;
 use App\Models\Company;
 use App\Models\Document;
-use App\Libraries\MultiDB;
 use App\Models\GroupSetting;
+use App\Utils\Ninja;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Storage;
 
@@ -56,8 +56,9 @@ class BackupUpdate extends Command
     {
         //always return state to first DB
 
-        if(Ninja::isSelfHost())
+        if(Ninja::isSelfHost()) {
             return;
+        }
             
         $current_db = config('database.default');
 

app/Console/Commands/CheckData.php

@@ -12,38 +12,37 @@
 namespace App\Console\Commands;
 
 use App;
-use Exception;
-use App\Models\User;
-use App\Utils\Ninja;
-use App\Models\Quote;
-use App\Models\Client;
-use App\Models\Credit;
-use App\Models\Vendor;
-use App\Models\Account;
-use App\Models\Company;
-use App\Models\Contact;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\CompanyUser;
-use Illuminate\Support\Str;
-use App\Models\CompanyToken;
-use App\Models\ClientContact;
-use App\Models\CompanyLedger;
-use App\Models\PurchaseOrder;
-use App\Models\VendorContact;
-use App\Models\BankTransaction;
-use App\Models\QuoteInvitation;
-use Illuminate\Console\Command;
-use App\Models\CreditInvitation;
-use App\Models\RecurringInvoice;
-use App\Models\InvoiceInvitation;
 use App\DataMapper\ClientSettings;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Mail;
 use App\Factory\ClientContactFactory;
 use App\Factory\VendorContactFactory;
 use App\Jobs\Company\CreateCompanyToken;
+use App\Models\Account;
+use App\Models\BankTransaction;
+use App\Models\Client;
+use App\Models\ClientContact;
+use App\Models\Company;
+use App\Models\CompanyLedger;
+use App\Models\CompanyToken;
+use App\Models\CompanyUser;
+use App\Models\Contact;
+use App\Models\Credit;
+use App\Models\CreditInvitation;
+use App\Models\Invoice;
+use App\Models\InvoiceInvitation;
+use App\Models\Payment;
+use App\Models\PurchaseOrder;
+use App\Models\Quote;
+use App\Models\QuoteInvitation;
+use App\Models\RecurringInvoice;
 use App\Models\RecurringInvoiceInvitation;
+use App\Models\User;
+use App\Models\Vendor;
+use App\Models\VendorContact;
+use App\Utils\Ninja;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Str;
 use Symfony\Component\Console\Input\InputOption;
 
 /*
@@ -185,8 +184,7 @@ class CheckData extends Command
 
                 if ($cu->company && $cu->user) {
                     (new CreateCompanyToken($cu->company, $cu->user, 'System'))->handle();
-                }
+                } else {
-                else {
                     // $cu->forceDelete();
                 }
             }
@@ -445,7 +443,7 @@ class CheckData extends Command
         QuoteInvitation::where('deleted_at', "0000-00-00 00:00:00.000000")->withTrashed()->update(['deleted_at' => null]);
         CreditInvitation::where('deleted_at', "0000-00-00 00:00:00.000000")->withTrashed()->update(['deleted_at' => null]);
 
-        InvoiceInvitation::where('sent_date', '0000-00-00 00:00:00')->cursor()->each(function ($ii){
+        InvoiceInvitation::where('sent_date', '0000-00-00 00:00:00')->cursor()->each(function ($ii) {
             $ii->sent_date = null;
             $ii->saveQuietly();
         });
@@ -619,7 +617,7 @@ class CheckData extends Command
         }
 
         $this->logMessage("{$this->wrong_paid_to_dates} clients with incorrect paid to dates");
-   }
+    }
 
     private function clientBalanceQuery()
     {
@@ -906,26 +904,6 @@ 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();
@@ -1028,7 +1006,7 @@ class CheckData extends Command
     {
         $this->logMessage("checking bank transactions");
 
-        BankTransaction::with('payment')->withTrashed()->where('invoice_ids', ',,,,,,,,')->cursor()->each(function ($bt){
+        BankTransaction::with('payment')->withTrashed()->where('invoice_ids', ',,,,,,,,')->cursor()->each(function ($bt) {
 
             if($bt->payment->exists()) {
 
@@ -1052,7 +1030,7 @@ class CheckData extends Command
 
         if ($this->option('fix') == 'true') {
 
-            $q->cursor()->each(function ($c){
+            $q->cursor()->each(function ($c) {
                 $c->send_email = false;
                 $c->saveQuietly();
 

app/Console/Commands/CreateAccount.php

@@ -20,7 +20,6 @@ use App\Models\Account;
 use App\Models\Company;
 use App\Models\CompanyToken;
 use App\Models\User;
-use App\Repositories\InvoiceRepository;
 use App\Utils\Traits\GeneratesCounter;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Console\Command;

app/Console/Commands/CreateSingleAccount.php

@@ -36,6 +36,7 @@ use App\Models\CompanyToken;
 use App\Models\Country;
 use App\Models\Credit;
 use App\Models\Expense;
+use App\Models\Invoice;
 use App\Models\Product;
 use App\Models\Project;
 use App\Models\Quote;
@@ -303,6 +304,62 @@ class CreateSingleAccount extends Command
         $this->createGateways($company, $user);
 
         $this->createSubsData($company, $user);
+
+
+        $repo = new \App\Repositories\TaskRepository();
+
+        Task::query()->cursor()->each(function ($t) use ($repo) {
+            $repo->save([], $t);
+        });
+
+        $repo = new \App\Repositories\ExpenseRepository();
+
+        Expense::query()->cursor()->each(function ($t) use ($repo) {
+            $repo->save([], $t);
+        });
+
+        $repo = new \App\Repositories\VendorRepository(new \App\Repositories\VendorContactRepository());
+        Vendor::query()->cursor()->each(function ($t) use ($repo) {
+            $repo->save([], $t);
+        });
+
+        $repo = new \App\Repositories\ClientRepository(new \App\Repositories\ClientContactRepository());
+        Client::query()->cursor()->each(function ($t) use ($repo) {
+            $repo->save([], $t);
+        });
+
+        $repo = new \App\Repositories\RecurringInvoiceRepository();
+        RecurringInvoice::query()->cursor()->each(function ($t) use ($repo) {
+            $repo->save([], $t);
+        });
+
+        $repo = new \App\Repositories\InvoiceRepository();
+        Invoice::query()->cursor()->each(function ($t) use ($repo) {
+            $repo->save([], $t);
+        });
+
+        $repo = new \App\Repositories\QuoteRepository();
+        Quote::query()->cursor()->each(function ($t) use ($repo) {
+            $repo->save([], $t);
+        });
+
+        $repo = new \App\Repositories\CreditRepository();
+        Credit::query()->cursor()->each(function ($t) use ($repo) {
+            $repo->save([], $t);
+        });
+
+        
+        Project::query()->with('client')->whereNotNull('client_id')->cursor()->each(function ($p) {
+            
+            if($p && $p->client && !isset($p->number)) {
+                $p->number = $this->getNextProjectNumber($p);
+                $p->save();
+            }
+
+        });
+
+        $this->info("finished");
+        
     }
 
     private function createSubsData($company, $user)
@@ -403,7 +460,7 @@ class CreateSingleAccount extends Command
 
         $settings = $client->settings;
         $settings->currency_id = "1";
-//        $settings->use_credits_payment = "always";
+        //        $settings->use_credits_payment = "always";
 
         $client->settings = $settings;
 
@@ -885,11 +942,11 @@ class CreateSingleAccount extends Command
         }
     }
 
-    private function createRecurringInvoice($client)
+    private function createRecurringInvoice(Client $client)
     {
         $faker = Factory::create();
 
-        $invoice = RecurringInvoiceFactory::create($client->company->id, $client->user->id); //stub the company and user_id
+        $invoice = RecurringInvoiceFactory::create($client->company_id, $client->user_id); //stub the company and user_id
         $invoice->client_id = $client->id;
         $dateable = Carbon::now()->subDays(rand(0, 90));
         $invoice->date = $dateable;

app/Console/Commands/CreateTestData.php

@@ -496,7 +496,7 @@ class CreateTestData extends Command
 
         $invoice = InvoiceFactory::create($client->company->id, $client->user->id); //stub the company and user_id
         $invoice->client_id = $client->id;
-//        $invoice->date = $faker->date();
+        //        $invoice->date = $faker->date();
         $dateable = Carbon::now()->subDays(rand(0, 90));
         $invoice->date = $dateable;
 

app/Console/Commands/ImportMigrations.php

@@ -18,7 +18,6 @@ use App\Exceptions\ProcessingMigrationArchiveFailed;
 use App\Exceptions\ResourceDependencyMissing;
 use App\Exceptions\ResourceNotAvailableForMigration;
 use App\Jobs\Util\Import;
-use App\Jobs\Util\StartMigration;
 use App\Mail\MigrationFailed;
 use App\Models\Account;
 use App\Models\Company;

app/Console/Commands/MobileLocalization.php

@@ -63,10 +63,12 @@ class MobileLocalization extends Command
     {
         $resources = $this->getResources();
 
-        foreach ($resources as $key => $val) {
+        if(is_iterable($resources)){
-            $transKey = "texts.{$key}";
+            foreach ($resources as $key => $val) {
-            if (trans($transKey) == $transKey) {
+                $transKey = "texts.{$key}";
-                echo "'$key' => '$val',\n";
+                if (trans($transKey) == $transKey) {
+                    echo "'$key' => '$val',\n";
+                }
             }
         }
     }

app/Console/Commands/ReactBuilder.php

@@ -52,8 +52,7 @@ class ReactBuilder extends Command
 
         try {
             $directoryIterator = new \RecursiveDirectoryIterator(public_path('react/v'.config('ninja.app_version').'/'), \RecursiveDirectoryIterator::SKIP_DOTS);
-        }
+        } catch (\Exception $e) {
-        catch (\Exception $e) {
             $this->error('React files not found');
             return;
         }
@@ -61,14 +60,14 @@ class ReactBuilder extends Command
         foreach (new \RecursiveIteratorIterator($directoryIterator) as $file) {
             if ($file->getExtension() == 'js') {
                 if (str_contains($file->getFileName(), 'index-')) {
-                    $includes .= '<script type="module" crossorigin src="/react/'.$file->getFileName().'"></script>'."\n";
+                    $includes .= '<script type="module" crossorigin src="/react/v'.config('ninja.app_version').'/'.$file->getFileName().'"></script>'."\n";
                 } else {
-                    $includes .= '<link rel="modulepreload" href="/react/'.$file->getFileName().'">'."\n";
+                    $includes .= '<link rel="modulepreload" href="/react/v'.config('ninja.app_version').'/'.$file->getFileName().'">'."\n";
                 }
             }
 
             if (str_contains($file->getFileName(), '.css')) {
-                $includes .= '<link rel="stylesheet" href="/react/'.$file->getFileName().'">'."\n";
+                $includes .= '<link rel="stylesheet" href="/react/v'.config('ninja.app_version').'/'.$file->getFileName().'">'."\n";
             }
         }
 

app/Console/Commands/SendRemindersCron.php

@@ -172,18 +172,13 @@ class SendRemindersCron extends Command
 
         /**Refresh Invoice values*/
         $invoice->calc()->getInvoice()->save();
-        $invoice->fresh();
+        $invoice = $invoice->fresh();
-        // $invoice->service()->deletePdf()->save();
-        if ($invoice->client->getSetting('enable_e_invoice')){
-            $invoice->service()->deleteEInvoice()->save();
-        }
 
         /* 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));
+        $client->service()->calculateBalance();
-        $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;

app/Console/Commands/SendTestEmails.php

@@ -11,17 +11,10 @@
 
 namespace App\Console\Commands;
 
-use Faker\Factory;
-use App\Models\User;
-use App\Models\Account;
-use App\Models\Company;
-use App\Mail\TestMailServer;
-use Illuminate\Console\Command;
-use App\Jobs\Mail\NinjaMailerJob;
-use App\DataMapper\CompanySettings;
-use App\DataMapper\DefaultSettings;
 use App\Jobs\Mail\NinjaMailerObject;
-use App\Mail\Migration\MaxCompanies;
+use App\Mail\TestMailServer;
+use App\Models\User;
+use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Mail;
 
 class SendTestEmails extends Command

app/Console/Kernel.php

@@ -11,29 +11,29 @@
 
 namespace App\Console;
 
-use App\Utils\Ninja;
-use App\Models\Account;
-use App\Jobs\Ninja\QueueSize;
-use App\Jobs\Util\DiskCleanup;
-use App\Jobs\Util\ReminderJob;
 use App\Jobs\Cron\AutoBillCron;
-use App\Jobs\Util\VersionCheck;
-use App\Jobs\Ninja\TaskScheduler;
-use App\Jobs\Util\SchedulerCheck;
-use App\Jobs\Ninja\CheckACHStatus;
-use App\Jobs\Cron\SubscriptionCron;
-use App\Jobs\Ninja\AdjustEmailQuota;
-use App\Jobs\Ninja\CompanySizeCheck;
-use App\Jobs\Ninja\SystemMaintenance;
-use App\Jobs\Quote\QuoteCheckExpired;
-use App\Jobs\Util\UpdateExchangeRates;
-use App\Jobs\Ninja\BankTransactionSync;
 use App\Jobs\Cron\RecurringExpensesCron;
 use App\Jobs\Cron\RecurringInvoicesCron;
+use App\Jobs\Cron\SubscriptionCron;
 use App\Jobs\Cron\UpdateCalculatedFields;
-use Illuminate\Console\Scheduling\Schedule;
 use App\Jobs\Invoice\InvoiceCheckLateWebhook;
+use App\Jobs\Ninja\AdjustEmailQuota;
+use App\Jobs\Ninja\BankTransactionSync;
+use App\Jobs\Ninja\CheckACHStatus;
+use App\Jobs\Ninja\CompanySizeCheck;
+use App\Jobs\Ninja\QueueSize;
+use App\Jobs\Ninja\SystemMaintenance;
+use App\Jobs\Ninja\TaskScheduler;
+use App\Jobs\Quote\QuoteCheckExpired;
 use App\Jobs\Subscription\CleanStaleInvoiceOrder;
+use App\Jobs\Util\DiskCleanup;
+use App\Jobs\Util\ReminderJob;
+use App\Jobs\Util\SchedulerCheck;
+use App\Jobs\Util\UpdateExchangeRates;
+use App\Jobs\Util\VersionCheck;
+use App\Models\Account;
+use App\Utils\Ninja;
+use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
 class Kernel extends ConsoleKernel

app/DataMapper/Analytics/EmailSuccess.php

@@ -69,8 +69,15 @@ class EmailSuccess extends GenericMixedMetric
      */
     public $string_metric7 = '';
 
-    public function __construct($string_metric7)
+    /**
+     * Subject
+     * @var string
+     */
+    public $string_metric8 = '';
+
+    public function __construct($string_metric7 = '', $string_metric8 = '')
     {
         $this->string_metric7 = $string_metric7;
+        $this->string_metric8 = $string_metric8;
     }
 }

app/DataMapper/CompanySettings.php

@@ -481,14 +481,27 @@ class CompanySettings extends BaseSettings
 
     public $enable_e_invoice = false;
 
-    public $classification = ''; // individual, company, partnership, trust, charity, government, other
+    public $delivery_note_design_id = '';
+    
+    public $statement_design_id = '';
+    
+    public $payment_receipt_design_id = '';
+
+    public $payment_refund_design_id = '';
+
+    public $classification = ''; // individual, business, partnership, trust, charity, government, other
 
     public static $casts = [
-        'enable_e_invoice'                   => 'bool', 
+        'statement_design_id'                => 'string',
+        'delivery_note_design_id'            => 'string',
+        'payment_receipt_design_id'          => 'string',
+        'payment_refund_design_id'           => 'string',
+        'classification'                     => 'string',
+        'enable_e_invoice'                   => 'bool',
         'classification'                     => 'string',
         'default_expense_payment_type_id'    => 'string',
-        'e_invoice_type'                     => 'string',    
+        'e_invoice_type'                     => 'string',
-        'mailgun_endpoint'                   => 'string',    
+        'mailgun_endpoint'                   => 'string',
         'client_initiated_payments'          => 'bool',
         'client_initiated_payments_minimum'  => 'float',
         'sync_invoice_quote_columns'         => 'bool',
@@ -768,6 +781,8 @@ class CompanySettings extends BaseSettings
         'quote_design_id',
         'credit_design_id',
         'purchase_order_design_id',
+        'statement_design_id',
+        'delivery_note_design_id',
     ];
 
     // /**
@@ -999,6 +1014,15 @@ class CompanySettings extends BaseSettings
                 '$total',
                 '$credit.balance',
             ],
+            'statement_details' => [
+                '$statement_date',
+                '$balance'
+            ],
+            'delivery_note_columns' => [
+                '$product.item',
+                '$product.description',
+                '$product.quantity',
+            ],
         ];
 
         return json_decode(json_encode($variables));

app/DataMapper/DefaultSettings.php

@@ -34,4 +34,4 @@ class DefaultSettings extends BaseSettings
         ];
     }
 
-}
+}

app/DataMapper/FreeCompanySettings.php

@@ -44,7 +44,7 @@ class FreeCompanySettings extends BaseSettings
 
     public $date_format_id = '';
 
-//    public $enabled_item_tax_rates          = 0;
+    //    public $enabled_item_tax_rates          = 0;
     public $expense_number_pattern = '';
 
     public $expense_number_counter = 1;

app/DataMapper/Settings/SettingsData.php

@@ -10,7 +10,7 @@
  */
 namespace App\DataMapper\Settings;
 
-class SettingsData 
+class SettingsData
 {
 
     public bool $auto_archive_invoice = false; // @implemented
@@ -355,7 +355,7 @@ class SettingsData
 
     public string $email = ''; //@implemented
 
-    public string $country_id; //@implemented
+    public string $country_id = ''; //@implemented
 
     public string $vat_number = ''; //@implemented
 
@@ -469,27 +469,28 @@ class SettingsData
 
     public function cast(mixed $object)
     {
-        if(is_array($object))
+        if(is_array($object)) {
             $object = (object)$object;
+        }
 
         if (is_object($object)) {
             foreach ($object as $key => $value) {
 
-                try{
+                try {
                     settype($object->{$key}, gettype($this->{$key}));
-                }
+                } catch(\Exception | \Error | \Throwable $e) {
-                catch(\Exception | \Error | \Throwable $e){
                     
-                    if(property_exists($this, $key))
+                    if(property_exists($this, $key)) {
                         $object->{$key} = $this->{$key};
-                    else
+                    } else {
                         unset($object->{$key});
+                    }
 
                 }
 
                 // if(!property_exists($this, $key)) {
                 //     unset($object->{$key});
-                // } 
+                // }
                 // elseif(is_array($object->{$key}) && gettype($this->{$key} != 'array')){
                 //     $object->{$key} = $this->{$key};
                 // }
@@ -512,4 +513,4 @@ class SettingsData
     {
         return (array)$this->object;
     }
-}
+}

app/DataMapper/Tax/BaseRule.php

@@ -11,11 +11,11 @@
 
 namespace App\DataMapper\Tax;
 
+use App\DataMapper\Tax\ZipTax\Response;
+use App\DataProviders\USStates;
 use App\Models\Client;
 use App\Models\Invoice;
 use App\Models\Product;
-use App\DataProviders\USStates;
-use App\DataMapper\Tax\ZipTax\Response;
 
 class BaseRule implements RuleInterface
 {
@@ -66,7 +66,7 @@ class BaseRule implements RuleInterface
             'SK', // Slovakia
     ];
 
-    public array $region_codes = [ 
+    public array $region_codes = [
             'AT' => 'EU', // Austria
             'BE' => 'EU', // Belgium
             'BG' => 'EU', // Bulgaria
@@ -147,8 +147,9 @@ class BaseRule implements RuleInterface
 
         $this->resolveRegions();
 
-        if(!$this->isTaxableRegion())
+        if(!$this->isTaxableRegion()) {
             return $this;
+        }
 
         $this->configTaxData();
 
@@ -173,26 +174,26 @@ class BaseRule implements RuleInterface
         /** Harvest the client_region */
 
         /** If the tax data is already set and the invoice is marked as sent, do not adjust the rates */
-        if($this->invoice->tax_data && $this->invoice->status_id > 1)
+        if($this->invoice->tax_data && $this->invoice->status_id > 1) {
             return $this;
+        }
 
         /**
          * Origin - Company Tax Data
          * Destination - Client Tax Data
-         * 
+         *
          */
 
         $tax_data = false;
 
-        if($this->seller_region == 'US' && $this->client_region == 'US'){
+        if($this->seller_region == 'US' && $this->client_region == 'US') {
         
             $company = $this->invoice->company;
  
             /** If no company tax data has been configured, lets do that now. */
             /** We should never encounter this scenario */
-            if(!$company->origin_tax_data)
+            if(!$company->origin_tax_data) {
-            {
+                $this->should_calc_tax = false;
-                $this->should_calc_tax = false;        
                 return $this;
             }
 
@@ -201,8 +202,7 @@ class BaseRule implements RuleInterface
 
                 $tax_data = $company->origin_tax_data;
 
-            }
+            } elseif($this->client->tax_data) {
-            elseif($this->client->tax_data){
                                
                 $tax_data = $this->client->tax_data;
 
@@ -215,8 +215,14 @@ class BaseRule implements RuleInterface
 
             $this->invoice->tax_data = $tax_data;
             
-            if(\DB::transactionLevel() == 0)
+            if(\DB::transactionLevel() == 0) {
-                $this->invoice->saveQuietly();
+
+                try {
+                    $this->invoice->saveQuietly();
+                }catch(\Exception $e) {
+                }
+                
+            }
         }
             
         return $this;
@@ -234,7 +240,7 @@ class BaseRule implements RuleInterface
         
         $this->client_region = $this->region_codes[$this->client->country->iso_3166_2];
 
-        match($this->client_region){
+        match($this->client_region) {
             'US' => $this->client_subregion = isset($this->invoice?->client?->tax_data?->geoState) ? $this->invoice->client->tax_data->geoState : $this->getUSState(),
             'EU' => $this->client_subregion = $this->client->country->iso_3166_2,
             'AU' => $this->client_subregion = 'AU',
@@ -251,8 +257,9 @@ class BaseRule implements RuleInterface
             
             $states = USStates::$states;
 
-            if(isset($states[$this->client->state]))
+            if(isset($states[$this->client->state])) {
                 return $this->client->state;
+            }
 
             return USStates::getState(strlen($this->client->postal_code) > 1 ? $this->client->postal_code : $this->client->shipping_postal_code);
 
@@ -263,7 +270,7 @@ class BaseRule implements RuleInterface
 
     public function isTaxableRegion(): bool
     {
-        return $this->client->company->tax_data->regions->{$this->client_region}->tax_all_subregions || 
+        return $this->client->company->tax_data->regions->{$this->client_region}->tax_all_subregions ||
         (property_exists($this->client->company->tax_data->regions->{$this->client_region}->subregions, $this->client_subregion) && $this->client->company->tax_data->regions->{$this->client_region}->subregions->{$this->client_subregion}->apply_tax);
     }
 
@@ -277,8 +284,7 @@ class BaseRule implements RuleInterface
 
             return $this;
 
-        }
+        } elseif($this->client_region == 'AU') { //these are defaults and are only stubbed out for now, for AU we can actually remove these
-        elseif($this->client_region == 'AU'){ //these are defaults and are only stubbed out for now, for AU we can actually remove these
             
             $this->tax_rate1 = $this->client->company->tax_data->regions->AU->subregions->AU->tax_rate;
             $this->tax_name1 = $this->client->company->tax_data->regions->AU->subregions->AU->tax_name;

app/DataMapper/Tax/DE/Rule.php

@@ -11,12 +11,12 @@
 
 namespace App\DataMapper\Tax\DE;
 
-use App\Models\Product;
 use App\DataMapper\Tax\BaseRule;
 use App\DataMapper\Tax\RuleInterface;
+use App\Models\Product;
 
 class Rule extends BaseRule implements RuleInterface
-{    
+{
     /** @var string $seller_region */
     public string $seller_region = 'EU';
     
@@ -67,7 +67,7 @@ class Rule extends BaseRule implements RuleInterface
             return $this->taxExempt($item);
         }
 
-        match(intval($item->tax_id)){
+        match(intval($item->tax_id)) {
             Product::PRODUCT_TYPE_EXEMPT => $this->taxExempt($item),
             Product::PRODUCT_TYPE_DIGITAL => $this->taxDigital($item),
             Product::PRODUCT_TYPE_SERVICE => $this->taxService($item),
@@ -220,39 +220,28 @@ class Rule extends BaseRule implements RuleInterface
             // nlog("tax exempt");
             $this->tax_rate = 0;
             $this->reduced_tax_rate = 0;
-        }
+        } elseif($this->client_subregion != $this->client->company->tax_data->seller_subregion && in_array($this->client_subregion, $this->eu_country_codes) && $this->client->vat_number && $this->eu_business_tax_exempt) {
-        elseif($this->client_subregion != $this->client->company->tax_data->seller_subregion && in_array($this->client_subregion, $this->eu_country_codes) && $this->client->vat_number && $this->eu_business_tax_exempt)
+            // elseif($this->client_subregion != $this->client->company->tax_data->seller_subregion && in_array($this->client_subregion, $this->eu_country_codes) && $this->client->has_valid_vat_number && $this->eu_business_tax_exempt)
-        // elseif($this->client_subregion != $this->client->company->tax_data->seller_subregion && in_array($this->client_subregion, $this->eu_country_codes) && $this->client->has_valid_vat_number && $this->eu_business_tax_exempt)
-        {
             // nlog("euro zone and tax exempt");
             $this->tax_rate = 0;
             $this->reduced_tax_rate = 0;
-        }
+        } elseif(!in_array($this->client_subregion, $this->eu_country_codes) && ($this->foreign_consumer_tax_exempt || $this->foreign_business_tax_exempt)) { //foreign + tax exempt
-        elseif(!in_array($this->client_subregion, $this->eu_country_codes) && ($this->foreign_consumer_tax_exempt || $this->foreign_business_tax_exempt)) //foreign + tax exempt
-        {
             // nlog("foreign and tax exempt");
             $this->tax_rate = 0;
             $this->reduced_tax_rate = 0;
-        }
+        } elseif(!in_array($this->client_subregion, $this->eu_country_codes)) {
-        elseif(!in_array($this->client_subregion, $this->eu_country_codes))
-        {
             $this->defaultForeign();
-        }
+        } elseif(in_array($this->client_subregion, $this->eu_country_codes) && !$this->client->vat_number) { //eu country / no valid vat
-        elseif(in_array($this->client_subregion, $this->eu_country_codes) && !$this->client->vat_number) //eu country / no valid vat 
+            if(($this->client->company->tax_data->seller_subregion != $this->client_subregion) && $this->client->company->tax_data->regions->EU->has_sales_above_threshold) {
-        {   
-            if(($this->client->company->tax_data->seller_subregion != $this->client_subregion) && $this->client->company->tax_data->regions->EU->has_sales_above_threshold)
-            {
                 // nlog("eu zone with sales above threshold");
                 $this->tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->country->iso_3166_2}->tax_rate;
                 $this->reduced_tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->country->iso_3166_2}->reduced_tax_rate;
-            }
+            } else {
-            else {
                 // nlog("EU with intra-community supply ie DE to DE");
                 $this->tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->company->country()->iso_3166_2}->tax_rate;
                 $this->reduced_tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->company->country()->iso_3166_2}->reduced_tax_rate;
             }
-        }
+        } else {
-        else {
             // nlog("default tax");
             $this->tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->company->country()->iso_3166_2}->tax_rate;
             $this->reduced_tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->company->country()->iso_3166_2}->reduced_tax_rate;
@@ -262,4 +251,4 @@ class Rule extends BaseRule implements RuleInterface
 
     }
 
-}
+}

app/DataMapper/Tax/RuleInterface.php

@@ -36,4 +36,4 @@ interface RuleInterface
     public function override($item);
 
     public function calculateRates();
-}
+}

app/DataMapper/Tax/TaxData.php

@@ -15,7 +15,7 @@ use App\DataMapper\Tax\ZipTax\Response;
 
 /**
  * InvoiceTaxData
- * 
+ *
  * Definition for the invoice tax data structure
  */
 class TaxData

app/DataMapper/Tax/TaxModel.php

@@ -11,7 +11,7 @@
 
 namespace App\DataMapper\Tax;
 
-class TaxModel 
+class TaxModel
 {
     
     /** @var string $seller_subregion */
@@ -32,10 +32,11 @@ class TaxModel
     public function __construct(public ?TaxModel $model = null)
     {
         
-        if(!$this->model) 
+        if(!$this->model) {
             $this->regions = $this->init();
-        else
+        } else {
             $this->regions = $model;
+        }
 
     }
     
@@ -79,7 +80,7 @@ class TaxModel
      *
      * @return self
      */
-    private function auSubRegions(): self 
+    private function auSubRegions(): self
     {
 
         $this->regions->AU->subregions = new \stdClass();
@@ -387,7 +388,7 @@ class TaxModel
 
         $this->regions->EU->subregions->EE = new \stdClass();
         $this->regions->EU->subregions->EE->tax_rate = 20;
-        $this->regions->EU->subregions->EE->tax_name = 'KM';        
+        $this->regions->EU->subregions->EE->tax_name = 'KM';
         $this->regions->EU->subregions->EE->reduced_tax_rate = 9;
         $this->regions->EU->subregions->EE->apply_tax = false;
 

app/DataMapper/Tax/US/Rule.php

@@ -74,7 +74,7 @@ class Rule extends BaseRule implements RuleInterface
             Product::PRODUCT_TYPE_SHIPPING => $this->taxShipping($item),
             Product::PRODUCT_TYPE_PHYSICAL => $this->taxPhysical($item),
             Product::PRODUCT_TYPE_REDUCED_TAX => $this->taxReduced($item),
-            Product::PRODUCT_TYPE_OVERRIDE_TAX => $this->override($item), 
+            Product::PRODUCT_TYPE_OVERRIDE_TAX => $this->override($item),
             Product::PRODUCT_TYPE_ZERO_RATED => $this->zeroRated($item),
             default => $this->default($item),
         };
@@ -117,10 +117,9 @@ class Rule extends BaseRule implements RuleInterface
      */
     public function taxService($item): self
     {
-        if(in_array($this->tax_data?->txbService,['Y','L'])) {
+        if(in_array($this->tax_data?->txbService, ['Y','L'])) {
             $this->default($item);
-        }
+        } else {
-        else {
             $this->taxExempt($item);
         }
 
@@ -224,4 +223,4 @@ class Rule extends BaseRule implements RuleInterface
         return $this;
     }
 
-}
+}

app/DataMapper/Tax/ZipTax/Response.php

@@ -53,7 +53,7 @@ class Response
     *            "district5SalesTax" => 0,
     *            "district5UseTax" => 0,
     *            "originDestination" => "D",
-    *            
+    *
     *    ];
     *
     */
@@ -114,4 +114,3 @@ class Response
     }
 
 }
-    

app/DataProviders/USStates.php

@@ -33868,18 +33868,21 @@ class USStates
 
     public static function getState(?string $zip = '90210'): string
     {
-        if(isset(self::$zip_code_map[$zip]))
+        if(isset(self::$zip_code_map[$zip])) {
             return self::$zip_code_map[$zip];
+        }
 
         $prefix_state = self::getStateFromThreeDigitPrefix($zip);
 
-        if($prefix_state)
+        if($prefix_state) {
             return $prefix_state;
+        }
 
         $zippo_response = self::getStateFromZippo($zip);
 
-        if($zippo_response)
+        if($zippo_response) {
             return $zippo_response;
+        }
 
         throw new \Exception('Zip code not found');
     }
@@ -33905,8 +33908,9 @@ class USStates
 
         $response = Http::get("https://api.zippopotam.us/us/{$zip}");
 
-        if($response->failed())
+        if($response->failed()) {
             return false;
+        }
 
         $data = $response->object();
 
@@ -33921,7 +33925,7 @@ class USStates
     public static function getStateFromThreeDigitPrefix($zip): mixed
     {
 
-    /* 000 to 999 */
+        /* 000 to 999 */
         $zip_by_state = [
         '--', '--', '--', '--', '--', 'NY', 'PR', 'PR', 'VI', 'PR', 'MA', 'MA', 'MA',
         'MA', 'MA', 'MA', 'MA', 'MA', 'MA', 'MA', 'MA', 'MA', 'MA', 'MA', 'MA', 'MA',
@@ -34004,7 +34008,7 @@ class USStates
 
         $prefix = substr($zip, 0, 3);
         $index = intval($prefix);
-         /* converts prefix to integer */
+        /* converts prefix to integer */
         return $zip_by_state[$index] == "--" ? false : $zip_by_state[$index];
 
     }

app/Events/Account/AccountCreated.php

@@ -49,9 +49,9 @@ class AccountCreated
     //  *
     //  * @return Channel|array
     //  */
-     public function broadcastOn()
+    public function broadcastOn()
-     {
+    {
         return [];
-       //  return new PrivateChannel('channel-name');
+        //  return new PrivateChannel('channel-name');
-     }
+    }
 }

app/Events/Account/StripeConnectFailure.php

@@ -12,11 +12,9 @@
 namespace App\Events\Account;
 
 use App\Models\Company;
-use Illuminate\Broadcasting\Channel;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
 
 /**
  * Class StripeConnectFailure.

app/Events/Client/ClientWasArchived.php

@@ -15,7 +15,6 @@ use App\Models\Client;
 use App\Models\Company;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
@@ -54,8 +53,8 @@ class ClientWasArchived
     //  *
     //  * @return Channel|array
     //  */
-     public function broadcastOn()
+    public function broadcastOn()
-     {
+    {
         return [];
-     }
+    }
 }

app/Events/Company/CompanyDocumentsDeleted.php

@@ -14,7 +14,6 @@ namespace App\Events\Company;
 use App\Models\Company;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
@@ -42,8 +41,8 @@ class CompanyDocumentsDeleted
      *
      * @return Channel|array
      */
-     public function broadcastOn()
+    public function broadcastOn()
-     {
+    {
-return [];
+        return [];
-     }
+    }
 }

app/Events/Contact/ContactLoggedIn.php

@@ -14,7 +14,6 @@ namespace App\Events\Contact;
 use App\Models\ClientContact;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
@@ -50,8 +49,8 @@ class ContactLoggedIn
      *
      * @return Channel|array
      */
-     public function broadcastOn()
+    public function broadcastOn()
-     {
+    {
         return [];
-     }
+    }
 }

app/Events/Design/DesignWasArchived.php

@@ -15,7 +15,6 @@ use App\Models\Company;
 use App\Models\Design;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
@@ -35,8 +34,8 @@ class DesignWasArchived
      *
      * @return Channel|array
      */
-     public function broadcastOn()
+    public function broadcastOn()
-     {
+    {
         return [];
-     }
+    }
 }

app/Events/Design/DesignWasCreated.php

@@ -11,10 +11,10 @@
 
 namespace App\Events\Design;
 
-use App\Models\Design;
 use App\Models\Company;
-use Illuminate\Queue\SerializesModels;
+use App\Models\Design;
 use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Queue\SerializesModels;
 
 /**
  * Class DesignWasCreated.
@@ -32,8 +32,8 @@ class DesignWasCreated
      *
      * @return PrivateChannel|array
      */
-     public function broadcastOn()
+    public function broadcastOn()
-     {
+    {
         return [];
-     }
+    }
 }

app/Events/Design/DesignWasDeleted.php

@@ -11,10 +11,10 @@
 
 namespace App\Events\Design;
 
-use App\Models\Design;
 use App\Models\Company;
-use Illuminate\Queue\SerializesModels;
+use App\Models\Design;
 use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Queue\SerializesModels;
 
 /**
  * Class DesignWasDeleted.
@@ -32,8 +32,8 @@ class DesignWasDeleted
      *
      * @return PrivateChannel|array
     */
-     public function broadcastOn()
+    public function broadcastOn()
-     {
+    {
         return [];
-     }
+    }
 }

app/Events/Design/DesignWasRestored.php

@@ -11,10 +11,10 @@
 
 namespace App\Events\Design;
 
-use App\Models\Design;
 use App\Models\Company;
-use Illuminate\Queue\SerializesModels;
+use App\Models\Design;
 use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Queue\SerializesModels;
 
 /**
  * Class DesignWasRestored.
@@ -32,8 +32,8 @@ class DesignWasRestored
      *
      * @return PrivateChannel|array
      */
-     public function broadcastOn()
+    public function broadcastOn()
-     {
+    {
         return [];
-     }
+    }
 }

app/Events/Design/DesignWasUpdated.php

@@ -11,10 +11,10 @@
 
 namespace App\Events\Design;
 
-use App\Models\Design;
 use App\Models\Company;
-use Illuminate\Queue\SerializesModels;
+use App\Models\Design;
 use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Queue\SerializesModels;
 
 /**
  * Class DesignWasUpdated.
@@ -32,8 +32,8 @@ class DesignWasUpdated
      *
      * @return PrivateChannel|array
      */
-     public function broadcastOn()
+    public function broadcastOn()
-     {
+    {
         return [];
-     }
+    }
 }

app/Events/Document/DocumentWasArchived.php

@@ -15,7 +15,6 @@ use App\Models\Company;
 use App\Models\Document;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 

app/Events/Payment/Methods/MethodDeleted.php

@@ -15,7 +15,6 @@ use App\Models\ClientGatewayToken;
 use App\Models\Company;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
@@ -51,8 +50,8 @@ class MethodDeleted
      *
      * @return Channel|array
      */
-     public function broadcastOn()
+    public function broadcastOn()
-     {
+    {
         return [];
-     }
+    }
 }

app/Events/Payment/PaymentWasEmailed.php

@@ -11,12 +11,12 @@
 
 namespace App\Events\Payment;
 
+use App\Models\ClientContact;
 use App\Models\Company;
 use App\Models\Payment;
-use App\Models\ClientContact;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
 
 /**
  * Class PaymentWasEmailed.

app/Events/PurchaseOrder/PurchaseOrderWasViewed.php

@@ -12,7 +12,6 @@
 namespace App\Events\PurchaseOrder;
 
 use App\Models\Company;
-use App\Models\PurchaseOrder;
 use App\Models\PurchaseOrderInvitation;
 use Illuminate\Queue\SerializesModels;
 

app/Events/Quote/QuoteWasEmailed.php

@@ -12,7 +12,6 @@
 namespace App\Events\Quote;
 
 use App\Models\Company;
-use App\Models\Quote;
 use App\Models\QuoteInvitation;
 use Illuminate\Queue\SerializesModels;
 

app/Events/Subscription/SubscriptionWasCreated.php

@@ -5,7 +5,6 @@ namespace App\Events\Subscription;
 use App\Models\Company;
 use App\Models\Subscription;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
@@ -45,8 +44,8 @@ class SubscriptionWasCreated
      *
      * @return \Illuminate\Broadcasting\Channel|array
      */
-     public function broadcastOn()
+    public function broadcastOn()
-     {
+    {
         return [];
-     }
+    }
 }

app/Events/User/UserLoggedIn.php

@@ -15,7 +15,6 @@ use App\Models\Company;
 use App\Models\User;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
@@ -35,8 +34,8 @@ class UserLoggedIn
      *
      * @return Channel|array
      */
-     public function broadcastOn()
+    public function broadcastOn()
-     {
+    {
         return [];
-     }
+    }
 }

app/Events/User/UserWasArchived.php

@@ -15,7 +15,6 @@ use App\Models\Company;
 use App\Models\User;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
@@ -35,8 +34,8 @@ class UserWasArchived
      *
      * @return Channel|array
      */
-     public function broadcastOn()
+    public function broadcastOn()
-     {
+    {
         return [];
-     }
+    }
 }

app/Events/User/UserWasCreated.php

@@ -15,7 +15,6 @@ use App\Models\Company;
 use App\Models\User;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
@@ -35,8 +34,8 @@ class UserWasCreated
      *
      * @return Channel|array
      */
-     public function broadcastOn()
+    public function broadcastOn()
-     {
+    {
         return [];
-     }
+    }
 }

app/Events/User/UserWasDeleted.php

@@ -15,7 +15,6 @@ use App\Models\Company;
 use App\Models\User;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
@@ -54,8 +53,8 @@ class UserWasDeleted
      *
      * @return Channel|array
      */
-     public function broadcastOn()
+    public function broadcastOn()
-     {
+    {
         return [];
-     }
+    }
 }

app/Events/User/UserWasRestored.php

@@ -15,7 +15,6 @@ use App\Models\Company;
 use App\Models\User;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
@@ -54,8 +53,8 @@ class UserWasRestored
      *
      * @return Channel|array
      */
-     public function broadcastOn()
+    public function broadcastOn()
-     {
+    {
         return [];
-     }
+    }
 }

app/Events/User/UserWasUpdated.php

@@ -15,7 +15,6 @@ use App\Models\Company;
 use App\Models\User;
 use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
@@ -54,8 +53,8 @@ class UserWasUpdated
      *
      * @return Channel|array
      */
-     public function broadcastOn()
+    public function broadcastOn()
-     {
+    {
         return [];
-     }
+    }
 }

app/Events/Vendor/VendorContactLoggedIn.php

@@ -14,9 +14,9 @@ namespace App\Events\Vendor;
 use App\Models\Company;
 use App\Models\VendorContact;
 use Illuminate\Broadcasting\Channel;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
 
 /**
  * Class VendorContactLoggedIn.

app/Exceptions/Handler.php

@@ -11,31 +11,31 @@
 
 namespace App\Exceptions;
 
-use Throwable;
-use PDOException;
 use App\Utils\Ninja;
-use Sentry\State\Scope;
-use Illuminate\Support\Arr;
-use Illuminate\Http\Request;
-use InvalidArgumentException;
-use Sentry\Laravel\Integration;
-use Illuminate\Support\Facades\Schema;
 use Aws\Exception\CredentialsException;
 use GuzzleHttp\Exception\ConnectException;
-use Illuminate\Auth\AuthenticationException;
-use League\Flysystem\UnableToCreateDirectory;
-use Illuminate\Session\TokenMismatchException;
-use Illuminate\Validation\ValidationException;
 use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Queue\MaxAttemptsExceededException;
+use Illuminate\Auth\AuthenticationException;
-use Illuminate\Http\Exceptions\ThrottleRequestsException;
+use Illuminate\Database\Eloquent\ModelNotFoundException as ModelNotFoundException;
-use Symfony\Component\Process\Exception\RuntimeException;
 use Illuminate\Database\Eloquent\RelationNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Http\Exceptions\ThrottleRequestsException;
+use Illuminate\Http\Request;
+use Illuminate\Queue\MaxAttemptsExceededException;
+use Illuminate\Session\TokenMismatchException;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Validation\ValidationException;
+use InvalidArgumentException;
+use League\Flysystem\UnableToCreateDirectory;
+use PDOException;
+use Sentry\Laravel\Integration;
+use Sentry\State\Scope;
 use Symfony\Component\Console\Exception\CommandNotFoundException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
-use Illuminate\Database\Eloquent\ModelNotFoundException as ModelNotFoundException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\Process\Exception\RuntimeException;
+use Throwable;
 
 class Handler extends ExceptionHandler
 {
@@ -223,8 +223,8 @@ class Handler extends ExceptionHandler
             return response()->json(['message' => $exception->getMessage()], 500);
         } elseif ($exception instanceof ThrottleRequestsException && $request->expectsJson()) {
             return response()->json(['message'=>'Too many requests'], 429);
-        // } elseif ($exception instanceof FatalThrowableError && $request->expectsJson()) {
+            // } elseif ($exception instanceof FatalThrowableError && $request->expectsJson()) {
-        //     return response()->json(['message'=>'Fatal error'], 500); //@deprecated
+            //     return response()->json(['message'=>'Fatal error'], 500); //@deprecated
         } elseif ($exception instanceof AuthorizationException && $request->expectsJson()) {
             return response()->json(['message'=> $exception->getMessage()], 401);
         } elseif ($exception instanceof TokenMismatchException) {

app/Exceptions/PaymentRefundFailed.php

@@ -13,8 +13,8 @@
 namespace App\Exceptions;
 
 use Exception;
-use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 
 class PaymentRefundFailed extends Exception
 {

app/Exceptions/QuoteConversion.php

@@ -13,8 +13,8 @@
 namespace App\Exceptions;
 
 use Exception;
-use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 
 class QuoteConversion extends Exception
 {

app/Exceptions/YodleeApiException.php

@@ -13,8 +13,8 @@
 namespace App\Exceptions;
 
 use Exception;
-use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 
 class YodleeApiException extends Exception
 {

app/Export/CSV/ActivityExport.php

@@ -11,17 +11,17 @@
 
 namespace App\Export\CSV;
 
-use App\Models\Task;
-use App\Utils\Ninja;
-use League\Csv\Writer;
-use App\Models\Company;
-use App\Models\Activity;
 use App\Libraries\MultiDB;
+use App\Models\Activity;
+use App\Models\Company;
 use App\Models\DateFormat;
+use App\Models\Task;
+use App\Transformers\ActivityTransformer;
+use App\Utils\Ninja;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\App;
-use Illuminate\Database\Eloquent\Builder;
+use League\Csv\Writer;
-use App\Transformers\ActivityTransformer;
 
 class ActivityExport extends BaseExport
 {
@@ -53,44 +53,44 @@ class ActivityExport extends BaseExport
 
         $headerdisplay = $this->buildHeader();
 
-        $header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
+        $header = collect($this->input['report_keys'])->map(function ($key, $value) use ($headerdisplay) {
-                return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
+            return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
-            })->toArray();
+        })->toArray();
 
             
-            $report = $query->cursor()
+        $report = $query->cursor()
-                ->map(function ($resource) {
+            ->map(function ($resource) {
-                    $row = $this->buildActivityRow($resource);
+                $row = $this->buildActivityRow($resource);
-                    return $this->processMetaData($row, $resource);
+                return $this->processMetaData($row, $resource);
-                })->toArray();
+            })->toArray();
         
         return array_merge(['columns' => $header], $report);
     }
 
     private function buildActivityRow(Activity $activity): array
     {
-            return [
+        return [
-            Carbon::parse($activity->created_at)->format($this->date_format),
+        Carbon::parse($activity->created_at)->format($this->date_format),
-            ctrans("texts.activity_{$activity->activity_type_id}",[
+        ctrans("texts.activity_{$activity->activity_type_id}", [
-                'payment_amount' => $activity->payment ? $activity->payment->amount : '',
+            'payment_amount' => $activity->payment ? $activity->payment->amount : '',
-                'adjustment' => $activity->payment ? $activity->payment->refunded : '',
+            'adjustment' => $activity->payment ? $activity->payment->refunded : '',
-                'client' => $activity->client ? $activity->client->present()->name() : '',
+            'client' => $activity->client ? $activity->client->present()->name() : '',
-                'contact' => $activity->contact ? $activity->contact->present()->name() : '',
+            'contact' => $activity->contact ? $activity->contact->present()->name() : '',
-                'quote' => $activity->quote ? $activity->quote->number : '',
+            'quote' => $activity->quote ? $activity->quote->number : '',
-                'user' => $activity->user ? $activity->user->present()->name() : 'System',
+            'user' => $activity->user ? $activity->user->present()->name() : 'System',
-                'expense' => $activity->expense ? $activity->expense->number : '',
+            'expense' => $activity->expense ? $activity->expense->number : '',
-                'invoice' => $activity->invoice ? $activity->invoice->number : '',
+            'invoice' => $activity->invoice ? $activity->invoice->number : '',
-                'recurring_invoice' => $activity->recurring_invoice ? $activity->recurring_invoice->number : '',
+            'recurring_invoice' => $activity->recurring_invoice ? $activity->recurring_invoice->number : '',
-                'payment' => $activity->payment ? $activity->payment->number : '',
+            'payment' => $activity->payment ? $activity->payment->number : '',
-                'credit' => $activity->credit ? $activity->credit->number : '',
+            'credit' => $activity->credit ? $activity->credit->number : '',
-                'task' => $activity->task ? $activity->task->number : '',
+            'task' => $activity->task ? $activity->task->number : '',
-                'vendor' => $activity->vendor ? $activity->vendor->present()->name() : '',
+            'vendor' => $activity->vendor ? $activity->vendor->present()->name() : '',
-                'purchase_order' => $activity->purchase_order ? $activity->purchase_order->number : '',
+            'purchase_order' => $activity->purchase_order ? $activity->purchase_order->number : '',
-                'subscription' => $activity->subscription ? $activity->subscription->name : '',
+            'subscription' => $activity->subscription ? $activity->subscription->name : '',
-                'vendor_contact' => $activity->vendor_contact ? $activity->vendor_contact->present()->name() : '',
+            'vendor_contact' => $activity->vendor_contact ? $activity->vendor_contact->present()->name() : '',
-                'recurring_expense' => $activity->recurring_expense ? $activity->recurring_expense->number : '',
+            'recurring_expense' => $activity->recurring_expense ? $activity->recurring_expense->number : '',
-            ]),
+        ]),
-            $activity->ip,
+        $activity->ip,
         ];
         
     }
@@ -169,6 +169,6 @@ class ActivityExport extends BaseExport
         }
 
         return $clean_row;
-    }   
+    }
 
 }

app/Export/CSV/BaseExport.php

@@ -11,30 +11,28 @@
 
 namespace App\Export\CSV;
 
-use App\Models\Activity;
-use App\Models\Quote;
-use App\Utils\Number;
 use App\Models\Client;
-use App\Models\Credit;
+use App\Models\ClientContact;
-use App\Utils\Helpers;
 use App\Models\Company;
+use App\Models\Credit;
+use App\Models\Document;
 use App\Models\Expense;
 use App\Models\Invoice;
 use App\Models\Payment;
-use App\Models\Document;
-use League\Fractal\Manager;
-use App\Models\ClientContact;
-use App\Models\PurchaseOrder;
-use App\Models\RecurringInvoice;
-use Illuminate\Support\Carbon;
-use App\Utils\Traits\MakesHash;
-use App\Transformers\TaskTransformer;
-use App\Transformers\PaymentTransformer;
-use Illuminate\Database\Eloquent\Builder;
-use League\Fractal\Serializer\ArraySerializer;
 use App\Models\Product;
+use App\Models\PurchaseOrder;
+use App\Models\Quote;
+use App\Models\RecurringInvoice;
 use App\Models\Task;
 use App\Models\Vendor;
+use App\Transformers\PaymentTransformer;
+use App\Transformers\TaskTransformer;
+use App\Utils\Helpers;
+use App\Utils\Traits\MakesHash;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
+use League\Fractal\Manager;
+use League\Fractal\Serializer\ArraySerializer;
 
 class BaseExport
 {
@@ -170,9 +168,10 @@ class BaseExport
         'tax_rate2' => 'invoice.tax_rate2',
         'tax_rate3' => 'invoice.tax_rate3',
         'recurring_invoice' => 'invoice.recurring_id',
+        'auto_bill' => 'invoice.auto_bill_enabled',
     ];
 
-    protected array $recurring_invoice_report_keys = [    
+    protected array $recurring_invoice_report_keys = [
         "invoice_number" => "recurring_invoice.number",
         "amount" => "recurring_invoice.amount",
         "balance" => "recurring_invoice.balance",
@@ -210,6 +209,9 @@ class BaseExport
         'tax_rate1' => 'recurring_invoice.tax_rate1',
         'tax_rate2' => 'recurring_invoice.tax_rate2',
         'tax_rate3' => 'recurring_invoice.tax_rate3',
+        'auto_bill' => 'recurring_invoice.auto_bill',
+        'auto_bill_enabled' => 'recurring_invoice.auto_bill_enabled',
+
     ];
 
     protected array $purchase_order_report_keys = [
@@ -289,6 +291,7 @@ class BaseExport
         'is_amount_discount' => 'item.is_amount_discount',
         'line_total' => 'item.line_total',
         'gross_line_total' => 'item.gross_line_total',
+        'tax_amount' => 'item.tax_amount',
     ];
 
     protected array $quote_report_keys = [
@@ -446,8 +449,7 @@ class BaseExport
             $client = Client::withTrashed()->find($this->input['client_id']);
             $this->client_description = $client->present()->name;
             return $query->where('client_id', $this->input['client_id']);
-        }
+        } elseif(isset($this->input['clients']) && count($this->input['clients']) > 0) {
-        elseif(isset($this->input['clients']) && count($this->input['clients']) > 0) {
 
             $this->client_description = 'Multiple Clients';
             return $query->whereIn('client_id', $this->input['clients']);
@@ -459,8 +461,9 @@ class BaseExport
     {
         $parts = explode(".", $key);
 
-        if(!is_array($parts) || count($parts) < 2)
+        if(!is_array($parts) || count($parts) < 2) {
             return '';
+        }
 
         $value = '';
 
@@ -497,8 +500,9 @@ class BaseExport
 
     private function resolveVendorContactKey($column, $entity, $transformer)
     {
-        if(!$entity->vendor)
+        if(!$entity->vendor) {
             return "";
+        }
 
         $primary_contact = $entity->vendor->primary_contact()->first() ?? $entity->vendor->contacts()->first();
 
@@ -510,18 +514,21 @@ class BaseExport
     private function resolveExpenseKey($column, $entity, $transformer)
     {
      
-        if($column == 'user' && $entity?->expense?->user)
+        if($column == 'user' && $entity?->expense?->user) {
             return $entity->expense->user->present()->name() ?? ' ';
+        }
 
-        if($column == 'assigned_user' && $entity?->expense?->assigned_user) 
+        if($column == 'assigned_user' && $entity?->expense?->assigned_user) {
             return $entity->expense->assigned_user->present()->name() ?? ' ';
+        }
 
         if($column == 'category' && $entity->expense) {
             return $entity->expense->category?->name ?? ' ';
         }
 
-        if($entity instanceof Expense)
+        if($entity instanceof Expense) {
             return '';
+        }
 
         $transformed_entity = $transformer->includeExpense($entity);
 
@@ -529,11 +536,13 @@ class BaseExport
         $manager->setSerializer(new ArraySerializer());
         $transformed_entity = $manager->createData($transformed_entity)->toArray();
 
-        if(array_key_exists($column, $transformed_entity)) 
+        if(array_key_exists($column, $transformed_entity)) {
-            return $transformed_entity[$column];    
+            return $transformed_entity[$column];
+        }
 
-        if(property_exists($entity, $column))
+        if(property_exists($entity, $column)) {
             return $entity?->{$column} ?? '';
+        }
 
         nlog("export: Could not resolve expense key: {$column}");
 
@@ -560,8 +569,9 @@ class BaseExport
     private function resolveVendorKey($column, $entity, $transformer)
     {
 
-        if(!$entity->vendor)
+        if(!$entity->vendor) {
             return '';
+        }
 
         $transformed_entity = $transformer->includeVendor($entity);
 
@@ -569,24 +579,29 @@ class BaseExport
         $manager->setSerializer(new ArraySerializer());
         $transformed_entity = $manager->createData($transformed_entity)->toArray();
 
-        if($column == 'name')
+        if($column == 'name') {
             return $entity->vendor->present()->name() ?: '';
+        }
         
-        if($column == 'user_id')
+        if($column == 'user_id') {
             return $entity->vendor->user->present()->name()  ?: '';
+        }
 
-        if($column == 'country_id')
+        if($column == 'country_id') {
             return $entity->vendor->country ? ctrans("texts.country_{$entity->vendor->country->name}") : '';
+        }
 
         if ($column == 'currency_id') {
             return $entity->vendor->currency() ? $entity->vendor->currency()->code : $entity->company->currency()->code;
         }
 
-        if($column == 'status')
+        if($column == 'status') {
             return $entity->stringStatus($entity->status_id) ?: '';
+        }
 
-        if(array_key_exists($column, $transformed_entity))
+        if(array_key_exists($column, $transformed_entity)) {
             return $transformed_entity[$column];
+        }
 
         // nlog("export: Could not resolve vendor key: {$column}");
 
@@ -598,8 +613,9 @@ class BaseExport
     private function resolveClientKey($column, $entity, $transformer)
     {
 
-        if(!$entity->client)
+        if(!$entity->client) {
             return '';
+        }
 
         $transformed_client = $transformer->includeClient($entity);
 
@@ -607,36 +623,46 @@ class BaseExport
         $manager->setSerializer(new ArraySerializer());
         $transformed_client = $manager->createData($transformed_client)->toArray();
 
-        if(in_array($column, ['client.name', 'name']))
+        if(in_array($column, ['client.name', 'name'])) {
             return $transformed_client['display_name'];
+        }
         
-        if(in_array($column, ['client.user_id', 'user_id']))
+        if(in_array($column, ['client.user_id', 'user_id'])) {
             return $entity->client->user->present()->name();
+        }
 
-        if(in_array($column, ['client.assigned_user_id', 'assigned_user_id'])) 
+        if(in_array($column, ['client.assigned_user_id', 'assigned_user_id'])) {
             return $entity->client->assigned_user->present()->name();
+        }
 
-        if(in_array($column, ['client.country_id', 'country_id']))
+        if(in_array($column, ['client.country_id', 'country_id'])) {
             return $entity->client->country ? ctrans("texts.country_{$entity->client->country->name}") : '';
+        }
         
-        if(in_array($column, ['client.shipping_country_id', 'shipping_country_id']))
+        if(in_array($column, ['client.shipping_country_id', 'shipping_country_id'])) {
             return $entity->client->shipping_country ? ctrans("texts.country_{$entity->client->shipping_country->name}") : '';
+        }
         
-        if(in_array($column, ['client.size_id', 'size_id']))
+        if(in_array($column, ['client.size_id', 'size_id'])) {
             return $entity->client->size?->name ?? '';
+        }
 
-        if(in_array($column, ['client.industry_id', 'industry_id']))
+        if(in_array($column, ['client.industry_id', 'industry_id'])) {
             return $entity->client->industry?->name ?? '';
+        }
 
-        if (in_array($column, ['client.currency_id', 'currency_id']))
+        if (in_array($column, ['client.currency_id', 'currency_id'])) {
             return $entity->client->currency() ? $entity->client->currency()->code : $entity->company->currency()->code;
+        }
         
-        if(in_array($column, ['payment_terms', 'client.payment_terms']))
+        if(in_array($column, ['payment_terms', 'client.payment_terms'])) {
             return $entity->client->getSetting('payment_terms');
+        }
         
 
-        if(array_key_exists($column, $transformed_client))
+        if(array_key_exists($column, $transformed_client)) {
             return $transformed_client[$column];
+        }
 
         // nlog("export: Could not resolve client key: {$column}");
 
@@ -650,8 +676,9 @@ class BaseExport
 
         $transformed_entity = $transformer->transform($entity);
 
-        if($column == 'status')
+        if($column == 'status') {
             return $entity->stringStatus($entity->status_id);
+        }
     
         return '';
     }
@@ -682,16 +709,19 @@ class BaseExport
             $manager->setSerializer(new ArraySerializer());
             $transformed_invoices = $manager->createData($transformed_invoices)->toArray();
 
-            if(!isset($transformed_invoices['App\\Models\\Invoice']))
+            if(!isset($transformed_invoices['App\\Models\\Invoice'])) {
                 return '';
+            }
            
             $transformed_invoices = $transformed_invoices['App\\Models\\Invoice'];
 
-            if(count($transformed_invoices) == 1 && array_key_exists($column, $transformed_invoices[0]))
+            if(count($transformed_invoices) == 1 && array_key_exists($column, $transformed_invoices[0])) {
                 return $transformed_invoices[0][$column];
+            }
 
-            if(count($transformed_invoices) > 1 && array_key_exists($column, $transformed_invoices[0]))
+            if(count($transformed_invoices) > 1 && array_key_exists($column, $transformed_invoices[0])) {
                 return implode(', ', array_column($transformed_invoices, $column));
+            }
 
             return "";
 
@@ -700,8 +730,9 @@ class BaseExport
         if($transformer instanceof TaskTransformer && ($entity->invoice ?? false)) {
             $transformed_invoice = $transformer->includeInvoice($entity);
 
-            if(!$transformed_invoice)
+            if(!$transformed_invoice) {
                 return '';
+            }
 
             $manager = new Manager();
             $manager->setSerializer(new ArraySerializer());
@@ -721,7 +752,7 @@ class BaseExport
     private function resolvePaymentKey($column, $entity, $transformer)
     {
 
-        if($entity instanceof Payment){
+        if($entity instanceof Payment) {
 
             $transformed_payment = $transformer->transform($entity);
 
@@ -737,8 +768,9 @@ class BaseExport
 
         }
 
-        if($column == 'amount')
+        if($column == 'amount') {
             return $entity->payments()->exists() ? $entity->payments()->withoutTrashed()->sum('paymentables.amount') : ctrans('texts.unpaid');
+        }
 
         if($column == 'refunded') {
             return $entity->payments()->exists() ? $entity->payments()->withoutTrashed()->sum('paymentables.refunded') : '';
@@ -753,37 +785,60 @@ class BaseExport
 
         $payment = $entity->payments()->withoutTrashed()->first();
 
-        if(!$payment)
+        if(!$payment) {
             return '';
+        }
 
-        if($column == 'method')
+        if($column == 'method') {
             return $payment->translatedType();
+        }
 
-        if($column == 'currency')
+        if($column == 'currency') {
             return $payment?->currency?->code ?? '';
+        }
 
         $payment_transformer = new PaymentTransformer();
         $transformed_payment = $payment_transformer->transform($payment);
 
-        if($column == 'status'){
+        if($column == 'status') {
             return $payment->stringStatus($transformed_payment['status_id']);
         }
 
-        if(array_key_exists($column, $transformed_payment))
+        if(array_key_exists($column, $transformed_payment)) {
             return $transformed_payment[$column];
+        }
 
         return '';
 
     }
 
+    public function applyFilters(Builder $query): Builder
+    {
+
+        if(isset($this->input['product_key'])) {
+        
+            $products = explode(",", $this->input['product_key']);
+
+            $query->where(function ($q) use ($products) {
+                foreach($products as $product) {
+                    $q->orWhereJsonContains('line_items', ['product_key' => $product]);
+                }
+            });
+
+        }
+        
+        return $query;
+    }
+
     protected function addInvoiceStatusFilter($query, $status): Builder
     {
 
         $status_parameters = explode(',', $status);
         
 
-        if(in_array('all', $status_parameters))
+        if(in_array('all', $status_parameters)) {
             return $query;
+        }
 
         $query->where(function ($nested) use ($status_parameters) {
 
@@ -816,9 +871,9 @@ class BaseExport
                                 ->orWhere('partial_due_date', '<', Carbon::now());
             }
 
-            if(in_array('viewed', $status_parameters)){
+            if(in_array('viewed', $status_parameters)) {
                 
-                $nested->whereHas('invitations', function ($q){
+                $nested->whereHas('invitations', function ($q) {
                     $q->whereNotNull('viewed_date')->whereNotNull('deleted_at');
                 });
 
@@ -832,6 +887,8 @@ class BaseExport
 
     protected function addDateRange($query)
     {
+        $query = $this->applyFilters($query);
+
         $date_range = $this->input['date_range'];
 
         if (array_key_exists('date_key', $this->input) && strlen($this->input['date_key']) > 1) {
@@ -884,8 +941,9 @@ class BaseExport
                 $first_month_of_year = $this->company->getSetting('first_month_of_year') ?? 1;
                 $fin_year_start = now()->createFromDate(now()->year, $first_month_of_year, 1);
 
-                if(now()->lt($fin_year_start))
+                if(now()->lt($fin_year_start)) {
                     $fin_year_start->subYearNoOverflow();
+                }
 
                 $this->start_date = $fin_year_start->format('Y-m-d');
                 $this->end_date = $fin_year_start->copy()->addYear()->subDay()->format('Y-m-d');
@@ -896,8 +954,9 @@ class BaseExport
                 $fin_year_start = now()->createFromDate(now()->year, $first_month_of_year, 1);
                 $fin_year_start->subYearNoOverflow();
 
-                if(now()->subYear()->lt($fin_year_start)) 
+                if(now()->subYear()->lt($fin_year_start)) {
                     $fin_year_start->subYearNoOverflow();
+                }
 
                 $this->start_date = $fin_year_start->format('Y-m-d');
                 $this->end_date = $fin_year_start->copy()->addYear()->subDay()->format('Y-m-d');
@@ -914,7 +973,7 @@ class BaseExport
     }
     
     /**
-     * Returns the merged array of 
+     * Returns the merged array of
      * the entity with the matching
      * item report keys
      *
@@ -979,8 +1038,9 @@ class BaseExport
                 $prefix = ctrans('texts.expense')." ";
                 $key = array_search($value, $this->expense_report_keys);
                 
-                    if(!$key && $value == 'expense.category')
+                if(!$key && $value == 'expense.category') {
-                        $key = 'category';
+                    $key = 'category';
+                }
             }
 
             if(!$key) {
@@ -1024,42 +1084,36 @@ class BaseExport
             $key = str_replace('product.', '', $key);
             $key = str_replace('task.', '', $key);
 
-            if(stripos($value, 'custom_value') !== false)
+            if(stripos($value, 'custom_value') !== false) {
-            {
                 $parts = explode(".", $value);
 
-                if(count($parts) == 2 && in_array($parts[0], ['credit','quote','invoice','purchase_order','recurring_invoice'])){
+                if(count($parts) == 2 && in_array($parts[0], ['credit','quote','invoice','purchase_order','recurring_invoice'])) {
                     $entity = "invoice".substr($parts[1], -1);
                     $prefix = ctrans("texts.".$parts[0]);
                     $fallback = "custom_value".substr($parts[1], -1);
                     $custom_field_label = $helper->makeCustomField($this->company->custom_fields, $entity);
 
-                    if(strlen($custom_field_label) > 1)
+                    if(strlen($custom_field_label) > 1) {
                         $header[] = $custom_field_label;
-                    else {
+                    } else {
                         $header[] = $prefix . " ". ctrans("texts.{$fallback}");
                     }
 
-                }
+                } elseif(count($parts) == 2 && (stripos($parts[0], 'vendor_contact') !== false || stripos($parts[0], 'contact') !== false)) {
-                elseif(count($parts) == 2 && (stripos($parts[0], 'vendor_contact') !== false || stripos($parts[0], 'contact') !== false)) {
                     $parts[0] = str_replace('vendor_contact', 'contact', $parts[0]);
 
                     $entity = "contact".substr($parts[1], -1);
                     $custom_field_string = strlen($helper->makeCustomField($this->company->custom_fields, $entity)) > 1 ? $helper->makeCustomField($this->company->custom_fields, $entity) : ctrans("texts.{$parts[1]}");
                     $header[] = ctrans("texts.{$parts[0]}") . " " . $custom_field_string;
                     
-                }
+                } elseif(count($parts) == 2 && in_array(substr($original_key, 0, -1), ['credit','quote','invoice','purchase_order','recurring_invoice','task'])) {
-                elseif(count($parts) == 2 && in_array(substr($original_key, 0, -1), ['credit','quote','invoice','purchase_order','recurring_invoice','task'])){
+                    $custom_field_string = strlen($helper->makeCustomField($this->company->custom_fields, "product".substr($original_key, -1))) > 1 ? $helper->makeCustomField($this->company->custom_fields, "product".substr($original_key, -1)) : ctrans("texts.{$parts[1]}");
-                    $custom_field_string = strlen($helper->makeCustomField($this->company->custom_fields, "product".substr($original_key,-1))) > 1 ? $helper->makeCustomField($this->company->custom_fields, "product".substr($original_key,-1)) : ctrans("texts.{$parts[1]}");
                     $header[] = ctrans("texts.{$parts[0]}") . " " . $custom_field_string;
-                }
+                } else {
-                else{
                     $header[] = "{$prefix}" . ctrans("texts.{$key}");
                 }
 
-            }
+            } else {
-            else
-            {
                 $header[] = "{$prefix}" . ctrans("texts.{$key}");
             }
         }
@@ -1104,7 +1158,7 @@ class BaseExport
                 $value = 'image';
             }
 
-            if($value == 'tax_id') {         
+            if($value == 'tax_id') {
                 $column_key = 'tax_category';
                 $value = 'tax_category';
             }
@@ -1119,7 +1173,7 @@ class BaseExport
         }
 
         return $clean_row;
-    }   
+    }
 
     public function processItemMetaData(array $row, $resource): array
     {
@@ -1146,11 +1200,13 @@ class BaseExport
             
             $column_key = $value;
 
-            if($value == 'type_id' || $value == 'item.type_id')
+            if($value == 'type_id' || $value == 'item.type_id') {
                 $column_key = 'type';
+            }
 
-            if($value == 'tax_id' || $value == 'item.tax_id')
+            if($value == 'tax_id' || $value == 'item.tax_id') {
                 $column_key = 'tax_category';
+            }
                 
             $clean_row[$key]['entity'] = $report_keys[0];
             $clean_row[$key]['id'] = $report_keys[1] ?? $report_keys[0];
@@ -1162,6 +1218,6 @@ class BaseExport
         }
 
         return $clean_row;
-    }   
+    }
 
 }

app/Export/CSV/ClientExport.php

@@ -11,16 +11,16 @@
 
 namespace App\Export\CSV;
 
+use App\Libraries\MultiDB;
+use App\Models\Client;
+use App\Models\Company;
+use App\Transformers\ClientContactTransformer;
+use App\Transformers\ClientTransformer;
 use App\Utils\Ninja;
 use App\Utils\Number;
-use App\Models\Client;
-use League\Csv\Writer;
-use App\Models\Company;
-use App\Libraries\MultiDB;
-use Illuminate\Support\Facades\App;
-use App\Transformers\ClientTransformer;
 use Illuminate\Database\Eloquent\Builder;
-use App\Transformers\ClientContactTransformer;
+use Illuminate\Support\Facades\App;
+use League\Csv\Writer;
 
 class ClientExport extends BaseExport
 {
@@ -92,9 +92,9 @@ class ClientExport extends BaseExport
 
         $headerdisplay = $this->buildHeader();
 
-        $header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
+        $header = collect($this->input['report_keys'])->map(function ($key, $value) use ($headerdisplay) {
-                return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
+            return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
-            })->toArray();
+        })->toArray();
 
         $report = $query->cursor()
                 ->map(function ($client) {
@@ -126,7 +126,7 @@ class ClientExport extends BaseExport
 
         $query = $this->addDateRange($query);
 
-            return $query;
+        return $query;
             
     }
 
@@ -191,10 +191,11 @@ class ClientExport extends BaseExport
             $clean_row[$key]['value'] = $row[$column_key];
             $clean_row[$key]['identifier'] = $value;
 
-            if(in_array($clean_row[$key]['id'], ['paid_to_date', 'balance', 'credit_balance','payment_balance']))
+            if(in_array($clean_row[$key]['id'], ['paid_to_date', 'balance', 'credit_balance','payment_balance'])) {
                 $clean_row[$key]['display_value'] = Number::formatMoney($row[$column_key], $resource);
-            else
+            } else {
                 $clean_row[$key]['display_value'] = $row[$column_key];
+            }
 
         }
 

app/Export/CSV/ContactExport.php

@@ -88,9 +88,9 @@ class ContactExport extends BaseExport
 
         $headerdisplay = $this->buildHeader();
 
-        $header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
+        $header = collect($this->input['report_keys'])->map(function ($key, $value) use ($headerdisplay) {
-                return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
+            return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
-            })->toArray();
+        })->toArray();
 
         $report = $query->cursor()
                 ->map(function ($contact) {

app/Export/CSV/CreditExport.php

@@ -11,15 +11,15 @@
 
 namespace App\Export\CSV;
 
+use App\Libraries\MultiDB;
+use App\Models\Company;
+use App\Models\Credit;
+use App\Transformers\CreditTransformer;
 use App\Utils\Ninja;
 use App\Utils\Number;
-use App\Models\Credit;
-use League\Csv\Writer;
-use App\Models\Company;
-use App\Libraries\MultiDB;
-use Illuminate\Support\Facades\App;
-use App\Transformers\CreditTransformer;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\App;
+use League\Csv\Writer;
 
 class CreditExport extends BaseExport
 {
@@ -43,9 +43,9 @@ class CreditExport extends BaseExport
 
         $headerdisplay = $this->buildHeader();
 
-        $header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
+        $header = collect($this->input['report_keys'])->map(function ($key, $value) use ($headerdisplay) {
-                return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
+            return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
-            })->toArray();
+        })->toArray();
 
         $report = $query->cursor()
                 ->map(function ($credit) {
@@ -70,10 +70,11 @@ class CreditExport extends BaseExport
             $clean_row[$key]['value'] = $row[$column_key];
             $clean_row[$key]['identifier'] = $value;
 
-            if(in_array($clean_row[$key]['id'], ['paid_to_date','total_taxes','amount', 'balance', 'partial', 'refunded', 'applied','unit_cost','cost','price']))
+            if(in_array($clean_row[$key]['id'], ['paid_to_date','total_taxes','amount', 'balance', 'partial', 'refunded', 'applied','unit_cost','cost','price'])) {
                 $clean_row[$key]['display_value'] = Number::formatMoney($row[$column_key], $resource->client);
-            else
+            } else {
                 $clean_row[$key]['display_value'] = $row[$column_key];
+            }
 
         }
 
@@ -139,10 +140,9 @@ class CreditExport extends BaseExport
                 $entity[$keyval] = $transformed_credit[$credit_key];
             } elseif (isset($transformed_credit[$keyval])) {
                 $entity[$keyval] = $transformed_credit[$keyval];
-            } elseif(isset($transformed_credit[$searched_credit_key])){
+            } elseif(isset($transformed_credit[$searched_credit_key])) {
                 $entity[$keyval] = $transformed_credit[$searched_credit_key];
-            }
+            } else {
-            else {
                 $entity[$keyval] = $this->resolveKey($keyval, $credit, $this->credit_transformer);
             }
 

app/Export/CSV/DocumentExport.php

@@ -49,9 +49,9 @@ class DocumentExport extends BaseExport
 
         $headerdisplay = $this->buildHeader();
 
-        $header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
+        $header = collect($this->input['report_keys'])->map(function ($key, $value) use ($headerdisplay) {
-                return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
+            return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
-            })->toArray();
+        })->toArray();
 
         $report = $query->cursor()
                 ->map(function ($document) {

app/Export/CSV/ExpenseExport.php

@@ -43,9 +43,9 @@ class ExpenseExport extends BaseExport
 
         $headerdisplay = $this->buildHeader();
 
-        $header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
+        $header = collect($this->input['report_keys'])->map(function ($key, $value) use ($headerdisplay) {
-                return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
+            return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
-            })->toArray();
+        })->toArray();
 
         $report = $query->cursor()
                 ->map(function ($resource) {

app/Export/CSV/InvoiceExport.php

@@ -11,16 +11,14 @@
 
 namespace App\Export\CSV;
 
-use App\Utils\Ninja;
+use App\Libraries\MultiDB;
-use App\Utils\Number;
-use League\Csv\Writer;
 use App\Models\Company;
 use App\Models\Invoice;
-use App\Libraries\MultiDB;
-use App\Export\CSV\BaseExport;
-use Illuminate\Support\Facades\App;
 use App\Transformers\InvoiceTransformer;
+use App\Utils\Ninja;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\App;
+use League\Csv\Writer;
 
 class InvoiceExport extends BaseExport
 {
@@ -74,9 +72,9 @@ class InvoiceExport extends BaseExport
 
         $headerdisplay = $this->buildHeader();
 
-        $header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
+        $header = collect($this->input['report_keys'])->map(function ($key, $value) use ($headerdisplay) {
-                return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
+            return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
-            })->toArray();
+        })->toArray();
 
         $report = $query->cursor()
                 ->map(function ($resource) {
@@ -149,6 +147,10 @@ class InvoiceExport extends BaseExport
             $entity['invoice.recurring_id'] = $invoice->recurring_invoice->number ?? '';
         }
 
+        if (in_array('invoice.auto_bill_enabled', $this->input['report_keys'])) {
+            $entity['invoice.auto_bill_enabled'] = $invoice->auto_bill_enabled ? ctrans('texts.yes') : ctrans('texts.no');
+        }
+
         
         return $entity;
     }

app/Export/CSV/InvoiceItemExport.php

@@ -72,6 +72,8 @@ class InvoiceItemExport extends BaseExport
 
         $query = $this->addDateRange($query);
 
+        $query = $this->applyFilters($query);
+
         return $query;
 
     }
@@ -82,9 +84,9 @@ class InvoiceItemExport extends BaseExport
 
         $headerdisplay = $this->buildHeader();
 
-        $header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
+        $header = collect($this->input['report_keys'])->map(function ($key, $value) use ($headerdisplay) {
-                return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
+            return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
-            })->toArray();
+        })->toArray();
 
 
         $query->cursor()
@@ -131,7 +133,7 @@ class InvoiceItemExport extends BaseExport
         $transformed_items = [];
 
         foreach ($invoice->line_items as $item) {
-            $item_array = [];      
+            $item_array = [];
 
             foreach (array_values(array_intersect($this->input['report_keys'], $this->item_report_keys)) as $key) { //items iterator produces item array
                 
@@ -139,16 +141,17 @@ class InvoiceItemExport extends BaseExport
 
                     $tmp_key = str_replace("item.", "", $key);
                     
-                    if($tmp_key == 'type_id')
+                    if($tmp_key == 'type_id') {
                         $tmp_key = 'type';
+                    }
 
-                    if($tmp_key == 'tax_id')
+                    if($tmp_key == 'tax_id') {
                         $tmp_key = 'tax_category';
+                    }
 
                     if (property_exists($item, $tmp_key)) {
                         $item_array[$key] = $item->{$tmp_key};
-                    } 
+                    } else {
-                    else {
                         $item_array[$key] = '';
                     }
                 }
@@ -174,15 +177,15 @@ class InvoiceItemExport extends BaseExport
            
             $parts = explode('.', $key);
 
-            if(is_array($parts) && $parts[0] == 'item')
+            if(is_array($parts) && $parts[0] == 'item') {
                 continue;
+            }
 
             if (is_array($parts) && $parts[0] == 'invoice' && array_key_exists($parts[1], $transformed_invoice)) {
                 $entity[$key] = $transformed_invoice[$parts[1]];
-            }else if (array_key_exists($key, $transformed_invoice)) {
+            } elseif (array_key_exists($key, $transformed_invoice)) {
                 $entity[$key] = $transformed_invoice[$key];
-            } 
+            } else {
-            else {
                 $entity[$key] = $this->resolveKey($key, $invoice, $this->invoice_transformer);
             }
         }

app/Export/CSV/PaymentExport.php

@@ -71,8 +71,6 @@ class PaymentExport extends BaseExport
             return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
         })->toArray();
 
-        nlog($header);
-
         $report = $query->cursor()
                 ->map(function ($resource) {
                     $row = $this->buildRow($resource);

app/Export/CSV/ProductExport.php

@@ -41,14 +41,14 @@ class ProductExport extends BaseExport
 
         $headerdisplay = $this->buildHeader();
 
-        $header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
+        $header = collect($this->input['report_keys'])->map(function ($key, $value) use ($headerdisplay) {
-                return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
+            return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
-            })->toArray();
+        })->toArray();
 
         $report = $query->cursor()
                 ->map(function ($resource) {
                     $row = $this->buildRow($resource);
-                    return $this->processMetaData($row, $resource);    
+                    return $this->processMetaData($row, $resource);
                 })->toArray();
         
         return array_merge(['columns' => $header], $report);

app/Export/CSV/PurchaseOrderExport.php

@@ -11,15 +11,14 @@
 
 namespace App\Export\CSV;
 
-use App\Utils\Ninja;
-use App\Utils\Number;
-use League\Csv\Writer;
-use App\Models\Company;
 use App\Libraries\MultiDB;
+use App\Models\Company;
 use App\Models\PurchaseOrder;
-use Illuminate\Support\Facades\App;
 use App\Transformers\PurchaseOrderTransformer;
+use App\Utils\Ninja;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\App;
+use League\Csv\Writer;
 
 class PurchaseOrderExport extends BaseExport
 {
@@ -116,9 +115,9 @@ class PurchaseOrderExport extends BaseExport
 
         $headerdisplay = $this->buildHeader();
 
-        $header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
+        $header = collect($this->input['report_keys'])->map(function ($key, $value) use ($headerdisplay) {
-                return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
+            return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
-            })->toArray();
+        })->toArray();
 
         $report = $query->cursor()
                 ->map(function ($resource) {

app/Export/CSV/PurchaseOrderItemExport.php

@@ -11,14 +11,14 @@
 
 namespace App\Export\CSV;
 
-use App\Utils\Ninja;
-use League\Csv\Writer;
-use App\Models\Company;
 use App\Libraries\MultiDB;
+use App\Models\Company;
 use App\Models\PurchaseOrder;
-use Illuminate\Support\Facades\App;
-use Illuminate\Database\Eloquent\Builder;
 use App\Transformers\PurchaseOrderTransformer;
+use App\Utils\Ninja;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\App;
+use League\Csv\Writer;
 
 class PurchaseOrderItemExport extends BaseExport
 {
@@ -74,21 +74,21 @@ class PurchaseOrderItemExport extends BaseExport
 
         $headerdisplay = $this->buildHeader();
 
-        $header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
+        $header = collect($this->input['report_keys'])->map(function ($key, $value) use ($headerdisplay) {
-                return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
+            return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
-            })->toArray();
+        })->toArray();
 
         $query->cursor()
               ->each(function ($resource) {
-                $this->iterateItems($resource);
+                  $this->iterateItems($resource);
                 
-                foreach($this->storage_array as $row) {
+                  foreach($this->storage_array as $row) {
-                    $this->storage_item_array[] = $this->processItemMetaData($row, $resource);
+                      $this->storage_item_array[] = $this->processItemMetaData($row, $resource);
-                }
+                  }
 
-                $this->storage_array = [];
+                  $this->storage_array = [];
                 
-               });
+              });
         
         return array_merge(['columns' => $header], $this->storage_item_array);
     }

app/Export/CSV/QuoteItemExport.php

@@ -76,23 +76,23 @@ class QuoteItemExport extends BaseExport
 
         $headerdisplay = $this->buildHeader();
 
-        $header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
+        $header = collect($this->input['report_keys'])->map(function ($key, $value) use ($headerdisplay) {
-                return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
+            return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
-            })->toArray();
+        })->toArray();
 
-            $query->cursor()
+        $query->cursor()
-                ->each(function ($resource) {
+            ->each(function ($resource) {
-                    $this->iterateItems($resource);
+                $this->iterateItems($resource);
                                     
-                    foreach($this->storage_array as $row) {
+                foreach($this->storage_array as $row) {
-                        $this->storage_item_array[] = $this->processItemMetaData($row, $resource);
+                    $this->storage_item_array[] = $this->processItemMetaData($row, $resource);
-                    }
+                }
 
-                    $this->storage_array = [];
+                $this->storage_array = [];
                                     
-                });
+            });
                             
-            return array_merge(['columns' => $header], $this->storage_item_array);
+        return array_merge(['columns' => $header], $this->storage_item_array);
 
     }
 
@@ -103,7 +103,7 @@ class QuoteItemExport extends BaseExport
         //load the CSV document from a string
         $this->csv = Writer::createFromString();
 
-       $query = $this->init();
+        $query = $this->init();
 
         //insert the header
         $this->csv->insertOne($this->buildHeader());
@@ -127,7 +127,7 @@ class QuoteItemExport extends BaseExport
         $transformed_items = [];
 
         foreach ($quote->line_items as $item) {
-            $item_array = [];      
+            $item_array = [];
 
             foreach (array_values(array_intersect($this->input['report_keys'], $this->item_report_keys)) as $key) { //items iterator produces item array
                 
@@ -135,16 +135,17 @@ class QuoteItemExport extends BaseExport
 
                     $tmp_key = str_replace("item.", "", $key);
                     
-                    if($tmp_key == 'type_id')
+                    if($tmp_key == 'type_id') {
                         $tmp_key = 'type';
+                    }
 
-                    if($tmp_key == 'tax_id')
+                    if($tmp_key == 'tax_id') {
                         $tmp_key = 'tax_category';
+                    }
 
                     if (property_exists($item, $tmp_key)) {
                         $item_array[$key] = $item->{$tmp_key};
-                    } 
+                    } else {
-                    else {
                         $item_array[$key] = '';
                     }
                 }

app/Export/CSV/RecurringInvoiceExport.php

@@ -88,9 +88,9 @@ class RecurringInvoiceExport extends BaseExport
 
         $headerdisplay = $this->buildHeader();
 
-        $header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
+        $header = collect($this->input['report_keys'])->map(function ($key, $value) use ($headerdisplay) {
-                return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
+            return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
-            })->toArray();
+        })->toArray();
 
         $report = $query->cursor()
                 ->map(function ($resource) {
@@ -153,6 +153,10 @@ class RecurringInvoiceExport extends BaseExport
             $entity['recurring_invoice.frequency_id'] = $invoice->frequencyForKey($invoice->frequency_id);
         }
 
+        if (in_array('recurring_invoice.auto_bill_enabled', $this->input['report_keys'])) {
+            $entity['recurring_invoice.auto_bill_enabled'] = $invoice->auto_bill_enabled ? ctrans('texts.yes') : ctrans('texts.no');
+        }
+
         return $entity;
     }
 }

app/Export/CSV/TaskExport.php

@@ -101,17 +101,16 @@ class TaskExport extends BaseExport
 
         $headerdisplay = $this->buildHeader();
 
-        $header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
+        $header = collect($this->input['report_keys'])->map(function ($key, $value) use ($headerdisplay) {
-                return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
+            return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
-            })->toArray();
+        })->toArray();
 
         $query->cursor()
                 ->each(function ($resource) {
         
                     $this->buildRow($resource);
         
-                    foreach($this->storage_array as $row)
+                    foreach($this->storage_array as $row) {
-                    {
                         $this->storage_item_array[] = $this->processMetaData($row, $resource);
                     }
 

app/Export/CSV/VendorExport.php

@@ -12,8 +12,8 @@
 namespace App\Export\CSV;
 
 use App\Libraries\MultiDB;
-use App\Models\Vendor;
 use App\Models\Company;
+use App\Models\Vendor;
 use App\Transformers\VendorContactTransformer;
 use App\Transformers\VendorTransformer;
 use App\Utils\Ninja;
@@ -73,9 +73,9 @@ class VendorExport extends BaseExport
 
         $headerdisplay = $this->buildHeader();
 
-        $header = collect($this->input['report_keys'])->map(function ($key, $value) use($headerdisplay){
+        $header = collect($this->input['report_keys'])->map(function ($key, $value) use ($headerdisplay) {
-                return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
+            return ['identifier' => $key, 'display_value' => $headerdisplay[$value]];
-            })->toArray();
+        })->toArray();
 
         $report = $query->cursor()
                 ->map(function ($resource) {

app/Factory/CompanyFactory.php

@@ -11,13 +11,13 @@
 
 namespace App\Factory;
 
-use App\Utils\Ninja;
-use App\Models\Company;
-use App\Libraries\MultiDB;
-use App\Utils\Traits\MakesHash;
-use App\DataMapper\Tax\TaxModel;
-use App\DataMapper\CompanySettings;
 use App\DataMapper\ClientRegistrationFields;
+use App\DataMapper\CompanySettings;
+use App\DataMapper\Tax\TaxModel;
+use App\Libraries\MultiDB;
+use App\Models\Company;
+use App\Utils\Ninja;
+use App\Utils\Traits\MakesHash;
 
 class CompanyFactory
 {

app/Factory/DesignFactory.php

@@ -25,6 +25,8 @@ class DesignFactory
         $design->is_active = true;
         $design->is_custom = true;
         $design->name = '';
+        $design->is_template = false;
+        $design->entities = '';
         $design->design = new DesignBlocks();
 
         return $design;

app/Factory/InvoiceItemFactory.php

@@ -63,7 +63,7 @@ class InvoiceItemFactory
             $item->line_total = $item->quantity * $item->cost;
             $item->is_amount_discount = true;
             $item->discount = $faker->numberBetween(1, 10);
-            $item->notes = $faker->realText(50);
+            $item->notes = str_replace(['"',"'"], ['',""], $faker->realText(20));
             $item->product_key = $faker->word();
             // $item->custom_value1 = $faker->realText(10);
             // $item->custom_value2 = $faker->realText(10);

app/Factory/RecurringExpenseToExpenseFactory.php

@@ -248,10 +248,10 @@ class RecurringExpenseToExpenseFactory
                     $final_date = now()->addMonths($output-now()->month);
 
                     $output =    \sprintf(
-                            '%s %s',
+                        '%s %s',
-                            $final_date->translatedFormat('F'),
+                        $final_date->translatedFormat('F'),
-                            $final_date->year,
+                        $final_date->year,
-                        );
+                    );
                 }
 
                 $value = preg_replace(

app/Factory/UserFactory.php

@@ -27,7 +27,7 @@ class UserFactory
         $user->last_login = now();
         $user->failed_logins = 0;
         $user->signature = '';
-        $user->theme_id = 0;   
+        $user->theme_id = 0;
         $user->user_logged_in_notification = true;
 
         return $user;

app/Filters/BankTransactionFilters.php

@@ -53,19 +53,19 @@ class BankTransactionFilters extends QueryFilters
     }
 
 
-/**
+    /**
-     * Filter based on client status.
+         * Filter based on client status.
-     *
+         *
-     * Statuses we need to handle
+         * Statuses we need to handle
-     * - all
+         * - all
-     * - unmatched
+         * - unmatched
-     * - matched
+         * - matched
-     * - converted
+         * - converted
-     * - deposits
+         * - deposits
-     * - withdrawals
+         * - withdrawals
-     *
+         *
-     * @return Builder
+         * @return Builder
-     */
+         */
     public function client_status(string $value = ''): Builder
     {
         if (strlen($value) == 0) {

app/Filters/CreditFilters.php

@@ -48,6 +48,10 @@ class CreditFilters extends QueryFilters
             $credit_filters[] = Credit::STATUS_DRAFT;
         }
         
+        if (in_array('sent', $status_parameters)) {
+            $credit_filters[] = Credit::STATUS_SENT;
+        }
+
         if (in_array('partial', $status_parameters)) {
             $credit_filters[] = Credit::STATUS_PARTIAL;
         }
@@ -97,6 +101,21 @@ class CreditFilters extends QueryFilters
         });
     }
 
+    public function applicable(string $value = ''): Builder
+    {
+        if (strlen($value) == 0) {
+            return $this->builder;
+        }
+        
+        return $this->builder->where(function ($query){
+                        $query->whereIn('status_id', [Credit::STATUS_SENT, Credit::STATUS_PARTIAL])
+                              ->where('balance', '>', 0)
+                              ->where(function ($q){
+                                $q->whereNull('due_date')->orWhere('due_date', '>', now());
+                              });
+                            });
+    }
+
     public function number(string $number = ''): Builder
     {
         if (strlen($number) == 0) {
@@ -144,7 +163,7 @@ class CreditFilters extends QueryFilters
             return $this->builder->company();
         }
 
-//            return $this->builder->whereCompanyId(auth()->user()->company()->id);
+        //            return $this->builder->whereCompanyId(auth()->user()->company()->id);
     }
 
     /**

app/Filters/DesignFilters.php

@@ -54,6 +54,19 @@ class DesignFilters extends QueryFilters
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
+    public function entities(string $entities = ''): Builder
+    {
+
+        if (strlen($entities) == 0 || str_contains($entities, ',')) {
+            return $this->builder;
+        }
+
+        return $this->builder
+                    ->where('is_template', true)
+                    ->whereRaw('FIND_IN_SET( ? ,entities)', [trim($entities)]);
+
+    }
+
     /**
      * Filters the query by the users company ID.
      *
@@ -64,11 +77,22 @@ class DesignFilters extends QueryFilters
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        return  $this->builder->where(function ($query) use($user){
+        return  $this->builder->where(function ($query) use ($user) {
             $query->where('company_id', $user->company()->id)->orWhere('company_id', null)->orderBy('id', 'asc');
         });
     }
 
+    public function template(string $template = 'false'): Builder
+    {
+
+        if (strlen($template) == 0) {
+            return $this->builder;
+        }
+
+        $bool_val = $template == 'true' ? true : false;
+
+        return $this->builder->where('is_template', $bool_val);
+    }
     /**
      * Filter the designs by `is_custom` column.
      *

app/Filters/ExpenseFilters.php

@@ -40,8 +40,11 @@ class ExpenseFilters extends QueryFilters
                 ->orWhere('custom_value3', 'like', '%'.$filter.'%')
                 ->orWhere('custom_value4', 'like', '%'.$filter.'%')
                 ->orWhereHas('category', function ($q) use ($filter) {
-                              $q->where('name', 'like', '%'.$filter.'%');
+                    $q->where('name', 'like', '%'.$filter.'%');
-                          });
+                })
+                ->orWhereHas('vendor', function ($q) use ($filter) {
+                    $q->where('name', 'like', '%'.$filter.'%');
+                });
         });
     }
 
@@ -125,9 +128,9 @@ class ExpenseFilters extends QueryFilters
 
             $search_key = $split[0] == 'client' ? 'client_id' : 'project_id';
 
-            return $this->builder->whereHas('invoice', function ($query) use ($search_key, $split){
+            return $this->builder->whereHas('invoice', function ($query) use ($search_key, $split) {
-                        $query->where($search_key, $this->decodePrimaryKey($split[1]))
+                $query->where($search_key, $this->decodePrimaryKey($split[1]))
-                              ->whereIn('status_id', [\App\Models\Invoice::STATUS_DRAFT, \App\Models\Invoice::STATUS_SENT, \App\Models\Invoice::STATUS_PARTIAL]);
+                      ->whereIn('status_id', [\App\Models\Invoice::STATUS_DRAFT, \App\Models\Invoice::STATUS_SENT, \App\Models\Invoice::STATUS_PARTIAL]);
             });
         }
 

app/Filters/InvoiceFilters.php

@@ -11,14 +11,13 @@
 
 namespace App\Filters;
 
-use RuntimeException;
 use App\Models\Client;
 use App\Models\Invoice;
-use App\Filters\QueryFilters;
-use InvalidArgumentException;
-use Illuminate\Support\Carbon;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
+use InvalidArgumentException;
+use RuntimeException;
 
 /**
  * InvoiceFilters.
@@ -241,15 +240,13 @@ class InvoiceFilters extends QueryFilters
             return $this->builder;
         }
 
-        try{
+        try {
 
             $start_date = Carbon::parse($parts[1]);
             $end_date = Carbon::parse($parts[2]);
 
             return $this->builder->whereBetween($parts[0], [$start_date, $end_date]);
-        }
+        } catch(\Exception $e) {
-        
-        catch(\Exception $e){
             return $this->builder;
         }
 

app/Filters/PaymentFilters.php

@@ -12,9 +12,8 @@
 namespace App\Filters;
 
 use App\Models\Payment;
-use Illuminate\Support\Carbon;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Contracts\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Support\Carbon;
 
 /**
  * PaymentFilters.
@@ -37,39 +36,39 @@ class PaymentFilters extends QueryFilters
         return  $this->builder->where(function ($query) use ($filter) {
             $query->where('amount', 'like', '%'.$filter.'%')
                           ->orWhere('date', 'like', '%'.$filter.'%')
-                          ->orWhere('number','like', '%'.$filter.'%')
+                          ->orWhere('number', 'like', '%'.$filter.'%')
                           ->orWhere('transaction_reference', 'like', '%'.$filter.'%')
                           ->orWhere('custom_value1', 'like', '%'.$filter.'%')
                           ->orWhere('custom_value2', 'like', '%'.$filter.'%')
                           ->orWhere('custom_value3', 'like', '%'.$filter.'%')
                           ->orWhere('custom_value4', 'like', '%'.$filter.'%')
                           ->orWhereHas('client', function ($q) use ($filter) {
-                                $q->where('name', 'like', '%'.$filter.'%');
+                              $q->where('name', 'like', '%'.$filter.'%');
-                            })
+                          })
                             ->orWhereHas('client.contacts', function ($q) use ($filter) {
-                              $q->where('first_name', 'like', '%'.$filter.'%')
+                                $q->where('first_name', 'like', '%'.$filter.'%')
-                                ->orWhere('last_name', 'like', '%'.$filter.'%')
+                                  ->orWhere('last_name', 'like', '%'.$filter.'%')
-                                ->orWhere('email', 'like', '%'.$filter.'%');
+                                  ->orWhere('email', 'like', '%'.$filter.'%');
-                          });
+                            });
         });
     }
 
 
- /**
+    /**
-     * Filter based on client status.
+        * Filter based on client status.
-     *
+        *
-     * Statuses we need to handle
+        * Statuses we need to handle
-     * - all
+        * - all
-     * - pending
+        * - pending
-     * - cancelled
+        * - cancelled
-     * - failed
+        * - failed
-     * - completed
+        * - completed
-     * - partially refunded
+        * - partially refunded
-     * - refunded
+        * - refunded
-     *
+        *
-     * @param string $value The payment status as seen by the client
+        * @param string $value The payment status as seen by the client
-     * @return Builder
+        * @return Builder
-     */
+        */
     public function client_status(string $value = ''): Builder
     {
         if (strlen($value) == 0) {
@@ -190,15 +189,13 @@ class PaymentFilters extends QueryFilters
             return $this->builder;
         }
 
-        try{
+        try {
 
             $start_date = Carbon::parse($parts[1]);
             $end_date = Carbon::parse($parts[2]);
 
             return $this->builder->whereBetween($parts[0], [$start_date, $end_date]);
-        }
+        } catch(\Exception $e) {
-        
-        catch(\Exception $e){
             return $this->builder;
         }
 

app/Filters/PurchaseOrderFilters.php

@@ -145,7 +145,7 @@ class PurchaseOrderFilters extends QueryFilters
             return $this->builder->company();
         }
 
-//            return $this->builder->whereCompanyId(auth()->user()->company()->id);
+        //            return $this->builder->whereCompanyId(auth()->user()->company()->id);
     }
 
     /**

app/Filters/QuoteFilters.php

@@ -42,10 +42,10 @@ class QuoteFilters extends QueryFilters
                       $q->where('name', 'like', '%'.$filter.'%');
                   })
                   ->orWhereHas('client.contacts', function ($q) use ($filter) {
-                              $q->where('first_name', 'like', '%'.$filter.'%')
+                      $q->where('first_name', 'like', '%'.$filter.'%')
-                                ->orWhere('last_name', 'like', '%'.$filter.'%')
+                        ->orWhere('last_name', 'like', '%'.$filter.'%')
-                                ->orWhere('email', 'like', '%'.$filter.'%');
+                        ->orWhere('email', 'like', '%'.$filter.'%');
-                          });
+                  });
         });
     }
 
@@ -146,7 +146,7 @@ class QuoteFilters extends QueryFilters
             return $this->builder;
         }
 
-        if($sort_col[0] == 'client_id'){
+        if($sort_col[0] == 'client_id') {
 
             return $this->builder->orderBy(\App\Models\Client::select('name')
                     ->whereColumn('clients.id', 'quotes.client_id'), $sort_col[1]);

app/Filters/RecurringInvoiceFilters.php

@@ -34,20 +34,20 @@ class RecurringInvoiceFilters extends QueryFilters
         }
 
         return  $this->builder->where(function ($query) use ($filter) {
-              $query->where('date', 'like', '%'.$filter.'%')
+            $query->where('date', 'like', '%'.$filter.'%')
-                    ->orWhere('amount', 'like', '%'.$filter.'%')
+                  ->orWhere('amount', 'like', '%'.$filter.'%')
-                    ->orWhere('custom_value1', 'like', '%'.$filter.'%')
+                  ->orWhere('custom_value1', 'like', '%'.$filter.'%')
-                    ->orWhere('custom_value2', 'like', '%'.$filter.'%')
+                  ->orWhere('custom_value2', 'like', '%'.$filter.'%')
-                    ->orWhere('custom_value3', 'like', '%'.$filter.'%')
+                  ->orWhere('custom_value3', 'like', '%'.$filter.'%')
-                    ->orWhere('custom_value4', 'like', '%'.$filter.'%')
+                  ->orWhere('custom_value4', 'like', '%'.$filter.'%')
-                    ->orWhereHas('client', function ($q) use ($filter) {
+                  ->orWhereHas('client', function ($q) use ($filter) {
-                        $q->where('name', 'like', '%'.$filter.'%');
+                      $q->where('name', 'like', '%'.$filter.'%');
-                    })
+                  })
-                    ->orWhereHas('client.contacts', function ($q) use ($filter) {
+                  ->orWhereHas('client.contacts', function ($q) use ($filter) {
-                              $q->where('first_name', 'like', '%'.$filter.'%')
+                      $q->where('first_name', 'like', '%'.$filter.'%')
-                                ->orWhere('last_name', 'like', '%'.$filter.'%')
+                        ->orWhere('last_name', 'like', '%'.$filter.'%')
-                                ->orWhere('email', 'like', '%'.$filter.'%');
+                        ->orWhere('email', 'like', '%'.$filter.'%');
-                          });
+                  });
         });
     }
 

app/Filters/TaskFilters.php

@@ -41,16 +41,16 @@ class TaskFilters extends QueryFilters
                           ->orWhere('custom_value3', 'like', '%'.$filter.'%')
                           ->orWhere('custom_value4', 'like', '%'.$filter.'%')
                           ->orWhereHas('project', function ($q) use ($filter) {
-                                $q->where('name', 'like', '%'.$filter.'%');
+                              $q->where('name', 'like', '%'.$filter.'%');
-                            })
+                          })
                           ->orWhereHas('client', function ($q) use ($filter) {
-                                $q->where('name', 'like', '%'.$filter.'%');
+                              $q->where('name', 'like', '%'.$filter.'%');
-                            })
+                          })
                             ->orWhereHas('client.contacts', function ($q) use ($filter) {
-                              $q->where('first_name', 'like', '%'.$filter.'%')
+                                $q->where('first_name', 'like', '%'.$filter.'%')
-                                ->orWhere('last_name', 'like', '%'.$filter.'%')
+                                  ->orWhere('last_name', 'like', '%'.$filter.'%')
-                                ->orWhere('email', 'like', '%'.$filter.'%');
+                                  ->orWhere('email', 'like', '%'.$filter.'%');
-                          });
+                            });
         });
     }
 
@@ -60,6 +60,7 @@ class TaskFilters extends QueryFilters
      * Statuses we need to handle
      * - all
      * - invoiced
+     * - uninvoiced
      *
      * @param string $value The invoice status as seen by the client
      * @return Builder
@@ -80,6 +81,10 @@ class TaskFilters extends QueryFilters
             $this->builder->whereNotNull('invoice_id');
         }
 
+        if (in_array('uninvoiced', $status_parameters)) {
+            $this->builder->whereNull('invoice_id');
+        }
+
         return $this->builder;
     }
 
@@ -136,7 +141,7 @@ class TaskFilters extends QueryFilters
 
         $status_parameters = explode(',', $value);
 
-        if(count($status_parameters) >= 1){
+        if(count($status_parameters) >= 1) {
 
             $this->builder->where(function ($query) use ($status_parameters) {
                 $query->whereIn('status_id', $this->transformKeys($status_parameters))->whereNull('invoice_id');

app/Filters/UserFilters.php

@@ -130,4 +130,42 @@ class UserFilters extends QueryFilters
             $query->whereNotIn('id', $user_array);
         });
     }
+
+    /**
+     * Filters the list based on the status
+     * archived, active, deleted.
+     *
+     * @param string $filter
+     * @return Builder
+     */
+    public function status(string $filter = ''): Builder
+    {
+
+
+        if (strlen($filter) == 0) {
+            return $this->builder;
+        }
+
+        $filters = explode(',', $filter);
+
+        return $this->builder->where(function ($query) use ($filters) {
+
+            /** @var \App\Models\User $user */
+            $user = auth()->user();
+
+            if (in_array(self::STATUS_ACTIVE, $filters)) {
+                $query->orWhereNull('deleted_at');
+            }
+
+            if (in_array(self::STATUS_ARCHIVED, $filters)) {
+                $query->orWhereNotNull('deleted_at')->where('is_deleted', 0);
+            }
+
+            if (in_array(self::STATUS_DELETED, $filters)) {
+                $query->orWhere('is_deleted', 1);
+            }
+        });
+    }
+
+
 }

app/Helpers/Bank/Yodlee/DTO/AccountSummary.php

@@ -11,10 +11,9 @@
 
 namespace App\Helpers\Bank\Yodlee\DTO;
 
-use Spatie\LaravelData\Data;
-use Spatie\LaravelData\Attributes\MapInputName;
-use Spatie\LaravelData\Attributes\MapOutputName;
 use Illuminate\Support\Collection;
+use Spatie\LaravelData\Attributes\MapInputName;
+use Spatie\LaravelData\Data;
 
 /**
  * [
@@ -72,40 +71,40 @@ use Illuminate\Support\Collection;
  */
 class AccountSummary extends Data
 {
-        public ?int $id;
+    public ?int $id;
 
-        #[MapInputName('CONTAINER')]
+    #[MapInputName('CONTAINER')]
-        public ?string $account_type = ''; 
+    public ?string $account_type = '';
         
-        #[MapInputName('accountName')]
+    #[MapInputName('accountName')]
-        public ?string $account_name = ''; 
+    public ?string $account_name = '';
 
-        #[MapInputName('accountStatus')]
+    #[MapInputName('accountStatus')]
-        public ?string $account_status = ''; 
+    public ?string $account_status = '';
 
-        #[MapInputName('accountNumber')]
+    #[MapInputName('accountNumber')]
-        public ?string $account_number = '';
+    public ?string $account_number = '';
 
-        #[MapInputName('providerAccountId')]
+    #[MapInputName('providerAccountId')]
-        public int $provider_account_id; 
+    public int $provider_account_id;
 
-        #[MapInputName('providerId')]
+    #[MapInputName('providerId')]
-        public ?string $provider_id = '';
+    public ?string $provider_id = '';
 
-        #[MapInputName('providerName')]
+    #[MapInputName('providerName')]
-        public ?string $provider_name = ''; 
+    public ?string $provider_name = '';
 
-        public ?string $nickname = ''; 
+    public ?string $nickname = '';
         
-        public ?float $current_balance = 0;         
+    public ?float $current_balance = 0;
-        public ?string $account_currency = '';
+    public ?string $account_currency = '';
 
-        public static function prepareForPipeline(Collection $properties) : Collection
+    public static function prepareForPipeline(Collection $properties) : Collection
-        {
+    {
             
-            $properties->put('current_balance', $properties['currentBalance']['amount'] ?? 0);
+        $properties->put('current_balance', $properties['currentBalance']['amount'] ?? 0);
-            $properties->put('account_currency', $properties['currentBalance']['currency'] ?? 0);
+        $properties->put('account_currency', $properties['currentBalance']['currency'] ?? 0);
 
-            return $properties;
+        return $properties;
-        }
+    }
-}
+}

app/Helpers/Bank/Yodlee/Transformer/AccountTransformer.php

@@ -88,20 +88,19 @@ class AccountTransformer implements AccountTransformerInterface
         if(property_exists($account, 'currentBalance')) {
             $current_balance = $account->currentBalance->amount ?? 0;
             $account_currency = $account->currentBalance->currency ?? '';
-        }
+        } elseif(property_exists($account, 'balance')) {
-        elseif(property_exists($account, 'balance')){
             $current_balance = $account->balance->amount ?? 0;
             $account_currency = $account->balance->currency ?? '';
         }
 
         $account_status = $account->accountStatus;
 
-        if(property_exists($account, 'dataset')){
+        if(property_exists($account, 'dataset')) {
             $dataset = $account->dataset[0];
             $status = false;
             $update = false;
 
-            match($dataset->additionalStatus ?? ''){
+            match($dataset->additionalStatus ?? '') {
                 'LOGIN_IN_PROGRESS' => $status =  'Data retrieval in progress.',
                 'USER_INPUT_REQUIRED' => $status =  'Please reconnect your account, authentication required.',
                 'LOGIN_SUCCESS' => $status =  'Data retrieval in progress',
@@ -113,24 +112,23 @@ class AccountTransformer implements AccountTransformerInterface
                 'PARTIAL_DATA_RETRIEVED' => $status =  'Partial data update failed.',
                 'PARTIAL_DATA_RETRIEVED_REM_SCHED' => $status =  'Partial data update failed.',
                 'SUCCESS' => $status =  'All accounts added or updated successfully.',
-                default => $status = false 
+                default => $status = false
             };
 
-            if($status){
+            if($status) {
                 $account_status = $status;
             }
 
-            match($dataset->updateEligibility ?? ''){
+            match($dataset->updateEligibility ?? '') {
                 'ALLOW_UPDATE' => $update = 'Account connection stable.',
                 'ALLOW_UPDATE_WITH_CREDENTIALS' => $update = 'Please reconnect your account with updated credentials.',
                 'DISALLOW_UPDATE' => $update = 'Update not available due to technical issues.',
                 default => $update = false,
             };
 
-            if($status && $update){
+            if($status && $update) {
                 $account_status = $status . ' - ' . $update;
-            }
+            } elseif($update) {
-            elseif($update){
                 $account_status = $update;
             }
 

app/Helpers/Bank/Yodlee/Transformer/IncomeTransformer.php

@@ -127,12 +127,14 @@ class IncomeTransformer implements BankRevenueInterface
 
         foreach ($transaction->transaction as $transaction) {
             //do not store duplicate / pending transactions
-            if (property_exists($transaction, 'status') && $transaction->status == 'PENDING')
+            if (property_exists($transaction, 'status') && $transaction->status == 'PENDING') {
                 continue;
+            }
 
             //some object do no store amounts ignore these
-            if(!property_exists($transaction, 'amount'))
+            if(!property_exists($transaction, 'amount')) {
                 continue;
+            }
 
             $data[] = $this->transformTransaction($transaction);
         }

app/Helpers/Bank/Yodlee/Yodlee.php

@@ -300,7 +300,7 @@ class Yodlee
 
     /**
      * updateEligibility
-     * 
+     *
      * ALLOW_UPDATE
      * ALLOW_UPDATE_WITH_CREDENTIALS
      * DISALLOW_UPDATE
@@ -308,7 +308,7 @@ class Yodlee
 
     /**
      * additionalStatus
-     * 
+     *
      * LOGIN_IN_PROGRESS
      * DATA_RETRIEVAL_IN_PROGRESS
      * ACCT_SUMMARY_RECEIVED
@@ -339,7 +339,7 @@ class Yodlee
      * CONSENT_REVOKED
      * INCORRECT_OAUTH_TOKEN
      * MIGRATION_IN_PROGRESS
-     */    
+     */
 
     /**
      * IN_PROGRESS	LOGIN_IN_PROGRESS	 	Provider login is in progress.
@@ -356,12 +356,12 @@ class Yodlee
      * SUCCESS	 	 	All accounts under the provider was added or updated successfully.
      */
 
-     /**
+    /**
-     * updateEligibility
+    * updateEligibility
-     * 
+    *
-     * ALLOW_UPDATE	                       The status indicates that the account is eligible for the next update and applies to both MFA and non-MFA accounts. For MFA-based accounts, the user may have to provide the MFA details during account refresh.
+    * ALLOW_UPDATE	                       The status indicates that the account is eligible for the next update and applies to both MFA and non-MFA accounts. For MFA-based accounts, the user may have to provide the MFA details during account refresh.
-     * ALLOW_UPDATE_WITH_CREDENTIALS	The status indicates updating or refreshing the account by directing the user to edit the provided credentials.
+    * ALLOW_UPDATE_WITH_CREDENTIALS	The status indicates updating or refreshing the account by directing the user to edit the provided credentials.
-     * DISALLOW_UPDATE	                The status indicates the account is not eligible for the update or refresh process due to a site issue or a technical error.
+    * DISALLOW_UPDATE	                The status indicates the account is not eligible for the update or refresh process due to a site issue or a technical error.
-     */
+    */
 
 }

app/Helpers/Document/WithTypeHelpers.php

@@ -1,30 +0,0 @@
-<?php
-
-/**
- * Invoice Ninja (https://invoiceninja.com).
- *
- * @link https://github.com/invoiceninja/invoiceninja source repository
- *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
- *
- * @license https://www.elastic.co/licensing/elastic-license
- */
-
-namespace App\Helpers\Document;
-
-trait WithTypeHelpers
-{
-    /**
-     * Returns boolean based on checks for image.
-     *
-     * @return bool
-     */
-    public function isImage(): bool
-    {
-        if (in_array($this->type, ['png', 'jpeg', 'jpg', 'tiff', 'gif'])) {
-            return true;
-        }
-
-        return false;
-    }
-}

app/Helpers/Epc/EpcQrGenerator.php

@@ -64,7 +64,7 @@ class EpcQrGenerator
         } catch(\Exception $e) {
             nlog("EPC QR failure => ".$e->getMessage());
             return '';
-        } catch( InvalidArgumentException $e) {
+        } catch(InvalidArgumentException $e) {
             nlog("EPC QR failure => ".$e->getMessage());
             return '';
         }

app/Helpers/Invoice/InvoiceItemSum.php

@@ -11,16 +11,16 @@
 
 namespace App\Helpers\Invoice;
 
-use App\Models\Quote;
+use App\DataMapper\BaseSettings;
+use App\DataMapper\InvoiceItem;
+use App\DataMapper\Tax\RuleInterface;
 use App\Models\Client;
 use App\Models\Credit;
 use App\Models\Invoice;
 use App\Models\PurchaseOrder;
-use App\Models\RecurringQuote;
+use App\Models\Quote;
-use App\DataMapper\InvoiceItem;
-use App\DataMapper\BaseSettings;
 use App\Models\RecurringInvoice;
-use App\DataMapper\Tax\RuleInterface;
+use App\Models\RecurringQuote;
 use App\Utils\Traits\NumberFormatter;
 
 class InvoiceItemSum
@@ -125,7 +125,7 @@ class InvoiceItemSum
 
     private RuleInterface $rule;
 
-    public function __construct( RecurringInvoice | Invoice | Quote | Credit | PurchaseOrder | RecurringQuote $invoice)
+    public function __construct(RecurringInvoice | Invoice | Quote | Credit | PurchaseOrder | RecurringQuote $invoice)
     {
         $this->tax_collection = collect([]);
 
@@ -175,14 +175,15 @@ class InvoiceItemSum
             return $this;
         }
         
-        if (in_array($this->client->company->country()->iso_3166_2, $this->tax_jurisdictions) ) { //only calculate for supported tax jurisdictions
+        if (in_array($this->client->company->country()->iso_3166_2, $this->tax_jurisdictions)) { //only calculate for supported tax jurisdictions
             
             $class = "App\DataMapper\Tax\\".$this->client->company->country()->iso_3166_2."\\Rule";
 
             $this->rule = new $class();
 
-        if($this->rule->regionWithNoTaxCoverage($this->client->country->iso_3166_2))
+            if($this->rule->regionWithNoTaxCoverage($this->client->country->iso_3166_2)) {
-            return $this;
+                return $this;
+            }
 
             $this->rule
                  ->setEntity($this->invoice)
@@ -398,8 +399,13 @@ class InvoiceItemSum
             
             $item_tax = 0;
 
-            //$amount = $this->item->line_total - ($this->item->line_total * ($this->invoice->discount / $this->sub_total));
+            try {
-            $amount = ($this->sub_total > 0) ? $this->item->line_total - ($this->invoice->discount * ( $this->item->line_total / $this->sub_total)) : 0;
+                $amount = $this->item->line_total - ($this->item->line_total * ($this->invoice->discount / $this->sub_total));
+            } catch(\DivisionByZeroError $e) {
+                $amount = $this->item->line_total;
+            }
+
+            //$amount = ($this->sub_total > 0) ? $this->item->line_total - ($this->invoice->discount * ($this->item->line_total / $this->sub_total)) : 0;
             
             $item_tax_rate1_total = $this->calcAmountLineTax($this->item->tax_rate1, $amount);
 

app/Helpers/Invoice/InvoiceItemSumInclusive.php

@@ -11,14 +11,14 @@
 
 namespace App\Helpers\Invoice;
 
-use App\Models\Quote;
+use App\DataMapper\Tax\RuleInterface;
 use App\Models\Client;
 use App\Models\Credit;
 use App\Models\Invoice;
 use App\Models\PurchaseOrder;
-use App\Models\RecurringQuote;
+use App\Models\Quote;
 use App\Models\RecurringInvoice;
-use App\DataMapper\Tax\RuleInterface;
+use App\Models\RecurringQuote;
 use App\Utils\Traits\NumberFormatter;
 
 class InvoiceItemSumInclusive
@@ -353,7 +353,7 @@ class InvoiceItemSumInclusive
             if ($this->sub_total == 0) {
                 $amount = $this->item->line_total;
             } else {
-                $amount = ($this->sub_total > 0) ? $this->item->line_total - ($this->invoice->discount * ($this->item->line_total / $this->sub_total)) : 0;
+                $amount = $this->item->line_total - ($this->invoice->discount * ($this->item->line_total / $this->sub_total));
                 // $amount = $this->item->line_total - ($this->item->line_total * ($this->invoice->discount / $this->sub_total));
             }
             
@@ -404,14 +404,15 @@ class InvoiceItemSumInclusive
             return $this;
         }
         
-        if (in_array($this->client->company->country()->iso_3166_2, $this->tax_jurisdictions) ) { //only calculate for supported tax jurisdictions
+        if (in_array($this->client->company->country()->iso_3166_2, $this->tax_jurisdictions)) { //only calculate for supported tax jurisdictions
             
             $class = "App\DataMapper\Tax\\".$this->client->company->country()->iso_3166_2."\\Rule";
 
             $this->rule = new $class();
 
-        if($this->rule->regionWithNoTaxCoverage($this->client->country->iso_3166_2))
+            if($this->rule->regionWithNoTaxCoverage($this->client->country->iso_3166_2)) {
-            return $this;
+                return $this;
+            }
 
             $this->rule
                  ->setEntity($this->invoice)

app/Helpers/Invoice/InvoiceSum.php

@@ -11,15 +11,15 @@
 
 namespace App\Helpers\Invoice;
 
-use App\Models\Quote;
-use App\Utils\Number;
 use App\Models\Credit;
 use App\Models\Invoice;
 use App\Models\PurchaseOrder;
-use App\Models\RecurringQuote;
+use App\Models\Quote;
 use App\Models\RecurringInvoice;
-use Illuminate\Support\Collection;
+use App\Models\RecurringQuote;
+use App\Utils\Number;
 use App\Utils\Traits\NumberFormatter;
+use Illuminate\Support\Collection;
 
 class InvoiceSum
 {

app/Helpers/Invoice/InvoiceSumInclusive.php

@@ -11,15 +11,14 @@
 
 namespace App\Helpers\Invoice;
 
-use App\Models\Quote;
 use App\Models\Credit;
 use App\Models\Invoice;
 use App\Models\PurchaseOrder;
-use App\Models\RecurringQuote;
+use App\Models\Quote;
 use App\Models\RecurringInvoice;
-use Illuminate\Support\Collection;
+use App\Models\RecurringQuote;
 use App\Utils\Traits\NumberFormatter;
-use App\Helpers\Invoice\InvoiceItemSumInclusive;
+use Illuminate\Support\Collection;
 
 class InvoiceSumInclusive
 {

app/Helpers/SwissQr/SwissQrGenerator.php

@@ -57,7 +57,7 @@ class SwissQrGenerator
         // - with specified amount
         // - with human-readable additional information
         // - using your QR-IBAN
-    //
+        //
         // Likely the most common use-case in the business world.
 
         // Create a new instance of QrBill, containing default headers with fixed values
@@ -83,7 +83,7 @@ class SwissQrGenerator
 
         // Add debtor information
         // Who has to pay the invoice? This part is optional.
-    //
+        //
         // Notice how you can use two different styles of addresses: CombinedAddress or StructuredAddress
         // They are interchangeable for creditor as well as debtor.
         $qrBill->setUltimateDebtor(
@@ -121,7 +121,7 @@ class SwissQrGenerator
             $array = str_split($tempInvoiceNumber);
             foreach ($array as $char) {
                 if (is_numeric($char)) {
-                //
+                    //
                 } else {
                     if ($char) {
                         $char = strtolower($char);
@@ -166,7 +166,7 @@ class SwissQrGenerator
 
         // Now get the QR code image and save it as a file.
         try {
-            $output = new QrBill\PaymentPart\Output\HtmlOutput\HtmlOutput($qrBill, $this->client->locale() ?: 'en');
+            $output = new QrBill\PaymentPart\Output\HtmlOutput\HtmlOutput($qrBill, $this->resolveLanguage());
 
             $html = $output
                 ->setPrintable(false)
@@ -190,4 +190,28 @@ class SwissQrGenerator
             // return $e->getMessage();
         }
     }
+
+    private function resolveLanguage(): string
+    {
+        $language = $this->client->locale() ?: 'en';
+
+        switch ($language) {
+            case 'de':
+                return 'de';
+            case 'en':
+            case 'en_GB':
+                return 'en';
+            case 'it':
+                return 'it';
+            case 'fr':
+            case 'fr_CA':
+            case 'fr_CH':
+                return 'fr';
+            
+            default:
+                return 'en';
+        }
+
+    }
+
 }

app/Http/Controllers/AccountController.php

@@ -11,17 +11,17 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Account;
-use App\Libraries\MultiDB;
-use App\Utils\TruthSource;
-use App\Models\CompanyUser;
-use Illuminate\Http\Response;
-use App\Jobs\Account\CreateAccount;
-use App\Transformers\AccountTransformer;
-use App\Transformers\CompanyUserTransformer;
-use Illuminate\Foundation\Bus\DispatchesJobs;
 use App\Http\Requests\Account\CreateAccountRequest;
 use App\Http\Requests\Account\UpdateAccountRequest;
+use App\Jobs\Account\CreateAccount;
+use App\Libraries\MultiDB;
+use App\Models\Account;
+use App\Models\CompanyUser;
+use App\Transformers\AccountTransformer;
+use App\Transformers\CompanyUserTransformer;
+use App\Utils\TruthSource;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Http\Response;
 
 class AccountController extends BaseController
 {

app/Http/Controllers/ActivityController.php

@@ -11,19 +11,19 @@
 
 namespace App\Http\Controllers;
 
-use stdClass;
-use App\Utils\Ninja;
-use App\Models\Activity;
-use Illuminate\Http\Request;
-use App\Utils\Traits\MakesHash;
-use App\Utils\PhantomJS\Phantom;
-use App\Utils\HostedPDF\NinjaPdf;
-use App\Utils\Traits\Pdf\PdfMaker;
-use App\Utils\Traits\Pdf\PageNumbering;
-use Illuminate\Support\Facades\Storage;
-use App\Transformers\ActivityTransformer;
-use App\Http\Requests\Activity\ShowActivityRequest;
 use App\Http\Requests\Activity\DownloadHistoricalEntityRequest;
+use App\Http\Requests\Activity\ShowActivityRequest;
+use App\Models\Activity;
+use App\Transformers\ActivityTransformer;
+use App\Utils\HostedPDF\NinjaPdf;
+use App\Utils\Ninja;
+use App\Utils\PhantomJS\Phantom;
+use App\Utils\Traits\MakesHash;
+use App\Utils\Traits\Pdf\PageNumbering;
+use App\Utils\Traits\Pdf\PdfMaker;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use stdClass;
 
 class ActivityController extends BaseController
 {

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -11,13 +11,13 @@
 
 namespace App\Http\Controllers\Auth;
 
+use App\Http\Controllers\Controller;
+use App\Libraries\MultiDB;
 use App\Models\Account;
 use App\Models\Company;
-use App\Libraries\MultiDB;
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Password;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Password;
 
 class ForgotPasswordController extends Controller
 {
@@ -90,7 +90,7 @@ class ForgotPasswordController extends Controller
             $account = Account::find($account_id);
         }
 
-         $is_react = request()->has('react') ? true : false;
+        $is_react = request()->has('react') ? true : false;
 
         return $this->render('auth.passwords.request', ['root' => 'themes', 'account' => $account, 'is_react' => $is_react]);
     }