Merge branch 'v5-develop' into v5-stable

.env.example

@@ -28,15 +28,6 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_MAILER=smtp
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS="user@example.com"
-MAIL_FROM_NAME="Self Hosted User"
-
 POSTMARK_API_TOKEN=
 REQUIRE_HTTPS=false
 

.github/workflows/phpunit.yml

@@ -13,8 +13,8 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        operating-system: ['ubuntu-20.04', 'ubuntu-22.04']
-        php-versions: ['8.1','8.2']
+        operating-system: ['ubuntu-22.04','ubuntu-24.04']
+        php-versions: ['8.2']
         phpunit-versions: ['latest']
         ci_node_total: [ 8 ]
         ci_node_index: [ 0, 1, 2, 3, 4, 5, 6, 7]
@@ -95,14 +95,15 @@ jobs:
     - name: Get Composer Cache Directory
       id: composer-cache
       run: |
-        echo "::set-output name=dir::$(composer config cache-files-dir)"
-    - uses: actions/cache@v3
+        echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+    - uses: actions/cache@v4
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
           ${{ runner.os }}-${{ matrix.php }}-composer-
 
+
     - name: Install composer dependencies
       run: |
         composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}

.github/workflows/react_release.yml

@@ -38,8 +38,6 @@ jobs:
           sudo php artisan cache:clear
           sudo find ./vendor/bin/ -type f -exec chmod +x {} \;
           sudo find ./ -type d -exec chmod 755 {} \;
-          sudo rm -f public/main.*
-          sudo rm -f public/flutter*
 
       - name: Prepare React FrontEnd
         run: |
@@ -49,6 +47,7 @@ jobs:
           npm i
           npm run build
           cp -r dist/* ../public/
+          cp dist/index.html ../resources/views/react/index.blade.php
           
       - name: Prepare JS/CSS assets
         run: |
@@ -65,7 +64,7 @@ jobs:
       - name: Build project
         run: |
           shopt -s dotglob
-          tar --exclude='public/storage' --exclude='.htaccess' --exclude='invoiceninja.zip' -zcvf /home/runner/work/invoiceninja/react-invoiceninja.tar *
+          tar --exclude='public/storage' --exclude='./htaccess' --exclude='invoiceninja.zip' -zcvf /home/runner/work/invoiceninja/react-invoiceninja.tar *
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')

.github/workflows/release.yml

@@ -50,6 +50,7 @@ jobs:
           mkdir -p ../public/react/${{ github.event.release.tag_name }}/
           cp -r dist/react/* ../public/react/${{ github.event.release.tag_name }}/
           cp -r dist/react/* ../public/react/
+          cp dist/index.html ../resources/views/react/index.blade.php
           
           mkdir -p ../public/tinymce_6.4.2/tinymce/js/
           cp -r node_modules/tinymce ../public/tinymce_6.4.2/tinymce/js/
@@ -73,7 +74,7 @@ jobs:
         run: |
           zip -r /home/runner/work/invoiceninja/invoiceninja.zip .* -x "../*"
           shopt -s dotglob
-          tar --exclude='public/storage' --exclude='.htaccess' --exclude='invoiceninja.zip' -zcvf /home/runner/work/invoiceninja/invoiceninja.tar *
+          tar --exclude='public/storage' --exclude='./htaccess' --exclude='invoiceninja.zip' -zcvf /home/runner/work/invoiceninja/invoiceninja.tar *
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')

.gitignore

@@ -40,3 +40,4 @@ _ide_helper_models.php
 _ide_helper.php
 /composer.phar
 .tx/
+.phpunit.cache

VERSION.txt

@@ -1 +1 @@
-5.8.30
+5.9.0

_ide_helper_custom.php

@@ -13,5 +13,10 @@ namespace Illuminate\Contracts\Mail
         {
             return true;
         }
+
+        public function brevo_config(string $key)
+        {
+            return true;
+        }
     }
 }

app/Console/Commands/BackupUpdate.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/Console/Commands/CheckData.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
@@ -169,26 +169,21 @@ class CheckData extends Command
 
     private function checkCompanyTokens()
     {
-        // CompanyUser::whereDoesntHave('token', function ($query){
-        //   return $query->where('is_system', 1);
-        // })->cursor()->each(function ($cu){
-        //     if ($cu->user) {
-        //         $this->logMessage("Creating missing company token for user # {$cu->user->id} for company id # {$cu->company->id}");
-        //         (new CreateCompanyToken($cu->company, $cu->user, 'System'))->handle();
-        //     } else {
-        //         $this->logMessage("Dangling User ID # {$cu->id}");
-        //     }
-        // });
-
         CompanyUser::query()->cursor()->each(function ($cu) {
+
             if (CompanyToken::where('user_id', $cu->user_id)->where('company_id', $cu->company_id)->where('is_system', 1)->doesntExist()) {
-                $this->logMessage("Creating missing company token for user # {$cu->user_id} for company id # {$cu->company_id}");
+                
 
                 if ($cu->company && $cu->user) {
+                    $this->logMessage("Creating missing company token for user # {$cu->user_id} for company id # {$cu->company_id}");
                     (new CreateCompanyToken($cu->company, $cu->user, 'System'))->handle();
-                } else {
-                    // $cu->forceDelete();
                 } 
+                
+                if (!$cu->user) {
+                    $this->logMessage("No user found for company user - removing company user");
+                    $cu->forceDelete();
+                }
+                    
             }
         });
     }
@@ -213,7 +208,7 @@ class CheckData extends Command
                 ->cursor()
                 ->each(function ($client) {
                     if ($client->recurring_invoices()->where('is_deleted', 0)->where('deleted_at', null)->count() > 1) {
-                        $this->logMessage("Duplicate Recurring Invoice => {$client->custom_value1}");
+                        $this->logMessage("Duplicate Recurring Invoice => {$client->custom_value1} || {$client->id}}");
                     }
                 });
         }
@@ -482,6 +477,14 @@ class CheckData extends Command
                         }
                     } else {
                         $this->logMessage("No contact present, so cannot add invitation for {$entity_key} - {$entity->id}");
+                        
+                        try{
+                            $entity->service()->createInvitations()->save();
+                        }
+                        catch(\Exception $e){
+
+                        }
+                        
                     }
 
                     try {
@@ -884,14 +887,14 @@ class CheckData extends Command
     public function checkClientSettings()
     {
         if ($this->option('fix') == 'true') {
-            Client::query()->whereNull('country_id')->cursor()->each(function ($client) {
+            Client::query()->whereNull('country_id')->orWhere('country_id', 0)->cursor()->each(function ($client) {
                 $client->country_id = $client->company->settings->country_id;
                 $client->saveQuietly();
 
                 $this->logMessage("Fixing country for # {$client->id}");
             });
 
-            Client::query()->whereNull("settings->currency_id")->cursor()->each(function ($client) {
+            Client::query()->whereNull("settings->currency_id")->orWhereJsonContains('settings', ['currency_id' => ''])->cursor()->each(function ($client) {
                 $settings = $client->settings;
                 $settings->currency_id = (string)$client->company->settings->currency_id;
                 $client->settings = $settings;
@@ -933,7 +936,6 @@ class CheckData extends Command
 
             });
 
-
             Invoice::withTrashed()
             ->where("partial", 0)
             ->whereNotNull("partial_due_date")
@@ -947,7 +949,42 @@ class CheckData extends Command
 
             });
 
+            Company::whereDoesntHave('company_users', function ($query){
+            $query->where('is_owner', 1);
+            })
+            ->cursor()
+            ->when(Ninja::isHosted())
+            ->each(function ($c){
 
+                $this->logMessage("Orphan Account # {$c->account_id}");
+
+            });
+
+            CompanyUser::whereDoesntHave('tokens')
+            ->cursor()
+            ->when(Ninja::isHosted())
+            ->each(function ($cu){
+                
+                $this->logMessage("Missing tokens for Company User # {$cu->id}");
+
+            });
+
+            CompanyUser::whereDoesntHave('user')
+            ->cursor()
+            ->when(Ninja::isHosted())
+            ->each(function ($cu) {
+
+                $this->logMessage("Missing user for Company User # {$cu->id}");
+
+            });
+
+            $cus = CompanyUser::withTrashed()
+            ->whereHas("user", function ($query) {
+                $query->whereColumn("users.account_id", "!=", "company_user.account_id");
+            })->pluck('id')->implode(",");
+
+
+            $this->logMessage("Cross Linked CompanyUser ids # {$cus}");
 
 
         }

app/Console/Commands/CheckDb.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/Console/Commands/CreateAccount.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/Console/Commands/CreateSingleAccount.php

@@ -4,60 +4,61 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace App\Console\Commands;
 
-use App\DataMapper\ClientRegistrationFields;
-use App\DataMapper\CompanySettings;
-use App\DataMapper\FeesAndLimits;
-use App\Events\Invoice\InvoiceWasCreated;
-use App\Events\RecurringInvoice\RecurringInvoiceWasCreated;
-use App\Factory\GroupSettingFactory;
-use App\Factory\InvoiceFactory;
-use App\Factory\InvoiceItemFactory;
-use App\Factory\RecurringInvoiceFactory;
-use App\Factory\SubscriptionFactory;
-use App\Helpers\Invoice\InvoiceSum;
-use App\Jobs\Company\CreateCompanyTaskStatuses;
-use App\Libraries\MultiDB;
-use App\Models\Account;
-use App\Models\BankIntegration;
-use App\Models\BankTransaction;
-use App\Models\BankTransactionRule;
+use stdClass;
+use Carbon\Carbon;
+use Faker\Factory;
+use App\Models\Task;
+use App\Models\User;
+use App\Utils\Ninja;
+use App\Models\Quote;
 use App\Models\Client;
-use App\Models\ClientContact;
-use App\Models\Company;
-use App\Models\CompanyGateway;
-use App\Models\CompanyToken;
-use App\Models\Country;
 use App\Models\Credit;
+use App\Models\Vendor;
+use App\Models\Account;
+use App\Models\Company;
+use App\Models\Country;
 use App\Models\Expense;
 use App\Models\Invoice;
 use App\Models\Product;
 use App\Models\Project;
-use App\Models\Quote;
-use App\Models\RecurringInvoice;
-use App\Models\Task;
-use App\Models\TaskStatus;
 use App\Models\TaxRate;
-use App\Models\User;
-use App\Models\Vendor;
+use App\Libraries\MultiDB;
+use App\Models\TaskStatus;
+use App\Models\CompanyToken;
+use App\Models\ClientContact;
 use App\Models\VendorContact;
-use App\Repositories\InvoiceRepository;
-use App\Utils\Ninja;
-use App\Utils\Traits\GeneratesCounter;
+use App\Models\CompanyGateway;
+use App\Factory\InvoiceFactory;
+use App\Models\BankIntegration;
+use App\Models\BankTransaction;
 use App\Utils\Traits\MakesHash;
-use Carbon\Carbon;
-use Faker\Factory;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Cache;
+use App\Models\RecurringInvoice;
+use App\DataMapper\FeesAndLimits;
+use App\DataMapper\ClientSettings;
+use App\DataMapper\CompanySettings;
+use App\Factory\InvoiceItemFactory;
+use App\Helpers\Invoice\InvoiceSum;
+use App\Models\BankTransactionRule;
+use App\Factory\GroupSettingFactory;
+use App\Factory\SubscriptionFactory;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Cache;
+use App\Utils\Traits\GeneratesCounter;
 use Illuminate\Support\Facades\Schema;
-use stdClass;
+use App\Repositories\InvoiceRepository;
+use App\Factory\RecurringInvoiceFactory;
+use App\Events\Invoice\InvoiceWasCreated;
+use App\DataMapper\ClientRegistrationFields;
+use App\Jobs\Company\CreateCompanyTaskStatuses;
+use App\Events\RecurringInvoice\RecurringInvoiceWasCreated;
 
 class CreateSingleAccount extends Command
 {
@@ -951,7 +952,7 @@ class CreateSingleAccount extends Command
         }
 
 
-        if (config('ninja.testvars.paytrace.decrypted') && ($this->gateway == 'all' || $this->gateway == 'paytrace')) {
+        if (config('ninja.testvars.paytrace') && ($this->gateway == 'all' || $this->gateway == 'paytrace')) {
             $cg = new CompanyGateway();
             $cg->company_id = $company->id;
             $cg->user_id = $user->id;
@@ -960,7 +961,7 @@ class CreateSingleAccount extends Command
             $cg->require_billing_address = true;
             $cg->require_shipping_address = true;
             $cg->update_details = true;
-            $cg->config = encrypt(config('ninja.testvars.paytrace.decrypted'));
+            $cg->config = encrypt(config('ninja.testvars.paytrace'));
 
             $cg->save();
 
@@ -1015,6 +1016,85 @@ class CreateSingleAccount extends Command
             $cg->fees_and_limits = $fees_and_limits;
             $cg->save();
         }
+        
+        if (config('ninja.testvars.eway') && ($this->gateway == 'all' || $this->gateway == 'eway')) {
+            $cg = new CompanyGateway();
+            $cg->company_id = $company->id;
+            $cg->user_id = $user->id;
+            $cg->gateway_key = '944c20175bbe6b9972c05bcfe294c2c7';
+            $cg->require_cvv = true;
+            $cg->require_billing_address = true;
+            $cg->require_shipping_address = true;
+            $cg->update_details = true;
+            $cg->config = encrypt(config('ninja.testvars.eway'));
+            $cg->save();
+
+            $gateway_types = $cg->driver()->gatewayTypes();
+
+            $fees_and_limits = new stdClass();
+            $fees_and_limits->{$gateway_types[0]} = new FeesAndLimits();
+
+            $cg->fees_and_limits = $fees_and_limits;
+            $cg->save();
+        }
+
+        
+        if (config('ninja.testvars.gocardless') && ($this->gateway == 'all' || $this->gateway == 'gocardless')) {
+
+            $c_settings = ClientSettings::defaults();
+            $c_settings->currency_id = '2';
+            
+            $client = Client::factory()->create([
+                'user_id' => $user->id,
+                'company_id' => $company->id,
+                'name' => 'cypress',
+                'country_id' => 826,
+                'settings' => $c_settings
+            ]);
+
+            $cg = new CompanyGateway();
+            $cg->company_id = $company->id;
+            $cg->user_id = $user->id;
+            $cg->gateway_key = 'b9886f9257f0c6ee7c302f1c74475f6c';
+            $cg->require_cvv = true;
+            $cg->require_billing_address = true;
+            $cg->require_shipping_address = true;
+            $cg->update_details = true;
+            $cg->config = encrypt(config('ninja.testvars.gocardless'));
+            $cg->save();
+
+            $gateway_types = $cg->driver($client)->gatewayTypes();
+
+            $fees_and_limits = new stdClass();
+            $fees_and_limits->{$gateway_types[0]} = new FeesAndLimits();
+
+            $cg->fees_and_limits = $fees_and_limits;
+            $cg->save();
+        }
+
+        if (config('ninja.testvars.forte') && ($this->gateway == 'all' || $this->gateway == 'forte')) {
+            $cg = new CompanyGateway();
+            $cg->company_id = $company->id;
+            $cg->user_id = $user->id;
+            $cg->gateway_key = 'kivcvjexxvdiyqtj3mju5d6yhpeht2xs';
+            $cg->require_cvv = true;
+            $cg->require_billing_address = true;
+            $cg->require_shipping_address = true;
+            $cg->update_details = true;
+            $cg->config = encrypt(config('ninja.testvars.forte'));
+            $cg->save();
+
+            $gateway_types = $cg->driver()->gatewayTypes();
+
+            $fees_and_limits = new stdClass();
+            $fees_and_limits->{$gateway_types[0]} = new FeesAndLimits();
+
+            $cg->fees_and_limits = $fees_and_limits;
+            $cg->save();
+        }
+
+
+
     }
 
     private function createRecurringInvoice(Client $client)

app/Console/Commands/CreateTestData.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/Console/Commands/DemoMode.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
@@ -110,7 +110,9 @@ class DemoMode extends Command
 
         $this->info('Creating Small Account and Company');
 
-        $account = Account::factory()->create();
+        $account = Account::factory()->create([
+            "set_react_as_default_ap" => 0,
+        ]);
         $company = Company::factory()->create([
             'account_id' => $account->id,
             'slack_webhook_url' => config('ninja.notification.slack'),

app/Console/Commands/DesignUpdate.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/Console/Commands/EncryptNinja.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
@@ -68,7 +68,6 @@ class EncryptNinja extends Command
             $contents = Storage::disk('base')->get($file);
             $encrypted = encrypt($contents);
             Storage::disk('base')->put($file.".enc", $encrypted);
-            // Storage::disk('base')->delete($file);
         }
     }
 

app/Console/Commands/HostedMigrations.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/Console/Commands/HostedUsers.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/Console/Commands/ImportMigrations.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/Console/Commands/MobileLocalization.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/Console/Commands/OpenApiYaml.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/Console/Commands/PostUpdate.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/Console/Commands/ReactBuilder.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
@@ -20,7 +20,7 @@ class ReactBuilder extends Command
      *
      * @var string
      */
-    protected $signature = 'ninja:react';
+    protected $signature = 'ninja:react {--type=}';
 
     /**
      * The console command description.
@@ -42,10 +42,14 @@ class ReactBuilder extends Command
     /**
      * Execute the console command.
      *
-     * @return mixed
+     * @return void
      */
     public function handle()
     {
+        if($this->option('type') == 'local') {
+
+        
+
         $includes = '';
 
         $directoryIterator = false;
@@ -72,5 +76,9 @@ class ReactBuilder extends Command
         }
 
         file_put_contents(resource_path('views/react/head.blade.php'), $includes);
+
+        }
+
+        
     }
 }

app/Console/Commands/RecurringCommand.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/Console/Commands/S3Cleanup.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/Console/Commands/SendRemindersCron.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/Console/Commands/SendTestEmails.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/Console/Commands/TranslationsExport.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/Console/Commands/TypeCheck.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/Console/Kernel.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Analytics/AccountCreated.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Analytics/AccountDeleted.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Analytics/AccountPlatform.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Analytics/AccountSignup.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Analytics/BankAccountsCreated.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Analytics/DbQuery.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
@@ -52,6 +52,10 @@ class DbQuery extends GenericMixedMetric
 
     public $string_metric7 = 'ip_address';
 
+    public $string_metric8 = 'client_version';
+
+    public $string_metric9 = 'platform';
+    
     /**
      * The counter
      * set to 1.

app/DataMapper/Analytics/EmailCount.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Analytics/EmailFailure.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Analytics/EmailInvoiceFailure.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Analytics/EmailSuccess.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Analytics/LivePreview.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Analytics/LoginFailure.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Analytics/LoginSuccess.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Analytics/Mail/EmailBounce.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Analytics/Mail/EmailSpam.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Analytics/MigrationFailure.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Analytics/QueueSize.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Analytics/RevenueTrack.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
@@ -30,7 +30,7 @@ class RevenueTrack extends GenericMixedMetric
      * The name of the counter.
      * @var string
      */
-    public $name = 'app.revenue';
+    public $name = 'app.cac';
 
     /**
      * The datetime of the counter measurement.
@@ -59,14 +59,14 @@ class RevenueTrack extends GenericMixedMetric
      *
      * @var string
      */
-    public $string_metric7 = 'product';
+    public $string_metric7 = 'plan';
 
     /**
      * Gateway Reference
      *
      * @var string
      */
-    public $string_metric8 = 'gateway_reference';
+    public $string_metric8 = 'plan_term';
 
     public $string_metric9 = 'entity_reference';
 

app/DataMapper/Analytics/SendRecurringFailure.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Analytics/TrialFinished.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Analytics/TrialStarted.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/BaseSettings.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Billing/SubscriptionContextMapper.php

@@ -5,7 +5,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Billing/WebhookConfiguration.php

@@ -5,7 +5,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/ClientRegistrationFields.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/ClientSettings.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/CompanySettings.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
@@ -229,7 +229,7 @@ class CompanySettings extends BaseSettings
     public $require_quote_signature = false;  //@TODO ben to confirm
 
     //email settings
-    public $email_sending_method = 'default'; //enum 'default','gmail','office365' 'client_postmark', 'client_mailgun', 'mailgun' //@implemented
+    public $email_sending_method = 'default'; //enum 'default','gmail','office365' 'client_postmark', 'client_mailgun', 'mailgun', 'client_brevo' //@implemented
 
     public $gmail_sending_user_id = '0'; //@implemented
 
@@ -451,6 +451,8 @@ class CompanySettings extends BaseSettings
 
     public $mailgun_endpoint = 'api.mailgun.net'; //api.eu.mailgun.net
 
+    public $brevo_secret = '';
+
     public $auto_bill_standard_invoices = false;
 
     public $email_alignment = 'center'; // center , left, right
@@ -477,6 +479,8 @@ class CompanySettings extends BaseSettings
 
     public $e_invoice_type = 'EN16931';
 
+    public $e_quote_type = 'OrderX_Comfort';
+
     public $default_expense_payment_type_id = '0';
 
     public $enable_e_invoice = false;
@@ -497,7 +501,17 @@ class CompanySettings extends BaseSettings
 
     public $use_unapplied_payment = 'off'; //always, option, off //@implemented
 
+    public $enable_rappen_rounding = false;
+
+    public bool $task_round_up = true;
+
+    public int $task_round_to_nearest = 1;
+
     public static $casts = [
+        'task_round_up'                      => 'bool',
+        'task_round_to_nearest'              => 'int',
+        'e_quote_type'                       => 'string',
+        'enable_rappen_rounding'             => 'bool',
         'use_unapplied_payment'              => 'string',
         'show_pdfhtml_on_mobile'             => 'bool',
         'payment_email_all_contacts'         => 'bool',
@@ -505,7 +519,6 @@ class CompanySettings extends BaseSettings
         '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',
@@ -527,6 +540,7 @@ class CompanySettings extends BaseSettings
         'postmark_secret' => 'string',
         'mailgun_secret' => 'string',
         'mailgun_domain' => 'string',
+        'brevo_secret' => 'string',
         'send_email_on_mark_paid' => 'bool',
         'vendor_portal_enable_uploads' => 'bool',
         'besr_id' => 'string',

app/DataMapper/DefaultSettings.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/EmailSpooledForSend.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/EmailTemplateDefaults.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/FeesAndLimits.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/FreeCompanySettings.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/InvoiceItem.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
@@ -65,6 +65,8 @@ class InvoiceItem
 
     public $expense_id = '';
     
+    public $unit_code = 'C62';
+    
     public static $casts = [
         'task_id' => 'string',
         'expense_id' => 'string',
@@ -92,5 +94,6 @@ class InvoiceItem
         'custom_value2' => 'string',
         'custom_value3' => 'string',
         'custom_value4' => 'string',
+        'unit_code' => 'string',
     ];
 }

app/DataMapper/PaymentMethodMeta.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/PaymentTransaction.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Schedule/EmailRecord.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Schedule/EmailReport.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Schedule/EmailStatement.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Settings/SettingsData.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
@@ -213,7 +213,7 @@ class SettingsData
 
     public bool $show_accept_quote_terms = false;  //@TODO ben to confirm
 
-    public string $email_sending_method = 'default'; // enum 'default', 'gmail', 'office365', 'client_postmark', 'client_mailgun' //@implemented
+    public string $email_sending_method = 'default'; // enum 'default', 'gmail', 'office365', 'client_postmark', 'client_mailgun' , 'client_brevo' //@implemented
 
     public string $gmail_sending_user_id = '0'; //@implemented
 
@@ -433,6 +433,8 @@ class SettingsData
 
     public string $mailgun_endpoint = 'api.mailgun.net'; // api.eu.mailgun.net
 
+    public string $brevo_secret = '';
+
     public bool $auto_bill_standard_invoices = false;
 
     public string $email_alignment = 'center'; // center, left, right

app/DataMapper/Sources/PayPalBalanceAffecting.php

@@ -0,0 +1,278 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\DataMapper\Sources;
+
+use App\DataMapper\InvoiceItem;
+
+class PayPalBalanceAffecting
+{
+
+    private array $key_map = [
+        'Date' => 'date',
+        'Time' => 'time',
+        'TimeZone' => 'timezone',
+        'Name' => 'name',
+        'Type' => 'type',
+        'Status' => 'status',
+        'Currency' => 'currency',
+        'Gross' => 'gross',
+        'Fee' => 'fee',
+        'Net' => 'net',
+        'From Email Address' => 'fromEmailAddress',
+        'To Email Address' => 'toEmailAddress',
+        'Transaction ID' => 'transactionId',
+        'Shipping Address' => 'shippingAddress',
+        'Item Title' => 'itemTitle',
+        'Item ID' => 'itemId',
+        'Option 1 Name' => 'option1Name',
+        'Option 1 Value' => 'option1Value',
+        'Option 2 Name' => 'option2Name',
+        'Option 2 Value' => 'option2Value',
+        'Reference Txn ID' => 'referenceTxId',
+        'Invoice Number' => 'invoiceNumber',
+        'Custom Number' => 'customNumber',
+        'Quantity' => 'quantity',
+        'Receipt ID' => 'receiptId',
+        'Address Line 1' => 'addressLine1',
+        'Address Line 2/District/Neighborhood' => 'addressLine2DistrictNeighborhood',
+        'Town/City' => 'townCity',
+        'State/Province/Region/County/Territory/Prefecture/Republic' => 'stateProvinceRegionCountyTerritoryPrefectureRepublic',
+        'Zip/Postal Code' => 'zipPostalCode',
+        'Country' => 'country',
+        'Contact Phone Number' => 'contactPhoneNumber',
+        'Subject' => 'subject',
+        'Note' => 'note',
+        'Transaction Event Code' => 'transactionEventCode',
+        'Payment Tracking ID' => 'paymentTrackingId',
+        'Item Details' => 'itemDetails',
+        'Authorization Review Status' => 'authorizationReviewStatus',
+        'Country Code' => 'countryCode',
+        'Tip' => 'tip',
+        'Discount' => 'discount',
+        'Credit Transactional Fee' => 'creditTransactionalFee',
+        'Original Invoice ID' => 'originalInvoiceId',
+    ];
+
+    public $date;
+    public $time;
+    public $timezone;
+    public $name;
+    public $type;
+    public $status;
+    public $currency;
+    public $gross;
+    public $fee;
+    public $net;
+    public $fromEmailAddress;
+    public $toEmailAddress;
+    public $transactionId;
+    public $shippingAddress;
+    public $itemTitle;
+    public $itemId;
+    public $option1Name;
+    public $option1Value;
+    public $option2Name;
+    public $option2Value;
+    public $referenceTxnId;
+    public $invoiceNumber;
+    public $customNumber;
+    public $quantity;
+    public $receiptId;
+    public $addressLine1;
+    public $addressLine2DistrictNeighborhood;
+    public $townCity;
+    public $stateProvinceRegionCountyTerritoryPrefectureRepublic;
+    public $zipPostalCode;
+    public $country;
+    public $contactPhoneNumber;
+    public $subject;
+    public $note;
+    public $transactionEventCode;
+    public $paymentTrackingId;
+    public $itemDetails;
+    public $authorizationReviewStatus;
+    public $countryCode;
+    public $tip;
+    public $discount;
+    public $creditTransactionalFee;
+    public $originalInvoiceId;
+
+    public function __construct(private array $import_row){}
+
+    public function run(): self
+    {
+        foreach($this->import_row as $key => $value) {
+
+            $prop = $this->key_map[$key] ?? false;
+
+            if($prop)
+                $this->{$prop} = $value;
+        }
+
+        return $this;
+    }
+
+    public function getClient(): array
+    {
+        $client = [
+            'name' => $this->name,
+            'contacts' => [$this->getContact()],
+            'email' => $this->fromEmailAddress,
+        ];
+
+        $client = array_merge($client, $this->returnAddress());
+        $client = array_merge($client, $this->returnShippingAddress());
+
+        return $client;
+    }
+
+    public function getInvoice(): array
+    {
+        $item = new InvoiceItem;
+        $item->cost = $this->gross ?? 0;
+        $item->product_key = $this->itemId ?? '';
+        $item->notes = $this->subject ?? $this->itemDetails;
+        $item->quantity = 1;
+
+        return [
+            'number' => trim($this->invoiceNumber ?? $this->transactionId),
+            'date' => str_replace('/','-', $this->date ?? ''),
+            'line_items' => [$item],
+            'name' => $this->name ?? '',
+            'email' => $this->fromEmailAddress ?? '',
+        ];
+    }
+
+    public function getContact(): array
+    {
+        $name_parts = explode(" ", $this->name ?? '');
+
+        if(count($name_parts) == 2)
+        {
+            $contact['first_name'] = $name_parts[0];
+            $contact['last_name'] = $name_parts[1];
+        }
+        else {
+            $contact['first_name'] = $this->name ?? '';
+        }
+
+        $contact['email'] = $this->fromEmailAddress ?? '';
+        $contact['phone'] = $this->contactPhoneNumber ?? '';
+
+        return $contact;
+    }
+    
+    private function returnAddress(): array
+    {
+        return [
+            'address1' => $this->addressLine1 ?? '',
+            'address2' => $this->addressLine2DistrictNeighborhood ?? '',
+            'city' => $this->townCity ?? '',
+            'state' => $this->stateProvinceRegionCountyTerritoryPrefectureRepublic ?? '',
+            'country_id' => $this->countryCode ?? '',
+            'postal_code' => $this->zipPostalCode ?? '',
+        ];
+    }
+
+    private function returnShippingAddress(): array
+    {
+        if(strlen($this->shippingAddress ?? '') <3)
+            return [];
+
+        $ship_parts = explode(",", $this->shippingAddress);
+
+        if(count($ship_parts) != 7)
+            return [];
+
+        return [
+            'shipping_address1' => $ship_parts[2],
+            'shipping_address2' => '',
+            'shipping_city' => $ship_parts[3],
+            'shipping_state' => $ship_parts[4],
+            'shipping_postal_code' => $ship_parts[5],
+            'shipping_country_id' => $ship_parts[6],
+        ];
+    }
+
+    public function getType(): string
+    {
+        return $this->type ?? '';
+    }
+
+    public function isInvoiceType(): bool
+    {
+        return $this->type == 'Website Payment';
+    }
+}
+
+
+
+// $csv = Reader::createFromString($csvFile);
+// // $csvdelimiter = self::detectDelimiter($csvfile);
+// $csv->setDelimiter(",");
+// $stmt = new Statement();
+// $data = iterator_to_array($stmt->process($csv));
+
+// $header = $data[0];
+// $arr = [];
+
+// foreach($data as $key => $value) {
+
+
+//     if($key == 0) {
+//         continue;
+//     }
+
+//     $arr[] = array_combine($header, $value);
+
+// }
+
+// $arr;
+
+// $company =  Company::find(3358);
+// $owner = $company->owner();
+// $client_repo = new ClientRepository(new ClientContactRepository());
+// $invoice_repo = new InvoiceRepository();
+
+// foreach($arr as $pp) {
+
+//     $p = new PayPalBalanceAffecting($pp);
+//     $p->run();
+
+
+//     if(!$p->isInvoiceType()) {
+//         continue;
+//     }
+
+//     $import_c = $p->getClient();
+//     $import_i = $p->getInvoice();
+
+
+//     $contact = ClientContact::where('company_id', 3358)->where('email', $import_c['email'])->first();
+
+
+//     if(!$contact) {
+
+//         $cc = ClientFactory::create($company->id, $owner->id);
+
+//         $client = $client_repo->save($import_c, $cc);
+
+//     } else {
+//         $client = $contact->client;
+//     }
+
+//     $i = InvoiceFactory::create($company->id, $owner->id);
+//     $i->client_id = $client->id;
+//     $invoice_repo->save($import_i, $i);
+
+
+// }

app/DataMapper/Tax/AT/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/AU/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/BE/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/BG/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/BaseRule.php

@@ -4,18 +4,19 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
 namespace App\DataMapper\Tax;
 
-use App\DataMapper\Tax\ZipTax\Response;
-use App\DataProviders\USStates;
+use App\Models\Quote;
 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
 {
@@ -168,7 +169,6 @@ class BaseRule implements RuleInterface
         /* We should only apply taxes for configured states */
         if(!array_key_exists($this->client->country->iso_3166_2, $this->region_codes)) {
             nlog('Automatic tax calculations not supported for this country - defaulting to company country');
-            nlog("With new logic, we should never see this");
         }
 
         /** Harvest the client_region */
@@ -211,7 +211,7 @@ class BaseRule implements RuleInterface
         }
 
         /** Applies the tax data to the invoice */
-        if($this->invoice instanceof Invoice && $tax_data) {
+        if(($this->invoice instanceof Invoice || $this->invoice instanceof Quote) && $tax_data) {
 
             $this->invoice->tax_data = $tax_data;
 
@@ -264,7 +264,7 @@ class BaseRule implements RuleInterface
             return USStates::getState(strlen($this->client->postal_code) > 1 ? $this->client->postal_code : $this->client->shipping_postal_code);
 
         } catch (\Exception $e) {
-            return $this->client->company->country()->iso_3166_2 == 'US' ? $this->client->company->tax_data->seller_subregion : 'CA';
+            return 'CA';
         }
     }
 

app/DataMapper/Tax/CY/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/CZ/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/DE/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */
@@ -235,17 +235,17 @@ class Rule extends BaseRule implements RuleInterface
         } 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) {
                 // 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;
+                $this->tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->country->iso_3166_2}->tax_rate ?? 0;
+                $this->reduced_tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->country->iso_3166_2}->reduced_tax_rate ?? 0;
             } 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;
+                $this->tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->company->country()->iso_3166_2}->tax_rate ?? 0;
+                $this->reduced_tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->company->country()->iso_3166_2}->reduced_tax_rate ?? 0;
             }
         } 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;
+            $this->tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->company->country()->iso_3166_2}->tax_rate ?? 0;
+            $this->reduced_tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->company->country()->iso_3166_2}->reduced_tax_rate ?? 0;
         }
 
         return $this;

app/DataMapper/Tax/DK/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/EE/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/ES/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/FI/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/FR/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/GR/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/HR/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/HU/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/IE/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/IT/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/LT/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/LU/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/LV/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/MT/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/NL/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/PT/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/RO/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/RuleInterface.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/SE/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/SI/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/SK/Rule.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */

app/DataMapper/Tax/TaxData.php

@@ -4,7 +4,7 @@
  *
  * @link https://github.com/invoiceninja/invoiceninja source repository
  *
- * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ * @copyright Copyright (c) 2024. Invoice Ninja LLC (https://invoiceninja.com)
  *
  * @license https://www.elastic.co/licensing/elastic-license
  */