Merge pull request #10022 from turbo124/v5-develop

v5.10.29

.env.example

@@ -24,6 +24,7 @@ QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
 
+MAIL_MAILER=smtp
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,7 +8,7 @@ assignees: ''
 ---
 
 <!-- Before posting please check our "Troubleshooting" category in the docs: 
-https://invoiceninja.github.io/docs/self-host-troubleshooting/ -->
+https://invoiceninja.github.io/en/self-host-troubleshooting/ -->
 
 ## Setup
 - Version: <!-- i.e. v4.5.25 / v5.0.30 -->

.github/workflows/phpunit.yml

@@ -18,7 +18,7 @@ jobs:
         phpunit-versions: ['latest']
         ci_node_total: [ 8 ]
         ci_node_index: [ 0, 1, 2, 3, 4, 5, 6, 7]
-        laravel: [10.*]
+        laravel: [11.*]
         dependency-version: [prefer-stable]
 
     env:
@@ -103,7 +103,6 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-${{ matrix.php }}-composer-
 
-
     - name: Install composer dependencies
       run: |
         composer config -g github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -51,7 +51,9 @@ All Pro and Enterprise features from the hosted app are included in the open-sou
 * [Docker File](https://hub.docker.com/r/invoiceninja/invoiceninja/)
 * [Cloudron](https://www.cloudron.io/store/com.invoiceninja.cloudronapp2.html)
 * [Softaculous](https://www.softaculous.com/apps/ecommerce/Invoice_Ninja)
- 
+* [Elestio](https://elest.io/open-source/invoiceninja)
+* [YunoHost](https://apps.yunohost.org/app/invoiceninja5)
+
 ### Recommended Providers
 * [Stripe](https://stripe.com/)
 * [Postmark](https://postmarkapp.com/)

VERSION.txt

@@ -1 +1 @@
-5.10.17
+5.10.29

app/Casts/QuickbooksSettingsCast.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Casts;
+
+use App\DataMapper\QuickbooksSettings;
+use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+
+class QuickbooksSettingsCast implements CastsAttributes
+{
+    public function get($model, string $key, $value, array $attributes)
+    {
+        $data = json_decode($value, true);
+
+        if(!is_array($data))
+            return null;
+
+        $qb = new QuickbooksSettings();
+        $qb->accessTokenKey =  $data['accessTokenKey'];
+        $qb->refresh_token =  $data['refresh_token'];
+        $qb->realmID =  $data['realmID'];
+        $qb->accessTokenExpiresAt =  $data['accessTokenExpiresAt'];
+        $qb->refreshTokenExpiresAt =  $data['refreshTokenExpiresAt'];
+        $qb->settings = $data['settings'] ?? [];
+        
+        return $qb;
+    }
+
+    public function set($model, string $key, $value, array $attributes)
+    {
+        return [
+            $key => json_encode([
+                'accessTokenKey' => $value->accessTokenKey,
+                'refresh_token' => $value->refresh_token,
+                'realmID' => $value->realmID,
+                'accessTokenExpiresAt' => $value->accessTokenExpiresAt,
+                'refreshTokenExpiresAt' => $value->refreshTokenExpiresAt,
+                'settings' => $value->settings,
+            ])
+        ];
+    }
+}

app/Console/Commands/CheckData.php

@@ -1169,10 +1169,10 @@ class CheckData extends Command
                 ->whereNull('exchange_rate')
                 ->orWhere('exchange_rate', 0)
                 ->cursor()
-                ->each(function ($expense){
+                ->each(function ($expense) {
                     $expense->exchange_rate = 1;
                     $expense->saveQuietly();
-                    
+
                     $this->logMessage("Fixing - exchange rate for expense :: {$expense->id}");
 
                 });

app/Console/Commands/CreateSingleAccount.php

@@ -1116,7 +1116,7 @@ class CreateSingleAccount extends Command
 
     private function countryClients($company, $user)
     {
-        
+
         Client::unguard();
 
         Client::create([

app/Console/Kernel.php

@@ -67,7 +67,7 @@ class Kernel extends ConsoleKernel
 
         /* Checks Rotessa Transactions */
         $schedule->job(new TransactionReport())->dailyAt('01:48')->withoutOverlapping()->name('rotessa-transaction-report')->onOneServer();
-        
+
         /* Stale Invoice Cleanup*/
         $schedule->job(new CleanStaleInvoiceOrder())->hourlyAt(30)->withoutOverlapping()->name('stale-invoice-job')->onOneServer();
 

app/DataMapper/Analytics/LegalEntityCreated.php

@@ -0,0 +1,83 @@
+<?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\Analytics;
+
+use Turbo124\Beacon\ExampleMetric\GenericMixedMetric;
+
+class LegalEntityCreated extends GenericMixedMetric
+{
+    /**
+     * The type of Sample.
+     *
+     * Monotonically incrementing counter
+     *
+     *  - counter
+     *
+     * @var string
+     */
+    public $type = 'mixed_metric';
+
+    /**
+     * The name of the counter.
+     * @var string
+     */
+    public $name = 'einvoice.legal_entity.created';
+
+    /**
+     * The datetime of the counter measurement.
+     *
+     * date("Y-m-d H:i:s")
+     *
+     */
+    public $datetime;
+
+    /**
+     * The Class failure name
+     * set to 0.
+     *
+     * @var string
+     */
+    public $string_metric5 = 'stub';
+
+    /**
+     * The exception string
+     * set to 0.
+     *
+     * @var string
+     */
+    public $string_metric6 = 'stub';
+
+    /**
+     * The counter
+     * set to 1.
+     *
+     */
+    public $int_metric1 = 1;
+
+    /**
+     * Company Key
+     * @var string
+     */
+    public $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/BaseSettings.php

@@ -16,13 +16,6 @@ namespace App\DataMapper;
  */
 class BaseSettings
 {
-    // //@deprecated
-    // public function __construct($obj)
-    // {
-    //     // foreach ($obj as $key => $value) {
-    //     //     $obj->{$key} = $value;
-    //     // }
-    // }
 
     public static function setCasts($obj, $casts)
     {

app/DataMapper/CompanySettings.php

@@ -515,10 +515,14 @@ class CompanySettings extends BaseSettings
     public $quote_schedule_reminder1 = ''; //before_valid_until_date,after_valid_until_date,after_quote_date
     public $quote_late_fee_amount1 = 0;
     public $quote_late_fee_percent1 = 0;
-    
 
+    public string $payment_flow = 'default'; //smooth
+
+    public string $email_subject_payment_failed = '';
+    public string $email_template_payment_failed = '';
 
     public static $casts = [
+        'payment_flow'                       => 'string',
         'enable_quote_reminder1'             => 'bool',
         'quote_num_days_reminder1'           => 'int',
         'quote_schedule_reminder1'           => 'string',
@@ -768,6 +772,8 @@ class CompanySettings extends BaseSettings
         'portal_custom_js' => 'string',
         'client_portal_enable_uploads' => 'bool',
         'purchase_order_number_counter' => 'integer',
+        'email_template_payment_failed'      => 'string',
+        'email_subject_payment_failed'       => 'string',
     ];
 
     public static $free_plan_casts = [

app/DataMapper/EmailTemplateDefaults.php

@@ -30,6 +30,7 @@ class EmailTemplateDefaults
         'email_template_custom2',
         'email_template_custom3',
         'email_template_purchase_order',
+        'email_template_payment_failed'
     ];
 
     public static function getDefaultTemplate($template, $locale)
@@ -39,6 +40,8 @@ class EmailTemplateDefaults
         switch ($template) {
             /* Template */
 
+            case 'email_template_payment_failed':
+                return self::emailPaymentFailedTemplate();
             case 'email_template_invoice':
                 return self::emailInvoiceTemplate();
             case 'email_template_quote':
@@ -73,6 +76,9 @@ class EmailTemplateDefaults
             case 'email_subject_invoice':
                 return self::emailInvoiceSubject();
 
+            case 'email_subject_payment_failed':
+                return self::emailPaymentFailedSubject();
+
             case 'email_subject_quote':
                 return self::emailQuoteSubject();
 
@@ -120,27 +126,35 @@ class EmailTemplateDefaults
 
             case 'email_quote_subject_reminder1':
                 return self::emailQuoteReminder1Subject();
-                
+
             default:
                 return self::emailInvoiceTemplate();
 
         }
     }
 
+    public static function emailPaymentFailedSubject()
+    {
+        return ctrans('texts.notification_invoice_payment_failed_subject', ['invoice' => '$number']);
+    }
+
+    public static function emailPaymentFailedTemplate()
+    {
+        return '<p>$client<br><br>'.ctrans('texts.client_payment_failure_body', ['invoice' => '$number', 'amount' => '$amount']).'</p><div>$payment_error</div><br><div>$view_button</div>';
+    }
+
     public static function emailQuoteReminder1Subject()
     {
         return ctrans('texts.quote_reminder_subject', ['quote' => '$number', 'company' => '$company.name']);
     }
-    
+
     public static function emailQuoteReminder1Body()
     {
 
-        $invoice_message = '<p>$client<br><br>'.self::transformText('quote_reminder_message').'</p><div class="center">$view_button</div>';
-
-        return $invoice_message;
+        return '<p>$client<br><br>'.self::transformText('quote_reminder_message').'</p><div>$view_button</div>';
 
     }
-    
+
     public static function emailVendorNotificationSubject()
     {
         return self::transformText('vendor_notification_subject');
@@ -163,14 +177,14 @@ class EmailTemplateDefaults
 
     public static function emailInvoiceTemplate()
     {
-        $invoice_message = '<p>$client<br><br>'.self::transformText('invoice_message').'</p><div class="center">$view_button</div>';
+        $invoice_message = '<p>$client<br><br>'.self::transformText('invoice_message').'</p><div>$view_button</div>';
 
         return $invoice_message;
     }
 
     public static function emailInvoiceReminderTemplate()
     {
-        $invoice_message = '<p>$client<br><br>'.self::transformText('reminder_message').'</p><div class="center">$view_button</div>';
+        $invoice_message = '<p>$client<br><br>'.self::transformText('reminder_message').'</p><div>$view_button</div>';
 
         return $invoice_message;
     }
@@ -182,7 +196,7 @@ class EmailTemplateDefaults
 
     public static function emailQuoteTemplate()
     {
-        $quote_message = '<p>$client<br><br>'.self::transformText('quote_message').'</p><div class="center">$view_button</div>';
+        $quote_message = '<p>$client<br><br>'.self::transformText('quote_message').'</p><div>$view_button</div>';
 
         return $quote_message;
     }
@@ -199,28 +213,28 @@ class EmailTemplateDefaults
 
     public static function emailPurchaseOrderTemplate()
     {
-        $purchase_order_message = '<p>$vendor<br><br>'.self::transformText('purchase_order_message').'</p><div class="center">$view_button</div>';
+        $purchase_order_message = '<p>$vendor<br><br>'.self::transformText('purchase_order_message').'</p><div>$view_button</div>';
 
         return $purchase_order_message;
     }
 
     public static function emailPaymentTemplate()
     {
-        $payment_message = '<p>$client<br><br>'.self::transformText('payment_message').'<br><br>$invoices</p><div class="center">$view_button</div>';
+        $payment_message = '<p>$client<br><br>'.self::transformText('payment_message').'<br><br>$invoices</p><div>$view_button</div>';
 
         return $payment_message;
     }
 
     public static function emailCreditTemplate()
     {
-        $credit_message = '<p>$client<br><br>'.self::transformText('credit_message').'</p><div class="center">$view_button</div>';
+        $credit_message = '<p>$client<br><br>'.self::transformText('credit_message').'</p><div>$view_button</div>';
 
         return $credit_message;
     }
 
     public static function emailPaymentPartialTemplate()
     {
-        $payment_message = '<p>$client<br><br>'.self::transformText('payment_message').'<br><br>$invoices</p><div class="center">$view_button</div>';
+        $payment_message = '<p>$client<br><br>'.self::transformText('payment_message').'<br><br>$invoices</p><div>$view_button</div>';
 
         return $payment_message;
     }

app/DataMapper/QuickbooksSettings.php

@@ -0,0 +1,61 @@
+<?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;
+
+use Illuminate\Contracts\Database\Eloquent\Castable;
+use App\Casts\QuickbooksSettingsCast;
+
+/**
+ * QuickbooksSettings.
+ */
+class QuickbooksSettings implements Castable
+{
+    public string $accessTokenKey;
+
+    public string $refresh_token;
+
+    public string $realmID;
+
+    public int $accessTokenExpiresAt;
+
+    public int $refreshTokenExpiresAt;
+    
+    public string $baseURL;
+    /** 
+     * entity client,invoice,quote,purchase_order,vendor,payment
+     * sync true/false
+     * update_record true/false
+     * direction push/pull/birectional
+     * */
+    public array $settings = [
+        'client' => ['sync' => true, 'update_record' => true, 'direction' => 'bidirectional'],
+        'vendor' => ['sync' => true, 'update_record' => true, 'direction' => 'bidirectional'],
+        'invoice' => ['sync' => true, 'update_record' => true, 'direction' => 'bidirectional'],
+        'sales' => ['sync' => true, 'update_record' => true, 'direction' => 'bidirectional'],
+        'quote' => ['sync' => true, 'update_record' => true, 'direction' => 'bidirectional'],
+        'purchase_order' => ['sync' => true, 'update_record' => true, 'direction' => 'bidirectional'],
+        'product' => ['sync' => true, 'update_record' => true, 'direction' => 'bidirectional'],
+        'payment' => ['sync' => true, 'update_record' => true, 'direction' => 'bidirectional'],
+    ];
+
+
+    /**
+     * Get the name of the caster class to use when casting from / to this cast target.
+     *
+     * @param  array<string, mixed>  $arguments
+     */
+    public static function castUsing(array $arguments): string
+    {
+        return QuickbooksSettingsCast::class;
+    }
+
+}

app/DataMapper/Tax/BaseRule.php

@@ -17,6 +17,7 @@ use App\Models\Invoice;
 use App\Models\Product;
 use App\DataProviders\USStates;
 use App\DataMapper\Tax\ZipTax\Response;
+use App\Models\RecurringInvoice;
 
 class BaseRule implements RuleInterface
 {
@@ -47,6 +48,9 @@ class BaseRule implements RuleInterface
             'DK', // Denmark
             'EE', // Estonia
             'ES', // Spain
+            'ES-CN', // Canary Islands
+            'ES-CE', // Ceuta
+            'ES-ML', // Melilla
             'FI', // Finland
             'FR', // France
             'GR', // Greece
@@ -77,6 +81,9 @@ class BaseRule implements RuleInterface
             'DK' => 'EU', // Denmark
             'EE' => 'EU', // Estonia
             'ES' => 'EU', // Spain
+            'ES-CN' => 'EU', // Canary Islands
+            'ES-CE' => 'EU', // Ceuta
+            'ES-ML' => 'EU', // Melilla
             'FI' => 'EU', // Finland
             'FR' => 'EU', // France
             'GR' => 'EU', // Greece
@@ -132,7 +139,7 @@ class BaseRule implements RuleInterface
 
     public function shouldCalcTax(): bool
     {
-        return $this->should_calc_tax;
+        return $this->should_calc_tax && $this->checkIfInvoiceLocked();
     }
     /**
      * Initializes the tax rule for the entity.
@@ -215,7 +222,7 @@ class BaseRule implements RuleInterface
 
             $this->invoice->tax_data = $tax_data;
 
-            if(\DB::transactionLevel() == 0) {
+            if(\DB::transactionLevel() == 0 && isset($this->invoice->id)) {
 
                 try {
                     $this->invoice->saveQuietly();
@@ -400,4 +407,40 @@ class BaseRule implements RuleInterface
         return ! in_array($iso_3166_2, array_merge($this->eu_country_codes, array_keys($this->region_codes)));
     }
 
+    private function checkIfInvoiceLocked(): bool
+    {
+        $lock_invoices = $this->client->getSetting('lock_invoices');
+
+        if($this->invoice instanceof RecurringInvoice) {
+            return true;
+        }
+
+        switch ($lock_invoices) {
+            case 'off':
+                return true;
+            case 'when_sent':
+                if ($this->invoice->status_id == Invoice::STATUS_SENT) {
+                    return false;
+                }
+
+                return true;
+
+            case 'when_paid':
+                if ($this->invoice->status_id == Invoice::STATUS_PAID) {
+                    return false;
+                }
+
+                return true;
+
+                //if now is greater than the end of month the invoice was dated - do not modify
+            case 'end_of_month':
+                if(\Carbon\Carbon::parse($this->invoice->date)->setTimezone($this->invoice->company->timezone()->name)->endOfMonth()->lte(now())) {
+                    return false;
+                }
+                return true;
+            default:
+                return true;
+        }
+    }
+
 }

app/DataMapper/Tax/DE/Rule.php

@@ -43,6 +43,8 @@ class Rule extends BaseRule implements RuleInterface
     public float $reduced_tax_rate = 0;
 
     public string $tax_name1 = 'MwSt.';
+
+    private string $tax_name;
     /**
      * Initializes the rules and builds any required data.
      *
@@ -50,6 +52,7 @@ class Rule extends BaseRule implements RuleInterface
      */
     public function init(): self
     {
+        $this->tax_name = $this->tax_name1;
         $this->calculateRates();
 
         return $this;
@@ -91,6 +94,7 @@ class Rule extends BaseRule implements RuleInterface
      */
     public function reverseTax($item): self
     {
+        $this->tax_name1 = $this->tax_name;
         $this->tax_rate1 = 0;
 
         return $this;
@@ -103,6 +107,8 @@ class Rule extends BaseRule implements RuleInterface
      */
     public function taxReduced($item): self
     {
+
+        $this->tax_name1 = $this->tax_name;
         $this->tax_rate1 = $this->reduced_tax_rate;
 
         return $this;
@@ -115,6 +121,8 @@ class Rule extends BaseRule implements RuleInterface
      */
     public function zeroRated($item): self
     {
+
+        $this->tax_name1 = $this->tax_name;
         $this->tax_rate1 = 0;
 
         return $this;
@@ -142,6 +150,7 @@ class Rule extends BaseRule implements RuleInterface
     public function taxDigital($item): self
     {
 
+        $this->tax_name1 = $this->tax_name;
         $this->tax_rate1 = $this->tax_rate;
 
         return $this;
@@ -155,6 +164,7 @@ class Rule extends BaseRule implements RuleInterface
     public function taxService($item): self
     {
 
+        $this->tax_name1 = $this->tax_name;
         $this->tax_rate1 = $this->tax_rate;
 
         return $this;
@@ -168,6 +178,7 @@ class Rule extends BaseRule implements RuleInterface
     public function taxShipping($item): self
     {
 
+        $this->tax_name1 = $this->tax_name;
         $this->tax_rate1 = $this->tax_rate;
 
         return $this;
@@ -181,6 +192,7 @@ class Rule extends BaseRule implements RuleInterface
     public function taxPhysical($item): self
     {
 
+        $this->tax_name1 = $this->tax_name;
         $this->tax_rate1 = $this->tax_rate;
 
         return $this;
@@ -229,8 +241,7 @@ 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->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->vat_number && $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;
@@ -240,8 +251,8 @@ class Rule extends BaseRule implements RuleInterface
             $this->reduced_tax_rate = 0;
         } 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
-            if(($this->client->company->tax_data->seller_subregion != $this->client_subregion) && $this->client->company->tax_data->regions->EU->has_sales_above_threshold) {
+        } elseif(in_array($this->client_subregion, $this->eu_country_codes) && ((strlen($this->client->vat_number ?? '') == 1) || !$this->client->has_valid_vat_number)) { //eu country / no valid vat
+            if($this->client->company->tax_data->seller_subregion != $this->client_subregion) {
                 // 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 ?? 0;
                 $this->reduced_tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->country->iso_3166_2}->reduced_tax_rate ?? 0;

app/DataMapper/Tax/ES_CE/Rule.php

@@ -0,0 +1,44 @@
+<?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\Tax\ES_CE;
+
+use App\DataMapper\Tax\DE\Rule as DERule;
+
+class Rule extends DERule
+{
+    /** @var string $seller_region */
+    public string $seller_region = 'EU';
+
+    /** @var bool $consumer_tax_exempt */
+    public bool $consumer_tax_exempt = false;
+
+    /** @var bool $business_tax_exempt */
+    public bool $business_tax_exempt = false;
+
+    /** @var bool $eu_business_tax_exempt */
+    public bool $eu_business_tax_exempt = true;
+
+    /** @var bool $foreign_business_tax_exempt */
+    public bool $foreign_business_tax_exempt = false;
+
+    /** @var bool $foreign_consumer_tax_exempt */
+    public bool $foreign_consumer_tax_exempt = false;
+
+    /** @var float $tax_rate */
+    public float $tax_rate = 0;
+
+    /** @var float $reduced_tax_rate */
+    public float $reduced_tax_rate = 0;
+
+    public string $tax_name1 = 'IGIC';
+
+}

app/DataMapper/Tax/ES_CN/Rule.php

@@ -0,0 +1,44 @@
+<?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\Tax\ES_CN;
+
+use App\DataMapper\Tax\DE\Rule as DERule;
+
+class Rule extends DERule
+{
+    /** @var string $seller_region */
+    public string $seller_region = 'EU';
+
+    /** @var bool $consumer_tax_exempt */
+    public bool $consumer_tax_exempt = false;
+
+    /** @var bool $business_tax_exempt */
+    public bool $business_tax_exempt = false;
+
+    /** @var bool $eu_business_tax_exempt */
+    public bool $eu_business_tax_exempt = true;
+
+    /** @var bool $foreign_business_tax_exempt */
+    public bool $foreign_business_tax_exempt = false;
+
+    /** @var bool $foreign_consumer_tax_exempt */
+    public bool $foreign_consumer_tax_exempt = false;
+
+    /** @var float $tax_rate */
+    public float $tax_rate = 0;
+
+    /** @var float $reduced_tax_rate */
+    public float $reduced_tax_rate = 0;
+
+    public string $tax_name1 = 'IGIC';
+
+}

app/DataMapper/Tax/ES_ML/Rule.php

@@ -0,0 +1,44 @@
+<?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\Tax\ES_ML;
+
+use App\DataMapper\Tax\DE\Rule as DERule;
+
+class Rule extends DERule
+{
+    /** @var string $seller_region */
+    public string $seller_region = 'EU';
+
+    /** @var bool $consumer_tax_exempt */
+    public bool $consumer_tax_exempt = false;
+
+    /** @var bool $business_tax_exempt */
+    public bool $business_tax_exempt = false;
+
+    /** @var bool $eu_business_tax_exempt */
+    public bool $eu_business_tax_exempt = true;
+
+    /** @var bool $foreign_business_tax_exempt */
+    public bool $foreign_business_tax_exempt = false;
+
+    /** @var bool $foreign_consumer_tax_exempt */
+    public bool $foreign_consumer_tax_exempt = false;
+
+    /** @var float $tax_rate */
+    public float $tax_rate = 0;
+
+    /** @var float $reduced_tax_rate */
+    public float $reduced_tax_rate = 0;
+
+    public string $tax_name1 = 'IGIC';
+
+}

app/DataMapper/Tax/TaxModel.php

@@ -17,7 +17,7 @@ class TaxModel
     public string $seller_subregion = 'CA';
 
     /** @var string $version */
-    public string $version = 'beta';
+    public string $version = 'gamma';
 
     /** @var object $regions */
     public object $regions;
@@ -34,10 +34,10 @@ class TaxModel
         if(!$model) {
             $this->regions = $this->init();
         } else {
-            
+
             //@phpstan-ignore-next-line
             foreach($model as $key => $value) {
-                $this->{$key} = $value; 
+                $this->{$key} = $value;
             }
 
         }
@@ -48,8 +48,7 @@ class TaxModel
     public function migrate(): self
     {
 
-        if($this->version == 'alpha')
-        {
+        if($this->version == 'alpha') {
             $this->regions->EU->subregions->PL = new \stdClass();
             $this->regions->EU->subregions->PL->tax_rate = 23;
             $this->regions->EU->subregions->PL->tax_name = 'VAT';
@@ -59,6 +58,32 @@ class TaxModel
             $this->version = 'beta';
         }
 
+        if($this->version == 'beta') {
+
+            //CEUTA
+            $this->regions->EU->subregions->{'ES-CE'} = new \stdClass();
+            $this->regions->EU->subregions->{'ES-CE'}->tax_rate = 4;
+            $this->regions->EU->subregions->{'ES-CE'}->tax_name = 'IGIC';
+            $this->regions->EU->subregions->{'ES-CE'}->reduced_tax_rate = 4;
+            $this->regions->EU->subregions->{'ES-CE'}->apply_tax = false;
+
+            //MELILLA ML 4
+            $this->regions->EU->subregions->{'ES-ML'} = new \stdClass();
+            $this->regions->EU->subregions->{'ES-ML'}->tax_rate = 4;
+            $this->regions->EU->subregions->{'ES-ML'}->tax_name = 'IGIC';
+            $this->regions->EU->subregions->{'ES-ML'}->reduced_tax_rate = 4;
+            $this->regions->EU->subregions->{'ES-ML'}->apply_tax = false;
+
+            //CANARIAS CN 7/3
+            $this->regions->EU->subregions->{'ES-CN'} = new \stdClass();
+            $this->regions->EU->subregions->{'ES-CN'}->tax_rate = 7;
+            $this->regions->EU->subregions->{'ES-CN'}->tax_name = 'IGIC';
+            $this->regions->EU->subregions->{'ES-CN'}->reduced_tax_rate = 4;
+            $this->regions->EU->subregions->{'ES-CN'}->apply_tax = false;
+
+            $this->version = 'gamma';
+        }
+
         return $this;
     }
 
@@ -420,6 +445,25 @@ class TaxModel
         $this->regions->EU->subregions->ES->reduced_tax_rate = 10;
         $this->regions->EU->subregions->ES->apply_tax = false;
 
+        $this->regions->EU->subregions->{'ES-CE'} = new \stdClass();
+        $this->regions->EU->subregions->{'ES-CE'}->tax_rate = 4;
+        $this->regions->EU->subregions->{'ES-CE'}->tax_name = 'IGIC';
+        $this->regions->EU->subregions->{'ES-CE'}->reduced_tax_rate = 4;
+        $this->regions->EU->subregions->{'ES-CE'}->apply_tax = false;
+
+        $this->regions->EU->subregions->{'ES-ML'} = new \stdClass();
+        $this->regions->EU->subregions->{'ES-ML'}->tax_rate = 4;
+        $this->regions->EU->subregions->{'ES-ML'}->tax_name = 'IGIC';
+        $this->regions->EU->subregions->{'ES-ML'}->reduced_tax_rate = 4;
+        $this->regions->EU->subregions->{'ES-ML'}->apply_tax = false;
+
+        $this->regions->EU->subregions->{'ES-CN'} = new \stdClass();
+        $this->regions->EU->subregions->{'ES-CN'}->tax_rate = 7;
+        $this->regions->EU->subregions->{'ES-CN'}->tax_name = 'IGIC';
+        $this->regions->EU->subregions->{'ES-CN'}->reduced_tax_rate = 3;
+        $this->regions->EU->subregions->{'ES-CN'}->apply_tax = false;
+
+
         $this->regions->EU->subregions->FI = new \stdClass();
         $this->regions->EU->subregions->FI->tax_rate = 24;
         $this->regions->EU->subregions->FI->tax_name = 'ALV';

app/DataProviders/CAProvinces.php

@@ -1,8 +1,18 @@
 <?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\DataProviders;
 
-final class CAProvinces {
+final class CAProvinces
+{
     /**
      * The provinces and territories of Canada
      *
@@ -30,7 +40,8 @@ final class CAProvinces {
      * @param  string  $abbreviation
      * @return string
      */
-    public static function getName($abbreviation) {
+    public static function getName($abbreviation)
+    {
         return self::$provinces[$abbreviation];
     }
 
@@ -39,7 +50,8 @@ final class CAProvinces {
      *
      * @return array
      */
-    public static function get() {
+    public static function get()
+    {
         return self::$provinces;
     }
 
@@ -49,7 +61,8 @@ final class CAProvinces {
      * @param  string  $name
      * @return string
      */
-    public static function getAbbreviation($name) {
+    public static function getAbbreviation($name)
+    {
         return array_search(ucwords($name), self::$provinces);
     }
 }

app/DataProviders/Frequencies.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\DataProviders;
-
-use Omnipay\Rotessa\Object\Frequency;
-
-final class Frequencies 
-{
-   public static function get() : array {
-      return Frequency::getTypes();
-   }
-
-   public static function getFromType() {
-
-   }
-   public static function getOnePayment() {
-      return Frequency::ONCE;
-   }
-}

app/Enum/HttpVerb.php

@@ -0,0 +1,22 @@
+<?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\Enum;
+
+enum HttpVerb: string
+{
+    case POST = 'post';
+    case PUT = 'put';
+    case GET = 'get';
+    case PATCH = 'patch';
+    case DELETE = 'delete';
+}

app/Events/Client/ClientWasArchived.php

@@ -58,7 +58,7 @@ class ClientWasArchived implements ShouldBroadcast
 
     public function broadcastWith()
     {
-        
+
         $manager = new Manager();
         $manager->setSerializer(new ArraySerializer());
         $class = sprintf('App\\Transformers\\%sTransformer', class_basename($this->client));
@@ -79,7 +79,7 @@ class ClientWasArchived implements ShouldBroadcast
      */
     public function broadcastOn()
     {
-        
+
         return [
             new PrivateChannel("company-{$this->company->company_key}"),
         ];

app/Events/Invoice/InvoiceAutoBillFailed.php

@@ -0,0 +1,35 @@
+<?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\Events\Invoice;
+
+use App\Models\Company;
+use App\Models\Invoice;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class InvoiceAutoBillFailed.
+ */
+class InvoiceAutoBillFailed
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param Invoice $invoice
+     * @param Company $company
+     * @param array $event_vars
+     */
+    public function __construct(public Invoice $invoice, public Company $company, public array $event_vars, public ?string $notes)
+    {
+    }
+}

app/Events/Invoice/InvoiceAutoBillSuccess.php

@@ -0,0 +1,35 @@
+<?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\Events\Invoice;
+
+use App\Models\Company;
+use App\Models\Invoice;
+use Illuminate\Queue\SerializesModels;
+
+/**
+ * Class InvoiceAutoBillSuccess.
+ */
+class InvoiceAutoBillSuccess
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param Invoice $invoice
+     * @param Company $company
+     * @param array $event_vars
+     */
+    public function __construct(public Invoice $invoice, public Company $company, public array $event_vars)
+    {
+    }
+}

app/Exceptions/DuplicatePaymentException.php

@@ -39,6 +39,6 @@ class DuplicatePaymentException extends Exception
         return response()->json([
             'message' => 'Duplicate request',
         ], 400);
-        
+
     }
 }

app/Exceptions/PeppolValidationException.php

@@ -0,0 +1,34 @@
+<?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\Exceptions;
+
+use Exception;
+
+class PeppolValidationException extends Exception
+{
+
+    protected string $field = '';
+
+    public function __construct($message, $field, $code = 0, Exception $previous = null)
+    {
+        // Store the custom data
+        $this->field = $field;
+
+        // Ensure that everything is assigned properly by calling the parent constructor
+        parent::__construct($message, $code, $previous);
+    }
+
+    public function getInvalidField()
+    {
+        return $this->field;
+    }
+}

app/Export/CSV/ActivityExport.php

@@ -101,8 +101,11 @@ class ActivityExport extends BaseExport
         $t = app('translator');
         $t->replace(Ninja::transformTranslations($this->company->settings));
 
-        $this->date_format = DateFormat::find($this->company->settings->date_format_id)->format;
+        /** @var \App\Models\DateFormat $df */
+        $df = DateFormat::query()->find($this->company->settings->date_format_id);
 
+        $this->date_format = $df->format; 
+        
         if (count($this->input['report_keys']) == 0) {
             $this->input['report_keys'] = array_values($this->entity_keys);
         }
@@ -129,8 +132,8 @@ class ActivityExport extends BaseExport
 
         $query->cursor()
               ->each(function ($entity) {
-                
-                /** @var \App\Models\Activity $entity */
+
+                  /** @var \App\Models\Activity $entity */
 
                   $this->buildRow($entity);
               });

app/Export/CSV/BaseExport.php

@@ -451,6 +451,7 @@ class BaseExport
         'project' => 'task.project_id',
         'billable' => 'task.billable',
         'item_notes' => 'task.item_notes',
+        'time_log' => 'task.time_log',
     ];
 
     protected array $forced_client_fields = [
@@ -844,7 +845,7 @@ class BaseExport
     /**
      * Apply Product Filters
      *
-     * @param  Builder $query
+     * @param  \Illuminate\Database\Eloquent\Builder $query
      *
      * @return Builder
      */
@@ -869,7 +870,7 @@ class BaseExport
     /**
      * Add Client Filter
      *
-     * @param  Builder $query
+     * @param  \Illuminate\Database\Eloquent\Builder $query
      * @param  mixed $clients
      *
      * @return Builder
@@ -892,7 +893,7 @@ class BaseExport
     /**
      * Add Vendor Filter
      *
-     * @param  Builder $query
+     * @param  \Illuminate\Database\Eloquent\Builder $query
      * @param  string $vendors
      *
      * @return Builder
@@ -916,7 +917,7 @@ class BaseExport
     /**
      * AddProjectFilter
      *
-     * @param  Builder $query
+     * @param  \Illuminate\Database\Eloquent\Builder $query
      * @param  string $projects
      *
      * @return Builder
@@ -940,7 +941,7 @@ class BaseExport
     /**
      * Add Category Filter
      *
-     * @param  Builder $query
+     * @param  \Illuminate\Database\Eloquent\Builder $query
      * @param  string $expense_categories
      *
      * @return Builder
@@ -965,7 +966,7 @@ class BaseExport
     /**
      * Add Payment Status Filters
      *
-     * @param  Builder $query
+     * @param  \Illuminate\Database\Eloquent\Builder $query
      * @param  string $status
      *
      * @return Builder
@@ -1023,10 +1024,10 @@ class BaseExport
     /**
      * Add RecurringInvoice Status Filter
      *
-     * @param  Builder $query
+     * @param  \Illuminate\Database\Eloquent\Builder $query
      * @param  string $status
      *
-     * @return Builder
+     * @return \Illuminate\Database\Eloquent\Builder
      */
     protected function addRecurringInvoiceStatusFilter(Builder $query, string $status): Builder
     {
@@ -1040,7 +1041,7 @@ class BaseExport
 
         $recurring_filters = [];
 
-        if($this->company->getSetting('report_include_drafts')){
+        if($this->company->getSetting('report_include_drafts')) {
             $recurring_filters[] = RecurringInvoice::STATUS_DRAFT;
         }
 
@@ -1066,7 +1067,7 @@ class BaseExport
     /**
      * Add QuoteStatus Filter
      *
-     * @param  Builder $query
+     * @param  \Illuminate\Database\Eloquent\Builder $query
      * @param  string $status
      *
      * @return Builder
@@ -1132,7 +1133,7 @@ class BaseExport
     /**
      * Add PurchaseOrder Status Filter
      *
-     * @param  Builder $query
+     * @param  \Illuminate\Database\Eloquent\Builder $query
      * @param  string $status
      *
      * @return Builder
@@ -1182,13 +1183,13 @@ class BaseExport
     /**
      * Add Invoice Status Filter
      *
-     * @param  Builder $query
+     * @param  \Illuminate\Database\Eloquent\Builder $query
      * @param  string $status
      * @return Builder
      */
     protected function addInvoiceStatusFilter(Builder $query, string $status): Builder
     {
-               
+
         /** @var array $status_parameters */
         $status_parameters = explode(',', $status);
 
@@ -1248,7 +1249,7 @@ class BaseExport
     /**
      * Add Date Range
      *
-     * @param  Builder $query
+     * @param  \Illuminate\Database\Eloquent\Builder $query
      * @param ?string $table_name
      * @return Builder
      */
@@ -1269,7 +1270,7 @@ class BaseExport
             $custom_start_date = now()->startOfYear();
             $custom_end_date = now();
         }
-        
+
         switch ($date_range) {
             case 'all':
                 $this->start_date = 'All available data';
@@ -1615,10 +1616,10 @@ class BaseExport
             ZipDocuments::dispatch($documents, $this->company, $user);
         }
     }
-    
+
     /**
      * Tests that the column exists
-     * on the table prior to adding it to 
+     * on the table prior to adding it to
      * the query builder
      *
      * @param  string $table

app/Export/CSV/ClientExport.php

@@ -102,7 +102,7 @@ class ClientExport extends BaseExport
 
         $report = $query->cursor()
                 ->map(function ($client) {
-                    
+
                     /** @var \App\Models\Client $client */
                     $row = $this->buildRow($client);
                     return $this->processMetaData($row, $client);
@@ -133,7 +133,7 @@ class ClientExport extends BaseExport
             $query->where('is_deleted', 0);
         }
 
-        $query = $this->addDateRange($query,' clients');
+        $query = $this->addDateRange($query, ' clients');
 
         if($this->input['document_email_attachment'] ?? false) {
             $this->queueDocuments($query);
@@ -156,8 +156,8 @@ class ClientExport extends BaseExport
 
         $query->cursor()
               ->each(function ($client) {
-                
-                /** @var \App\Models\Client $client */
+
+                  /** @var \App\Models\Client $client */
                   $this->csv->insertOne($this->buildRow($client));
               });
 

app/Export/CSV/CreditExport.php

@@ -52,7 +52,7 @@ class CreditExport extends BaseExport
 
         $report = $query->cursor()
                 ->map(function ($credit) {
-                    
+
                     /** @var \App\Models\Credit $credit */
                     $row = $this->buildRow($credit);
                     return $this->processMetaData($row, $credit);

app/Export/CSV/DocumentExport.php

@@ -54,7 +54,7 @@ class DocumentExport extends BaseExport
 
         $report = $query->cursor()
                 ->map(function ($document) {
-                    
+
                     /** @var \App\Models\Document $document */
                     $row = $this->buildRow($document);
                     return $this->processMetaData($row, $document);
@@ -101,7 +101,7 @@ class DocumentExport extends BaseExport
 
         $query->cursor()
               ->each(function ($entity) {
-                    /** @var mixed $entity */
+                  /** @var mixed $entity */
                   $this->csv->insertOne($this->buildRow($entity));
               });
 

app/Export/CSV/ExpenseExport.php

@@ -52,7 +52,7 @@ class ExpenseExport extends BaseExport
 
         $report = $query->cursor()
                 ->map(function ($resource) {
-                    
+
                     /** @var \App\Models\Expense $resource */
                     $row = $this->buildRow($resource);
                     return $this->processMetaData($row, $resource);
@@ -134,7 +134,7 @@ class ExpenseExport extends BaseExport
 
         $query->cursor()
                 ->each(function ($expense) {
-                    
+
                     /** @var \App\Models\Expense $expense */
                     $this->csv->insertOne($this->buildRow($expense));
                 });
@@ -266,11 +266,10 @@ class ExpenseExport extends BaseExport
         if($expense->calculate_tax_by_amount) {
 
             $total_tax_amount = round($expense->tax_amount1 + $expense->tax_amount2 + $expense->tax_amount3, $precision);
-            
+
             if($expense->uses_inclusive_taxes) {
                 $entity['expense.net_amount'] = round($expense->amount, $precision) - $total_tax_amount;
-            }
-            else {
+            } else {
                 $entity['expense.net_amount'] = round($expense->amount, $precision);
             }
 

app/Export/CSV/InvoiceExport.php

@@ -99,7 +99,7 @@ class InvoiceExport extends BaseExport
 
         $report = $query->cursor()
                 ->map(function ($resource) {
-                    
+
                     /** @var \App\Models\Invoice $resource */
                     $row = $this->buildRow($resource);
                     return $this->processMetaData($row, $resource);
@@ -121,7 +121,7 @@ class InvoiceExport extends BaseExport
 
         $query->cursor()
             ->each(function ($invoice) {
-                
+
                 /** @var \App\Models\Invoice $invoice */
                 $this->csv->insertOne($this->buildRow($invoice));
             });

app/Export/CSV/InvoiceItemExport.php

@@ -113,7 +113,7 @@ class InvoiceItemExport extends BaseExport
 
         $query->cursor()
             ->each(function ($resource) {
-                
+
                 /** @var \App\Models\Invoice $resource */
                 $this->iterateItems($resource);
 
@@ -143,7 +143,7 @@ class InvoiceItemExport extends BaseExport
 
         $query->cursor()
             ->each(function ($invoice) {
-                
+
                 /** @var \App\Models\Invoice $invoice */
                 $this->iterateItems($invoice);
             });
@@ -229,10 +229,6 @@ class InvoiceItemExport extends BaseExport
         //     $entity['currency'] = $invoice->client->currency() ? $invoice->client->currency()->code : $invoice->company->currency()->code;
         // }
 
-        // if(array_key_exists('type', $entity)) {
-        //     $entity['type'] = $invoice->typeIdString($entity['type']);
-        // }
-
         // if(array_key_exists('tax_category', $entity)) {
         //     $entity['tax_category'] = $invoice->taxTypeString($entity['tax_category']);
         // }
@@ -266,9 +262,9 @@ class InvoiceItemExport extends BaseExport
         }
 
         if (in_array('invoice.project', $this->input['report_keys'])) {
-            $entity['invoice.project'] = $invoice->project ? $invoice->project->name : '';// @phpstan-ignore-line        
+            $entity['invoice.project'] = $invoice->project ? $invoice->project->name : '';// @phpstan-ignore-line
         }
-        
+
         return $entity;
     }
 

app/Export/CSV/PaymentExport.php

@@ -92,7 +92,7 @@ class PaymentExport extends BaseExport
 
         $report = $query->cursor()
                 ->map(function ($resource) {
-                    
+
                     /** @var \App\Models\Payment $resource */
                     $row = $this->buildRow($resource);
                     return $this->processMetaData($row, $resource);
@@ -114,8 +114,8 @@ class PaymentExport extends BaseExport
 
         $query->cursor()
               ->each(function ($entity) {
-                
-                    /** @var \App\Models\Payment $entity */
+
+                  /** @var \App\Models\Payment $entity */
                   $this->csv->insertOne($this->buildRow($entity));
               });
 

app/Export/CSV/ProductExport.php

@@ -51,7 +51,7 @@ class ProductExport extends BaseExport
 
         $report = $query->cursor()
                 ->map(function ($resource) {
-                    
+
                     /** @var \App\Models\Product $resource */
                     $row = $this->buildRow($resource);
                     return $this->processMetaData($row, $resource);
@@ -106,8 +106,8 @@ class ProductExport extends BaseExport
         $query->cursor()
               ->each(function ($entity) {
 
-                /** @var \App\Models\Product $entity */
-                $this->csv->insertOne($this->buildRow($entity));
+                  /** @var \App\Models\Product $entity */
+                  $this->csv->insertOne($this->buildRow($entity));
               });
 
         return $this->csv->toString();

app/Export/CSV/PurchaseOrderExport.php

@@ -98,7 +98,7 @@ class PurchaseOrderExport extends BaseExport
 
         $report = $query->cursor()
                 ->map(function ($resource) {
-                    
+
                     /** @var \App\Models\PurchaseOrder $resource */
                     $row = $this->buildRow($resource);
                     return $this->processMetaData($row, $resource);
@@ -121,9 +121,9 @@ class PurchaseOrderExport extends BaseExport
 
         $query->cursor()
             ->each(function ($purchase_order) {
-                
-            /** @var \App\Models\PurchaseOrder $purchase_order */
-            $this->csv->insertOne($this->buildRow($purchase_order));
+
+                /** @var \App\Models\PurchaseOrder $purchase_order */
+                $this->csv->insertOne($this->buildRow($purchase_order));
             });
 
         return $this->csv->toString();

app/Export/CSV/PurchaseOrderItemExport.php

@@ -101,15 +101,15 @@ class PurchaseOrderItemExport extends BaseExport
 
         $query->cursor()
               ->each(function ($resource) {
-                
-                /** @var \App\Models\PurchaseOrder $resource */
-                $this->iterateItems($resource);
 
-                foreach($this->storage_array as $row) {
-                    $this->storage_item_array[] = $this->processItemMetaData($row, $resource);
-                }
+                  /** @var \App\Models\PurchaseOrder $resource */
+                  $this->iterateItems($resource);
 
-                $this->storage_array = [];
+                  foreach($this->storage_array as $row) {
+                      $this->storage_item_array[] = $this->processItemMetaData($row, $resource);
+                  }
+
+                  $this->storage_array = [];
 
               });
 
@@ -129,9 +129,9 @@ class PurchaseOrderItemExport extends BaseExport
 
         $query->cursor()
             ->each(function ($purchase_order) {
-               
-            /** @var \App\Models\PurchaseOrder $purchase_order */
-            $this->iterateItems($purchase_order);
+
+                /** @var \App\Models\PurchaseOrder $purchase_order */
+                $this->iterateItems($purchase_order);
             });
 
         $this->csv->insertAll($this->storage_array);
@@ -213,10 +213,6 @@ class PurchaseOrderItemExport extends BaseExport
         //     $entity['currency'] = $purchase_order->vendor->currency() ? $purchase_order->vendor->currency()->code : $purchase_order->company->currency()->code;
         // }
 
-        // if(array_key_exists('type', $entity)) {
-        //     $entity['type'] = $purchase_order->typeIdString($entity['type']);
-        // }
-
         // if(array_key_exists('tax_category', $entity)) {
         //     $entity['tax_category'] = $purchase_order->taxTypeString($entity['tax_category']);
         // }

app/Export/CSV/QuoteExport.php

@@ -127,7 +127,7 @@ class QuoteExport extends BaseExport
 
         $query->cursor()
             ->each(function ($quote) {
-                
+
                 /** @var \App\Models\Quote $quote */
                 $this->csv->insertOne($this->buildRow($quote));
             });

app/Export/CSV/QuoteItemExport.php

@@ -104,7 +104,7 @@ class QuoteItemExport extends BaseExport
 
         $query->cursor()
             ->each(function ($resource) {
-                
+
                 /** @var \App\Models\Quote $resource */
                 $this->iterateItems($resource);
 
@@ -136,7 +136,7 @@ class QuoteItemExport extends BaseExport
 
         $query->cursor()
             ->each(function ($quote) {
-                
+
                 /** @var \App\Models\Quote $quote */
                 $this->iterateItems($quote);
             });

app/Export/CSV/RecurringInvoiceExport.php

@@ -93,7 +93,7 @@ class RecurringInvoiceExport extends BaseExport
 
         $query->cursor()
             ->each(function ($invoice) {
-                
+
                 /** @var \App\Models\RecurringInvoice $invoice */
                 $this->csv->insertOne($this->buildRow($invoice));
             });
@@ -114,7 +114,7 @@ class RecurringInvoiceExport extends BaseExport
 
         $report = $query->cursor()
                 ->map(function ($resource) {
-                    
+
                     /** @var \App\Models\RecurringInvoice $resource */
                     $row = $this->buildRow($resource);
                     return $this->processMetaData($row, $resource);

app/Export/CSV/TaskExport.php

@@ -106,9 +106,9 @@ class TaskExport extends BaseExport
 
         $query->cursor()
               ->each(function ($entity) {
-                
-                /** @var \App\Models\Task $entity*/
-                $this->buildRow($entity);
+
+                  /** @var \App\Models\Task $entity*/
+                  $this->buildRow($entity);
               });
 
         $this->csv->insertAll($this->storage_array);
@@ -156,7 +156,7 @@ class TaskExport extends BaseExport
                 $entity[$key] = $transformed_entity[$parts[1]];
             } elseif (array_key_exists($key, $transformed_entity)) {
                 $entity[$key] = $transformed_entity[$key];
-            } elseif (in_array($key, ['task.start_date', 'task.end_date', 'task.duration', 'task.billable', 'task.item_notes'])) {
+            } elseif (in_array($key, ['task.start_date', 'task.end_date', 'task.duration', 'task.billable', 'task.item_notes', 'task.time_log'])) {
                 $entity[$key] = '';
             } else {
                 $entity[$key] = $this->decorator->transform($key, $task);
@@ -207,6 +207,9 @@ class TaskExport extends BaseExport
                 $seconds = $task->calcDuration();
                 $entity['task.duration'] = $seconds;
                 $entity['task.duration_words'] =  $seconds > 86400 ? CarbonInterval::seconds($seconds)->locale($this->company->locale())->cascade()->forHumans() : now()->startOfDay()->addSeconds($seconds)->format('H:i:s');
+
+                $entity['task.time_log'] = (isset($item[1]) && $item[1] != 0) ? $item[1] - $item[0] : ctrans('texts.is_running');
+
             }
 
             if (in_array('task.billable', $this->input['report_keys']) || in_array('billable', $this->input['report_keys'])) {

app/Export/CSV/VendorExport.php

@@ -90,7 +90,7 @@ class VendorExport extends BaseExport
 
         $report = $query->cursor()
                 ->map(function ($resource) {
-                    
+
                     /** @var \App\Models\Vendor $resource */
                     $row = $this->buildRow($resource);
                     return $this->processMetaData($row, $resource);
@@ -109,9 +109,9 @@ class VendorExport extends BaseExport
 
         $query->cursor()
               ->each(function ($vendor) {
-                  
-                /** @var \App\Models\Vendor $vendor */
-                $this->csv->insertOne($this->buildRow($vendor));
+
+                  /** @var \App\Models\Vendor $vendor */
+                  $this->csv->insertOne($this->buildRow($vendor));
               });
 
         return $this->csv->toString();

app/Export/Decorators/TaskDecorator.php

@@ -96,7 +96,7 @@ class TaskDecorator extends Decorator implements DecoratorInterface
         return '';
 
     }
-    
+
     /**
      * billable
      *
@@ -106,7 +106,7 @@ class TaskDecorator extends Decorator implements DecoratorInterface
     {
         return '';
     }
-    
+
     /**
      * items_notes
      * @todo
@@ -115,7 +115,7 @@ class TaskDecorator extends Decorator implements DecoratorInterface
     {
         return '';
     }
-    
+
     public function duration(Task $task)
     {
         return $task->calcDuration();

app/Factory/CreditFactory.php

@@ -16,7 +16,7 @@ use App\Models\Credit;
 
 class CreditFactory
 {
-    public static function create(int $company_id, int $user_id, object $settings = null, Client $client = null): Credit
+    public static function create(int $company_id, int $user_id): Credit
     {
         $credit = new Credit();
         $credit->status_id = Credit::STATUS_DRAFT;

app/Factory/InvoiceItemFactory.php

@@ -76,6 +76,26 @@ class InvoiceItemFactory
             $data[] = $item;
         }
 
+
+            $item = self::create();
+            $item->quantity = $faker->numberBetween(1, 10);
+            $item->cost = $faker->randomFloat(2, 1, 1000);
+            $item->line_total = $item->quantity * $item->cost;
+            $item->is_amount_discount = true;
+            $item->discount = $faker->numberBetween(1, 10);
+            $item->notes = str_replace(['"',"'"], ['',""], $faker->realText(20));
+            $item->product_key = $faker->word();
+            // $item->custom_value1 = $faker->realText(10);
+            // $item->custom_value2 = $faker->realText(10);
+            // $item->custom_value3 = $faker->realText(10);
+            // $item->custom_value4 = $faker->realText(10);
+            $item->tax_name1 = 'GST';
+            $item->tax_rate1 = 10.00;
+            $item->type_id = '2';
+
+            $data[] = $item;
+
+
         return $data;
     }
 

app/Factory/RecurringExpenseToExpenseFactory.php

@@ -149,43 +149,43 @@ class RecurringExpenseToExpenseFactory
             }
 
             // if (Str::contains($match, '|')) {
-                $parts = explode('|', $match); // [ '[MONTH', 'MONTH+2]' ]
+            $parts = explode('|', $match); // [ '[MONTH', 'MONTH+2]' ]
 
-                $left = substr($parts[0], 1); // 'MONTH'
-                $right = substr($parts[1], 0, -1); // MONTH+2
+            $left = substr($parts[0], 1); // 'MONTH'
+            $right = substr($parts[1], 0, -1); // MONTH+2
 
-                // If left side is not part of replacements, skip.
-                if (! array_key_exists($left, $replacements['ranges'])) {
-                    continue;
-                }
+            // If left side is not part of replacements, skip.
+            if (! array_key_exists($left, $replacements['ranges'])) {
+                continue;
+            }
 
-                $_left = Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F Y');
-                $_right = '';
+            $_left = Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F Y');
+            $_right = '';
 
-                // If right side doesn't have any calculations, replace with raw ranges keyword.
-                if (! Str::contains($right, ['-', '+', '/', '*'])) {
-                    $_right = Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F Y');
-                }
+            // If right side doesn't have any calculations, replace with raw ranges keyword.
+            if (! Str::contains($right, ['-', '+', '/', '*'])) {
+                $_right = Carbon::createFromDate(now()->year, now()->month)->translatedFormat('F Y');
+            }
 
-                // If right side contains one of math operations, calculate.
-                if (Str::contains($right, ['+'])) {
-                    $operation = preg_match_all('/(?!^-)[+*\/-](\s?-)?/', $right, $_matches);
+            // If right side contains one of math operations, calculate.
+            if (Str::contains($right, ['+'])) {
+                $operation = preg_match_all('/(?!^-)[+*\/-](\s?-)?/', $right, $_matches);
 
-                    $_operation = array_shift($_matches)[0]; // + -
+                $_operation = array_shift($_matches)[0]; // + -
 
-                    $_value = explode($_operation, $right); // [MONTHYEAR, 4]
+                $_value = explode($_operation, $right); // [MONTHYEAR, 4]
 
-                    $_right = Carbon::createFromDate(now()->year, now()->month)->addMonths($_value[1])->translatedFormat('F Y'); //@phpstan-ignore-line
-                }
+                $_right = Carbon::createFromDate(now()->year, now()->month)->addMonths($_value[1])->translatedFormat('F Y'); //@phpstan-ignore-line
+            }
 
-                $replacement = sprintf('%s to %s', $_left, $_right);
+            $replacement = sprintf('%s to %s', $_left, $_right);
 
-                $value = preg_replace(
-                    sprintf('/%s/', preg_quote($match)),
-                    $replacement,
-                    $value,
-                    1
-                );
+            $value = preg_replace(
+                sprintf('/%s/', preg_quote($match)),
+                $replacement,
+                $value,
+                1
+            );
             // }
         }
 

app/Filters/BankTransactionFilters.php

@@ -68,7 +68,7 @@ class BankTransactionFilters extends QueryFilters
          */
     public function client_status(string $value = ''): Builder
     {
-        if (strlen($value) == 0) {
+        if (strlen($value ?? '') == 0) {
             return $this->builder;
         }
 
@@ -108,13 +108,24 @@ class BankTransactionFilters extends QueryFilters
             }
 
             if (count($debit_or_withdrawal_array) >= 1) {
-                $query->orWhereIn('base_type', $debit_or_withdrawal_array);
+                $query->whereIn('base_type', $debit_or_withdrawal_array);
             }
         });
 
         return $this->builder;
     }
 
+    public function active_banks(string $value = ''): Builder
+    {
+
+        if (strlen($value) == 0 || $value != 'true') {
+            return $this->builder;
+        }
+
+        return $this->builder->whereHas('bank_integration', function ($query){
+            $query->where('is_deleted', 0)->whereNull('deleted_at');
+        });
+    }
 
     /**
      * Filters the list based on Bank Accounts.

app/Filters/CreditFilters.php

@@ -98,7 +98,14 @@ class CreditFilters extends QueryFilters
                                 ->orWhere('last_name', 'like', '%'.$filter.'%')
                                 ->orWhere('email', 'like', '%'.$filter.'%');
                           })
-                          ->orWhereRaw("JSON_UNQUOTE(JSON_EXTRACT(line_items, '$[*].notes')) LIKE ?", ['%'.$filter.'%']);
+                                                    ->orWhereRaw("
+                            JSON_UNQUOTE(JSON_EXTRACT(
+                                JSON_ARRAY(
+                                    JSON_UNQUOTE(JSON_EXTRACT(line_items, '$[*].notes')), 
+                                    JSON_UNQUOTE(JSON_EXTRACT(line_items, '$[*].product_key'))
+                                ), '$[*]')
+                            ) LIKE ?", ['%'.$filter.'%']);
+            //   ->orWhereRaw("JSON_UNQUOTE(JSON_EXTRACT(line_items, '$[*].notes')) LIKE ?", ['%'.$filter.'%']);
         });
     }
 

app/Filters/ExpenseFilters.php

@@ -99,6 +99,12 @@ class ExpenseFilters extends QueryFilters
                 });
             }
 
+            if (in_array('uninvoiced', $status_parameters)) {
+                $query->orWhere(function ($query) {
+                    $query->whereNull('invoice_id');
+                });
+            }
+
             if (in_array('paid', $status_parameters)) {
                 $query->orWhere(function ($query) {
                     $query->whereNotNull('payment_date');
@@ -158,6 +164,19 @@ class ExpenseFilters extends QueryFilters
         return $this->builder;
     }
 
+    public function categories(string $categories = ''): Builder
+    {
+        $categories_exploded = explode(",", $categories);
+
+        if(empty($categories) || count(array_filter($categories_exploded)) == 0) {
+            return $this->builder;
+        }
+
+        $categories_keys = $this->transformKeys($categories_exploded);
+
+        return $this->builder->whereIn('category_id', $categories_keys);
+    }
+
     public function number(string $number = ''): Builder
     {
         if (strlen($number) == 0) {
@@ -205,6 +224,11 @@ class ExpenseFilters extends QueryFilters
                     ->whereColumn('expense_categories.id', 'expenses.category_id'), $sort_col[1]);
         }
 
+        if ($sort_col[0] == 'payment_date' && in_array($sort_col[1], ['asc', 'desc'])) {
+            return $this->builder
+                    ->orderByRaw('ISNULL(payment_date), payment_date '. $sort_col[1]);
+        }
+
         if($sort_col[0] == 'number') {
             return $this->builder->orderByRaw("REGEXP_REPLACE(number,'[^0-9]+','')+0 " . $dir);
         }

app/Filters/InvoiceFilters.php

@@ -125,7 +125,14 @@ class InvoiceFilters extends QueryFilters
                                 ->orWhere('last_name', 'like', '%'.$filter.'%')
                                 ->orWhere('email', 'like', '%'.$filter.'%');
                           })
-                          ->orWhereRaw("JSON_UNQUOTE(JSON_EXTRACT(line_items, '$[*].notes')) LIKE ?", ['%'.$filter.'%']);
+                          ->orWhereRaw("
+                            JSON_UNQUOTE(JSON_EXTRACT(
+                                JSON_ARRAY(
+                                    JSON_UNQUOTE(JSON_EXTRACT(line_items, '$[*].notes')), 
+                                    JSON_UNQUOTE(JSON_EXTRACT(line_items, '$[*].product_key'))
+                                ), '$[*]')
+                            ) LIKE ?", ['%'.$filter.'%']);
+            //   ->orWhereRaw("JSON_UNQUOTE(JSON_EXTRACT(line_items, '$[*].notes')) LIKE ?", ['%'.$filter.'%']);
         });
     }
 
@@ -259,58 +266,6 @@ class InvoiceFilters extends QueryFilters
         return $this->builder->where('due_date', '>=', $date);
     }
 
-    /**
-     * Filter by date range
-     *
-     * @param string $date_range
-     * @return Builder
-     */
-    public function date_range(string $date_range = ''): Builder
-    {
-        $parts = explode(",", $date_range);
-
-        if (count($parts) != 2) {
-            return $this->builder;
-        }
-
-        try {
-
-            $start_date = Carbon::parse($parts[0]);
-            $end_date = Carbon::parse($parts[1]);
-
-            return $this->builder->whereBetween('date', [$start_date, $end_date]);
-        } catch(\Exception $e) {
-            return $this->builder;
-        }
-
-    }
-
-    /**
-     * Filter by due date range
-     *
-     * @param string $date_range
-     * @return Builder
-     */
-    public function due_date_range(string $date_range = ''): Builder
-    {
-        $parts = explode(",", $date_range);
-
-        if (count($parts) != 2) {
-            return $this->builder;
-        }
-        try {
-
-            $start_date = Carbon::parse($parts[0]);
-            $end_date = Carbon::parse($parts[1]);
-
-            return $this->builder->whereBetween('due_date', [$start_date, $end_date]);
-        } catch(\Exception $e) {
-            return $this->builder;
-        }
-
-    }
-
-
     /**
      * Sorts the list based on $sort.
      *

app/Filters/ProjectFilters.php

@@ -60,7 +60,7 @@ class ProjectFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
-        if (!is_array($sort_col) || count($sort_col) != 2) {
+        if (!is_array($sort_col) || count($sort_col) != 2 || !in_array($sort_col[0], \Illuminate\Support\Facades\Schema::getColumnListing('projects'))) {
             return $this->builder;
         }
 

app/Filters/PurchaseOrderFilters.php

@@ -96,7 +96,14 @@ class PurchaseOrderFilters extends QueryFilters
                 ->orWhere('custom_value4', 'like', '%'.$filter.'%')
                 ->orWhereHas('vendor', function ($q) use ($filter) {
                     $q->where('name', 'like', '%'.$filter.'%');
-                });
+                })
+                ->orWhereRaw("
+                JSON_UNQUOTE(JSON_EXTRACT(
+                    JSON_ARRAY(
+                        JSON_UNQUOTE(JSON_EXTRACT(line_items, '$[*].notes')), 
+                        JSON_UNQUOTE(JSON_EXTRACT(line_items, '$[*].product_key'))
+                    ), '$[*]')
+                ) LIKE ?", ['%'.$filter.'%']);
         });
     }
 

app/Filters/QueryFilters.php

@@ -331,4 +331,61 @@ abstract class QueryFilters
             ->orderByRaw("{$this->with_property} = ? DESC", [$value])
             ->company();
     }
+
+
+    /**
+     * Filter by date range
+     *
+     * @param string $date_range
+     * @return Builder
+     */
+    public function date_range(string $date_range = ''): Builder
+    {
+        $parts = explode(",", $date_range);
+
+        if (count($parts) != 2 || !in_array('date', \Illuminate\Support\Facades\Schema::getColumnListing($this->builder->getModel()->getTable()))) {
+            return $this->builder;
+        }
+
+        try {
+
+            $start_date = Carbon::parse($parts[0]);
+            $end_date = Carbon::parse($parts[1]);
+
+            return $this->builder->whereBetween('date', [$start_date, $end_date]);
+        } catch(\Exception $e) {
+            return $this->builder;
+        }
+
+    }
+
+    /**
+     * Filter by due date range
+     *
+     * @param string $date_range
+     * @return Builder
+     */
+    public function due_date_range(string $date_range = ''): Builder
+    {
+
+        $parts = explode(",", $date_range);
+
+        if (count($parts) != 2 || !in_array('due_date', \Illuminate\Support\Facades\Schema::getColumnListing($this->builder->getModel()->getTable()))) {
+            return $this->builder;
+        }
+
+        try {
+
+            $start_date = Carbon::parse($parts[0]);
+            $end_date = Carbon::parse($parts[1]);
+
+            return $this->builder->whereBetween('due_date', [$start_date, $end_date]);
+        } catch(\Exception $e) {
+            return $this->builder;
+        }
+
+    }
+
+
+
 }

app/Filters/QuoteFilters.php

@@ -46,7 +46,14 @@ class QuoteFilters extends QueryFilters
                         ->orWhere('last_name', 'like', '%'.$filter.'%')
                         ->orWhere('email', 'like', '%'.$filter.'%');
                   })
-                  ->orWhereRaw("JSON_UNQUOTE(JSON_EXTRACT(line_items, '$[*].notes')) LIKE ?", ['%'.$filter.'%']);
+                                            ->orWhereRaw("
+                            JSON_UNQUOTE(JSON_EXTRACT(
+                                JSON_ARRAY(
+                                    JSON_UNQUOTE(JSON_EXTRACT(line_items, '$[*].notes')), 
+                                    JSON_UNQUOTE(JSON_EXTRACT(line_items, '$[*].product_key'))
+                                ), '$[*]')
+                            ) LIKE ?", ['%'.$filter.'%']);
+            //   ->orWhereRaw("JSON_UNQUOTE(JSON_EXTRACT(line_items, '$[*].notes')) LIKE ?", ['%'.$filter.'%']);
         });
     }
 

app/Filters/RecurringInvoiceFilters.php

@@ -49,7 +49,14 @@ class RecurringInvoiceFilters extends QueryFilters
                         ->orWhere('last_name', 'like', '%'.$filter.'%')
                         ->orWhere('email', 'like', '%'.$filter.'%');
                   })
-                  ->orWhereRaw("JSON_UNQUOTE(JSON_EXTRACT(line_items, '$[*].notes')) LIKE ?", ['%'.$filter.'%']);
+                    ->orWhereRaw("
+                            JSON_UNQUOTE(JSON_EXTRACT(
+                                JSON_ARRAY(
+                                    JSON_UNQUOTE(JSON_EXTRACT(line_items, '$[*].notes')), 
+                                    JSON_UNQUOTE(JSON_EXTRACT(line_items, '$[*].product_key'))
+                                ), '$[*]')
+                            ) LIKE ?", ['%'.$filter.'%']);
+            //->orWhereRaw("JSON_UNQUOTE(JSON_EXTRACT(line_items, '$[*].notes')) LIKE ?", ['%'.$filter.'%']);
         });
     }
 
@@ -134,7 +141,7 @@ class RecurringInvoiceFilters extends QueryFilters
             return $this->builder->orderByRaw("REGEXP_REPLACE(number,'[^0-9]+','')+0 " . $dir);
         }
 
-        if($sort_col[0] == 'status_id'){
+        if($sort_col[0] == 'status_id') {
             return $this->builder->orderBy('status_id', $dir)->orderBy('last_sent_date', $dir);
         }
 

app/Filters/TaskFilters.php

@@ -85,6 +85,10 @@ class TaskFilters extends QueryFilters
             $this->builder->whereNull('invoice_id');
         }
 
+        if (in_array('is_running', $status_parameters)) {
+            $this->builder->where('is_running', true);
+        }
+
         return $this->builder;
     }
 

app/Helpers/Bank/Nordigen/Transformer/TransactionTransformer.php

@@ -99,11 +99,12 @@ class TransactionTransformer implements BankRevenueInterface
         } elseif (array_key_exists('internalTransactionId', $transaction)) {
             $transactionId = $transaction["internalTransactionId"];
         } else {
-            nlog(`Invalid Input for nordigen transaction transformer: ` . $transaction);
+            nlog('Invalid Input for nordigen transaction transformer: ' . $transaction);
             throw new \Exception('invalid dataset: missing transactionId - Please report this error to the developer');
         }
 
         $amount = (float) $transaction["transactionAmount"]["amount"];
+        $base_type = $amount < 0 ? 'DEBIT' : 'CREDIT';
 
         // description could be in varios places
         $description = '';
@@ -140,7 +141,7 @@ class TransactionTransformer implements BankRevenueInterface
         return [
             'transaction_id' => 0,
             'nordigen_transaction_id' => $transactionId,
-            'amount' => $amount,
+            'amount' => abs($amount),
             'currency_id' => $this->convertCurrency($transaction["transactionAmount"]["currency"]),
             'category_id' => null,
             'category_type' => array_key_exists('additionalInformation', $transaction) ? $transaction["additionalInformation"] : '',
@@ -148,7 +149,7 @@ class TransactionTransformer implements BankRevenueInterface
             'description' => $description,
             'participant' => $participant,
             'participant_name' => $participant_name,
-            'base_type' => $amount < 0 ? 'DEBIT' : 'CREDIT',
+            'base_type' => $base_type,
         ];
 
     }
@@ -165,7 +166,7 @@ class TransactionTransformer implements BankRevenueInterface
 
         /** @var \App\Models\Currency $currency */
         return $currency ? $currency->id : 1; //@phpstan-ignore-line
-        
+
     }
 
     private function formatDate(string $input)

app/Helpers/Epc/EpcQrGenerator.php

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

app/Helpers/Invoice/InvoiceItemSum.php

@@ -42,6 +42,9 @@ class InvoiceItemSum
         'DK', // Denmark
         'EE', // Estonia
         'ES', // Spain
+        'ES-CE',
+        'ES-CN',
+        'ES-ML',
         'FI', // Finland
         'FR', // France
         'GR', // Greece
@@ -72,6 +75,9 @@ class InvoiceItemSum
         'DK', // Denmark
         'EE', // Estonia
         'ES', // Spain
+        'ES-CE',
+        'ES-CN',
+        'ES-ML',
         'FI', // Finland
         'FR', // France
         'GR', // Greece
@@ -182,7 +188,7 @@ class InvoiceItemSum
 
 
             /** @var \App\DataMapper\Tax\BaseRule $class */
-            $class = "App\DataMapper\Tax\\".$this->client->company->country()->iso_3166_2."\\Rule";
+            $class = "App\DataMapper\Tax\\".str_replace("-","_",$this->client->company->country()->iso_3166_2)."\\Rule";
 
             $this->rule = new $class();
 

app/Helpers/Invoice/InvoiceSumInclusive.php

@@ -64,7 +64,7 @@ class InvoiceSumInclusive
     {
         $this->invoice = $invoice;
         $this->client = $invoice->client ?? $invoice->vendor;
-        
+
         $this->precision = $this->client->currency()->precision;
         $this->rappen_rounding = $this->client->getSetting('enable_rappen_rounding');
 

app/Helpers/Invoice/ProRata.php

@@ -23,12 +23,12 @@ class ProRata
      * the time interval and the frequency duration
      *
      * @param float $amount
-     * @param Carbon $from_date
-     * @param Carbon $to_date
+     * @param \Illuminate\Support\Carbon | \Carbon\Carbon $from_date
+     * @param \Illuminate\Support\Carbon | \Carbon\Carbon $to_date
      * @param int $frequency
      * @return float
      */
-    public function refund(float $amount, Carbon $from_date, Carbon $to_date, int $frequency): float
+    public function refund(float $amount, $from_date, $to_date, int $frequency): float
     {
         $days = intval(abs($from_date->copy()->diffInDays($to_date)));
         $days_in_frequency = $this->getDaysInFrequency($frequency);
@@ -41,12 +41,12 @@ class ProRata
      * the time interval and the frequency duration
      *
      * @param float $amount
-     * @param Carbon $from_date
-     * @param Carbon $to_date
+     * @param \Illuminate\Support\Carbon | \Carbon\Carbon  $from_date
+     * @param \Illuminate\Support\Carbon | \Carbon\Carbon  $to_date
      * @param int $frequency
      * @return float
      */
-    public function charge(float $amount, Carbon $from_date, Carbon $to_date, int $frequency): float
+    public function charge(float $amount, $from_date, $to_date, int $frequency): float
     {
         $days = intval(abs($from_date->copy()->diffInDays($to_date)));
         $days_in_frequency = $this->getDaysInFrequency($frequency);

app/Helpers/Mail/GmailTransport.php

@@ -53,7 +53,7 @@ class GmailTransport extends AbstractTransport
         if ($bccs) {
             $bcc_list = 'Bcc: ';
 
-            foreach ($bccs->getAddresses() as $address) { 
+            foreach ($bccs->getAddresses() as $address) {
 
                 $bcc_list .= $address->getAddress() .',';
             }

app/Helpers/Sanitizer.php

@@ -0,0 +1,28 @@
+<?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\Helpers;
+
+class Sanitizer
+{
+
+    public static function removeBlanks($input): array
+    {
+        foreach ($input as &$value) {
+            if (is_array($value)) {
+                // Recursively apply the filter to nested arrays
+                $value = self::removeBlanks($value);
+            }
+        }
+        // Use array_filter to remove empty or null values
+        return array_filter($input);
+    }
+}

app/Helpers/TranslationHelper.php

@@ -22,5 +22,5 @@
  */
 function ctrans(string $string, $replace = [], $locale = null): string
 {
-    return trans($string, $replace, $locale);
+    return html_entity_decode(trans($string, $replace, $locale));
 }

app/Http/Controllers/ActivityController.php

@@ -117,7 +117,7 @@ class ActivityController extends BaseController
 
     }
 
-        
+
     /**
      * downloadHistoricalEntity
      *
@@ -204,7 +204,7 @@ class ActivityController extends BaseController
         $activity->user_id = $user->id;
         $activity->ip = $request->ip();
         $activity->activity_type_id = Activity::USER_NOTE;
-        
+
         switch (get_class($entity)) {
             case Invoice::class:
                 $activity->invoice_id = $entity->id;
@@ -254,17 +254,20 @@ class ActivityController extends BaseController
                 $activity->client_id = $entity->client_id;
                 $activity->project_id = $entity->project_id;
                 $activity->vendor_id = $entity->vendor_id;
+                // no break
             case Task::class:
                 $activity->task_id = $entity->id;
                 $activity->expense_id = $entity->id;
                 $activity->client_id = $entity->client_id;
                 $activity->project_id = $entity->project_id;
                 $activity->vendor_id = $entity->vendor_id;
+                // no break
             case Payment::class:
                 $activity->payment_id = $entity->id;
                 $activity->expense_id = $entity->id;
                 $activity->client_id = $entity->client_id;
                 $activity->project_id = $entity->project_id;
+                // no break
             default:
                 # code...
                 break;

app/Http/Controllers/Auth/ContactLoginController.php

@@ -41,9 +41,10 @@ class ContactLoginController extends Controller
         $company = false;
         $account = false;
 
-        if($request->query('intended'))
+        if($request->query('intended')) {
             $request->session()->put('url.intended', $request->query('intended'));
-        
+        }
+
         if ($request->session()->has('company_key')) {
             MultiDB::findAndSetDbByCompanyKey($request->session()->get('company_key'));
             $company = Company::where('company_key', $request->session()->get('company_key'))->first();
@@ -141,9 +142,10 @@ class ContactLoginController extends Controller
         }
 
         $this->setRedirectPath();
-        
-        if($intended)
+
+        if($intended) {
             $this->redirectTo = $intended;
+        }
 
         return $request->wantsJson()
                     ? new JsonResponse([], 204)

app/Http/Controllers/Auth/LoginController.php

@@ -399,8 +399,8 @@ class LoginController extends BaseController
         $truth->setCompany($set_company);
 
         //21-03-2024
-        
-        
+
+
         $cu->each(function ($cu) {
             /** @var \App\Models\CompanyUser $cu */
             if(CompanyToken::query()->where('company_id', $cu->company_id)->where('user_id', $cu->user_id)->where('is_system', true)->doesntExist()) {

app/Http/Controllers/BankIntegrationController.php

@@ -217,7 +217,7 @@ class BankIntegrationController extends BaseController
         }
 
         if (config('ninja.nordigen.secret_id') && config('ninja.nordigen.secret_key') && (Ninja::isSelfHost() || (Ninja::isHosted() && $user_account->isEnterprisePaidClient()))) {
-            $user_account->bank_integrations->where("integration_type", BankIntegration::INTEGRATION_TYPE_NORDIGEN)->each(function ($bank_integration) {                
+            $user_account->bank_integrations->where("integration_type", BankIntegration::INTEGRATION_TYPE_NORDIGEN)->each(function ($bank_integration) {
                 /** @var \App\Models\BankIntegration $bank_integration */
                 ProcessBankTransactionsNordigen::dispatch($bank_integration);
             });

app/Http/Controllers/BaseController.php

@@ -934,7 +934,7 @@ class BaseController extends Controller
             } elseif (in_array($this->entity_type, [Design::class, GroupSetting::class, PaymentTerm::class, TaskStatus::class])) {
                 // nlog($this->entity_type);
             } else {
-                $query->where(function ($q) use ($user){ //grouping these together improves query performance significantly)
+                $query->where(function ($q) use ($user) { //grouping these together improves query performance significantly)
                     $q->where('user_id', '=', $user->id)->orWhere('assigned_user_id', $user->id);
                 });
             }
@@ -996,7 +996,7 @@ class BaseController extends Controller
 
                 if(request()->has('einvoice')) {
 
-                    if(class_exists(Schema::class)){
+                    if(class_exists(Schema::class)) {
                         $ro = new Schema();
                         $response_data['einvoice_schema'] = $ro('Peppol');
                     }

app/Http/Controllers/BrevoController.php

@@ -11,6 +11,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Jobs\Brevo\ProcessBrevoInboundWebhook;
 use App\Jobs\Brevo\ProcessBrevoWebhook;
 use Illuminate\Http\Request;
 
@@ -19,20 +20,19 @@ use Illuminate\Http\Request;
  */
 class BrevoController extends BaseController
 {
-
     public function __construct()
     {
     }
 
     /**
-     * Process Postmark Webhook.
+     * Process Brevo Webhook.
      *
      *
      * @OA\Post(
-     *      path="/api/v1/postmark_webhook",
-     *      operationId="postmarkWebhook",
-     *      tags={"postmark"},
-     *      summary="Processing webhooks from PostMark",
+     *      path="/api/v1/brevo_webhook",
+     *      operationId="brevoWebhook",
+     *      tags={"brevo"},
+     *      summary="Processing webhooks from Brevo",
      *      description="Adds an credit to the system",
      *      @OA\Parameter(ref="#/components/parameters/X-API-TOKEN"),
      *      @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
@@ -60,12 +60,150 @@ class BrevoController extends BaseController
      */
     public function webhook(Request $request)
     {
-        if ($request->has('token') && $request->get('token') == config('services.brevo.key')) {
-            ProcessBrevoWebhook::dispatch($request->all())->delay(10);
+        if ($request->has('token') && $request->get('token') == config('services.brevo.secret')) {
+            ProcessBrevoWebhook::dispatch($request->all())->delay(rand(2, 10));
 
             return response()->json(['message' => 'Success'], 200);
         }
 
         return response()->json(['message' => 'Unauthorized'], 403);
     }
+
+
+    /**
+     * Process Brevo Inbound Webhook.
+     *
+     * IMPORTANT NOTICE: brevo strips old sended emails, therefore only current attachements are present
+     *
+     * IMPORTANT NOTICE: brevo saves the message and attachemnts for later retrieval, therefore we can process it within a async job for performance reasons
+     *
+     * @OA\Post(
+     *      path="/api/v1/brevo_inbound_webhook",
+     *      operationId="brevoInboundWebhook",
+     *      tags={"brevo"},
+     *      summary="Processing inbound webhooks from Brevo",
+     *      description="Adds an credit to the system",
+     *      @OA\Parameter(ref="#/components/parameters/X-API-TOKEN"),
+     *      @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
+     *      @OA\Parameter(ref="#/components/parameters/include"),
+     *      @OA\Response(
+     *          response=200,
+     *          description="Returns the saved credit object",
+     *          @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
+     *          @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
+     *          @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
+     *          @OA\JsonContent(ref="#/components/schemas/Credit"),
+     *       ),
+     *       @OA\Response(
+     *          response=422,
+     *          description="Validation error",
+     *          @OA\JsonContent(ref="#/components/schemas/ValidationError"),
+     *
+     *       ),
+     *       @OA\Response(
+     *           response="default",
+     *           description="Unexpected Error",
+     *           @OA\JsonContent(ref="#/components/schemas/Error"),
+     *       ),
+     *     )
+     *
+     * array (
+     *     'items' =>
+     *     array (
+     *         0 =>
+     *         array (
+     *         'Uuid' =>
+     *         array (
+     *             0 => 'd9f48d52-a344-42a4-9056-9733488d9fa3',
+     *         ),
+     *         'Recipients' =>
+     *         array (
+     *             0 => 'test@test.de',
+     *         ),
+     *         'MessageId' => '<CADfEuNvumhUdqAUa0j6MxzVp0ooMYqdb_KZ7nZqHNAfdDqwWEQ@mail.gmail.com>',
+     *         'InReplyTo' => NULL,
+     *         'From' =>
+     *         array (
+     *             'Name' => 'Max Mustermann',
+     *             'Address' => 'max@mustermann.de',
+     *         ),
+     *         'To' =>
+     *         array (
+     *             0 =>
+     *             array (
+     *             'Name' => NULL,
+     *             'Address' => 'test@test.de',
+     *             ),
+     *         ),
+     *         'Cc' =>
+     *         array (
+     *         ),
+     *         'Bcc' =>
+     *         array (
+     *         ),
+     *         'ReplyTo' => NULL,
+     *         'SentAtDate' => 'Sat, 23 Mar 2024 18:18:20 +0100',
+     *         'Subject' => 'TEST',
+     *         'Attachments' =>
+     *         array (
+     *             0 =>
+     *             array (
+     *             'Name' => 'flag--sv-1x1.svg',
+     *             'ContentType' => 'image/svg+xml',
+     *             'ContentLength' => 79957,
+     *             'ContentID' => 'f_lu4ct6s20',
+     *             'DownloadToken' => 'eyJmb2xkZXIiOiIyMDI0MDMyMzE3MTgzNi45OS43OTgwMDM4MDQiLCJmaWxlbmFtZSI6ImZsYWctLXN2LTF4MS5zdmcifQ',
+     *             ),
+     *         ),
+     *         'Headers' =>
+     *         array (
+     *             'Received' => 'by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-56b0af675deso3877288a12.1 for <test@test.de>; Sat, 23 Mar 2024 10:18:36 -0700 (PDT)',
+     *             'DKIM-Signature' => 'v=1; a=rsa-sha256; c=relaxed/relaxed; d=mustermann.de; s=google; t=1711214316; x=1711819116; darn=test.de; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=eBSl5M0zvmTd+dFXGXMMSWrQ4nCvUdyVx+1Xpl+YuX8=; b=ackw3d+qTvZk4JKxomvH626MvfwmH23mikOUc2hWwYiO6unmQgPs2w5spnkmD9aCZ9 G+3nPSYKntugOmqWstZH3z4B063U4Y6j5hTc19WtCyyb9UR+XD+C6L10yc6ez8QUhlZT uAGqDoJ+E8+dBxiMul2pow19lC88t3QxRXU+i8zScniV7SFkwzziCEODaB61yI0DXsZB bUkx5Gx6cztKaNVF2QgguF2nQnJFUnD2nabVFsihyJ5r6y61rkSM/YTfMJuES772lnhv IeF+vwiFNEPKafrchce6YJcvo5Vd5lYFK4LtHyCy3mwJpX2QY+WnWAfferZ2YfgEL0Sf K3Pw==',
+     *             'X-Google-DKIM-Signature' => 'v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711214316; x=1711819116; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=eBSl5M0zvmTd+dFXGXMMSWrQ4nCvUdyVx+1Xpl+YuX8=; b=fg4tXZnstRBexYlC6MD7C7is0kQj+xY66cSJ78tSa7PtSFQzY0zajDMsepMCGiiWmN /Pc/tRtk53pru/OtfzRT9pbM6mhM1arIt+QaQBQGU5xZVV5JXfPmdnPzXqAbQztyeHrk UcEkz+qDN3JNoidw2dJhhdt5MxdKssR572NwtBrn/rN7f1o/ThWzEz+P0o06GVBpxVYP wM0EkvcJj2SUOcn36kmp1ccbMUwYCU2h1JmniEFY8RTqu2il13iXoBvG4YPxe0c0hJ6z zw1N5rONeQM113N1rpbQzS1QLSngczuOhN24M3TOwrHJIec/BxrOW6KWl/uPUqiZAf65 f0tg==',
+     *             'X-Gm-Message-State' => 'AOJu0YzKhR1HY1oUXoq++LLpl6UOz1S60NfPxuPXBLcP+6aACYle8rqQ fYHe2rQYTpg4KWiOswu858STOW8qmiewXD6gH/LbmEFs7sknRyDPNr/+L0cv828A3o+SOvXu3uP SY6H1aNSwIpqTRhJ+nNjTuSUpuSoABd9fYXFwPuivV0DtBhoVmpE=',
+     *             'X-Google-Smtp-Source' => 'AGHT+IHdA9ZhW0dQxgOYx2OXBGmu4pzSR/zwJ0vcPNXFSqttKCPS2oTw1a9b2mMdhyUeoRAwP5TmhHlAtqUUrOPwkgg=',
+     *             'X-Received' => 'by 2002:a50:d74c:0:b0:567:3c07:8bbc with SMTP id i12-20020a50d74c000000b005673c078bbcmr2126401edj.21.1711214316135; Sat, 23 Mar 2024 10:18:36 -0700 (PDT)',
+     *             'MIME-Version' => '1.0',
+     *             'From' => 'Max Mustermann <max@mustermann.de>',
+     *             'Date' => 'Sat, 23 Mar 2024 18:18:20 +0100',
+     *             'Message-ID' => '<CADfEuNvumhUdqAUa0j6MxzVp0ooMYqdb_KZ7nZqHNAfdDqwWEQ@mail.gmail.com>',
+     *             'Subject' => 'TEST',
+     *             'To' => 'test@test.de',
+     *             'Content-Type' => 'multipart/mixed',
+     *         ),
+     *         'SpamScore' => 2.8,
+     *         'ExtractedMarkdownMessage' => 'TEST',
+     *         'ExtractedMarkdownSignature' => NULL,
+     *         'RawHtmlBody' => '<div dir="ltr">TEST</div>',
+     *         'RawTextBody' => 'TEST',
+     *         'EMLDownloadToken' => 'eyJmb2xkZXIiOiIyMDI0MDMyMzE3MTgzNi45OS43OTgwMDM4MDQiLCJmaWxlbmFtZSI6InNtdHAuZW1sIn0',
+     *         ),
+     *     ),
+     *   )
+     */
+    public function inboundWebhook(Request $request)
+    {
+        $input = $request->all();
+
+        if (!($request->has('token') && $request->get('token') == config('ninja.inbound_mailbox.inbound_webhook_token')))
+            return response()->json(['message' => 'Unauthorized'], 403);
+
+        if (!array_key_exists('items', $input)) {
+            nlog('Failed: Message could not be parsed, because required parameters are missing.');
+            return response()->json(['message' => 'Failed. Invalid Parameters.'], 400);
+        }
+
+        foreach ($input["items"] as $item) {
+
+            if (!array_key_exists('Recipients', $item) || !array_key_exists('MessageId', $item)) {
+                nlog('Failed: Message could not be parsed, because required parameters are missing. At least one item was invalid.');
+                return response()->json(['message' => 'Failed. Invalid Parameters. At least one item was invalid.'], 400);
+            }
+
+            ProcessBrevoInboundWebhook::dispatch($item)->delay(rand(2, 10));
+
+        }
+
+        return response()->json(['message' => 'Success'], 201);
+    }
 }

app/Http/Controllers/ChartController.php

@@ -73,7 +73,7 @@ class ChartController extends BaseController
         $user = auth()->user();
         $cs = new ChartService($user->company(), $user, $user->isAdmin());
         $result = $cs->getCalculatedField($request->all());
-        
+
         return response()->json($result, 200);
 
     }

app/Http/Controllers/ClientPortal/InvitationController.php

@@ -114,9 +114,10 @@ class InvitationController extends Controller
                             'invitation_key' => $invitation_key
                         ]);
             }
-            
-            if(!auth()->guard('contact')->check()){
+
+            if(!auth()->guard('contact')->check()) {
                 $this->middleware('auth:contact');
+                /** @var \App\Models\InvoiceInvitation | \App\Models\QuoteInvitation | \App\Models\CreditInvitation | \App\Models\RecurringInvoiceInvitation $invitation */
                 return redirect()->route('client.login', ['intended' => route('client.'.$entity.'.show', [$entity => $this->encodePrimaryKey($invitation->{$key}), 'silent' => $is_silent])]);
             }
 
@@ -146,7 +147,7 @@ class InvitationController extends Controller
 
     }
 
-    
+
     private function fireEntityViewedEvent($invitation, $entity_string)
     {
         switch ($entity_string) {

app/Http/Controllers/ClientPortal/InvoiceController.php

@@ -62,6 +62,7 @@ class InvoiceController extends Controller
 
         $invitation = $invoice->invitations()->where('client_contact_id', auth()->guard('contact')->user()->id)->first();
 
+        // @phpstan-ignore-next-line
         if ($invitation && auth()->guard('contact') && ! session()->get('is_silent') && ! $invitation->viewed_date) {
             $invitation->markViewed();
 
@@ -77,13 +78,20 @@ class InvoiceController extends Controller
             'key' => $invitation ? $invitation->key : false,
             'hash' => $hash,
             'variables' => $variables,
+            'invoices' => [$invoice->hashed_id],
+            'db' => $invoice->company->db,
         ];
 
         if ($request->query('mode') === 'fullscreen') {
             return render('invoices.show-fullscreen', $data);
         }
 
-        return $this->render('invoices.show', $data);
+        if(!$invoice->isPayable())
+            return $this->render('invoices.show',$data);
+
+        return auth()->guard('contact')->user()->client->getSetting('payment_flow') == 'default' ? $this->render('invoices.show', $data) : $this->render('invoices.show_smooth', $data);
+
+        // return $this->render('invoices.show_smooth', $data);
     }
 
     public function showBlob($hash)
@@ -235,9 +243,12 @@ class InvoiceController extends Controller
             'hashed_ids' => $invoices->pluck('hashed_id'),
             'total' =>  $total,
             'variables' => $variables,
+            'invitation' => $invitation,
+            'db' => $invitation->company->db,
         ];
 
-        return $this->render('invoices.payment', $data);
+        // return $this->render('invoices.payment', $data);
+        return auth()->guard('contact')->user()->client->getSetting('payment_flow') === 'default' ? $this->render('invoices.payment', $data) : $this->render('invoices.show_smooth_multi', $data);
     }
 
     /**

app/Http/Controllers/ClientPortal/NinjaPlanController.php

@@ -88,6 +88,8 @@ class NinjaPlanController extends Controller
     {
         $trial_started = "Trial Started @ ".now()->format('Y-m-d H:i:s');
 
+        auth()->guard('contact')->user()->fill($request->only(['first_name','last_name']))->save();
+
         $client = auth()->guard('contact')->user()->client;
         $client->private_notes = $trial_started;
         $client->fill($request->all());

app/Http/Controllers/ClientPortal/PaymentController.php

@@ -108,12 +108,6 @@ class PaymentController extends Controller
      */
     public function process(Request $request)
     {
-        // $request->validate([
-        //     'contact_first_name' => ['required'],
-        //     'contact_last_name' => ['required'],
-        //     'contact_email' => ['required', 'email'],
-        // ]);
-
         return (new InstantPayment($request))->run();
     }
 
@@ -123,13 +117,7 @@ class PaymentController extends Controller
         $gateway = CompanyGateway::findOrFail($request->input('company_gateway_id'));
         $payment_hash = PaymentHash::with('fee_invoice')->where('hash', $request->payment_hash)->firstOrFail();
 
-        // if($payment_hash)
         $invoice = $payment_hash->fee_invoice;
-        // else
-            // $invoice = Invoice::with('client')->where('id',$payment_hash->fee_invoice_id)->orderBy('id','desc')->first();
-
-        // $invoice = Invoice::with('client')->find($payment_hash->fee_invoice_id);
-
 
         $client = $invoice ? $invoice->client : auth()->guard('contact')->user()->client;
 

app/Http/Controllers/ClientPortal/PaymentMethodController.php

@@ -56,8 +56,8 @@ class PaymentMethodController extends Controller
 
         $data['gateway'] = $gateway;
 
-        /** @var \App\Models\ClientContact auth()->user() **/
-        $client_contact = auth()->user();
+        /** @var \App\Models\ClientContact auth()->guard('contact')->user() **/
+        $client_contact = auth()->guard('contact')->user();
         $data['client'] = $client_contact->client;
 
         return $gateway
@@ -77,8 +77,8 @@ class PaymentMethodController extends Controller
     {
         $gateway = $this->getClientGateway();
 
-        /** @var \App\Models\ClientContact auth()->user() **/
-        $client_contact = auth()->user();
+        /** @var \App\Models\ClientContact auth()->guard('contact')->user() **/
+        $client_contact = auth()->guard('contact')->user();
 
         return $gateway
             ->driver($client_contact->client)
@@ -103,8 +103,8 @@ class PaymentMethodController extends Controller
     public function verify(ClientGatewayToken $payment_method)
     {
 
-        /** @var \App\Models\ClientContact auth()->user() **/
-        $client_contact = auth()->user();
+        /** @var \App\Models\ClientContact auth()->guard('contact')->user() **/
+        $client_contact = auth()->guard('contact')->user();
 
         return $payment_method->gateway
             ->driver($client_contact->client)
@@ -114,8 +114,8 @@ class PaymentMethodController extends Controller
 
     public function processVerification(Request $request, ClientGatewaytoken $payment_method)
     {
-        /** @var \App\Models\ClientContact auth()->user() **/
-        $client_contact = auth()->user();
+        /** @var \App\Models\ClientContact auth()->guard('contact')->user() **/
+        $client_contact = auth()->guard('contact')->user();
 
         return $payment_method->gateway
             ->driver($client_contact->client)
@@ -131,8 +131,8 @@ class PaymentMethodController extends Controller
      */
     public function destroy(ClientGatewayToken $payment_method)
     {
-        /** @var \App\Models\ClientContact auth()->user() **/
-        $client_contact = auth()->user();
+        /** @var \App\Models\ClientContact auth()->guard('contact')->user() **/
+        $client_contact = auth()->guard('contact')->user();
 
         if ($payment_method->gateway()->exists()) {
             $payment_method->gateway
@@ -145,9 +145,19 @@ class PaymentMethodController extends Controller
             event(new MethodDeleted($payment_method, auth()->guard('contact')->user()->company, Ninja::eventVars(auth()->guard('contact')->user()->id)));
 
             $payment_method->is_deleted = true;
+            $payment_method->is_default = false;
             $payment_method->delete();
             $payment_method->save();
 
+
+            $def_cgt = auth()->guard('contact')->user()->client->gateway_tokens()->orderBy('id','desc')->first();
+            
+            if($def_cgt)
+            {
+                $def_cgt->is_default = true;
+                $def_cgt->save();
+            }
+
         } catch (Exception $e) {
             nlog($e->getMessage());
 
@@ -161,8 +171,8 @@ class PaymentMethodController extends Controller
 
     private function getClientGateway()
     {
-        /** @var \App\Models\ClientContact auth()->user() **/
-        $client_contact = auth()->user();
+        /** @var \App\Models\ClientContact auth()->guard('contact')->user() **/
+        $client_contact = auth()->guard('contact')->user();
 
         if (request()->query('method') == GatewayType::CREDIT_CARD) {
             return $client_contact->client->getCreditCardGateway();

app/Http/Controllers/ClientPortal/PrePaymentController.php

@@ -35,11 +35,16 @@ class PrePaymentController extends Controller
     /**
      * Show the list of payments.
      *
-     * @return Factory|View
+     * @return Factory|View|\Illuminate\Http\RedirectResponse
      */
     public function index()
     {
+
         $client = auth()->guard('contact')->user()->client;
+        
+        if(!$client->getSetting('client_initiated_payments'))
+            return redirect()->route('client.dashboard');
+
         $minimum = $client->getSetting('client_initiated_payments_minimum');
         $minimum_amount = $minimum == 0 ? "" : Number::formatMoney($minimum, $client);
 

app/Http/Controllers/ClientPortal/SubscriptionPurchaseController.php

@@ -94,7 +94,7 @@ class SubscriptionPurchaseController extends Controller
      */
     private function setLocale(string $locale): string
     {
-        
+
         /** @var \Illuminate\Support\Collection<\App\Models\Language> */
         $languages = app('languages');
 
@@ -104,6 +104,6 @@ class SubscriptionPurchaseController extends Controller
         });
 
         return $record ? $record->locale : 'en';
-        
+
     }
 }

app/Http/Controllers/CompanyController.php

@@ -707,7 +707,7 @@ class CompanyController extends BaseController
     }
 
     /**
-     * 
+     *
      *
      * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse
      */

app/Http/Controllers/CreditController.php

@@ -615,7 +615,7 @@ class CreditController extends BaseController
                 return response()->streamDownload(function () use ($file) {
                     echo $file;
                 }, $credit->numberFormatter() . '.pdf', ['Content-Type' => 'application/pdf']);
-                
+
             case 'archive':
                 $this->credit_repository->archive($credit);
 

app/Http/Controllers/DocumentController.php

@@ -150,6 +150,10 @@ class DocumentController extends BaseController
         $document->fill($request->all());
         $document->save();
 
+        if($document->documentable) { //@phpstan-ignore-line
+            $document->documentable->touch();
+        }
+
         return $this->itemResponse($document->fresh());
     }
 

app/Http/Controllers/EInvoice/SelfhostController.php

@@ -0,0 +1,26 @@
+<?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\Http\Controllers\EInvoice;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\EInvoice\SignupRequest;
+
+class SelfhostController extends Controller
+{
+
+    public function index(SignupRequest $request)
+    {
+        return view('einvoice.index');
+    }
+
+}

app/Http/Controllers/EInvoiceController.php

@@ -0,0 +1,39 @@
+<?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\Http\Controllers;
+
+use App\Http\Requests\EInvoice\ValidateEInvoiceRequest;
+use App\Services\EDocument\Standards\Validation\Peppol\EntityLevel;
+
+class EInvoiceController extends BaseController
+{
+
+    public function validateEntity(ValidateEInvoiceRequest $request)
+    {
+        $el = new EntityLevel();
+
+        $data = [];
+
+        match($request->entity){
+            'invoices' => $data = $el->checkInvoice($request->getEntity()),
+            'clients' => $data = $el->checkClient($request->getEntity()),
+            'companies' => $data = $el->checkCompany($request->getEntity()),
+            default => $data['passes'] = false,
+        };
+        
+        nlog($data);
+
+        return response()->json($data, $data['passes'] ? 200 : 400);
+
+    }
+
+}

app/Http/Controllers/EmailHistoryController.php

@@ -51,9 +51,9 @@ class EmailHistoryController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-
         $data = SystemLog::where('company_id', $user->company()->id)
         ->where('category_id', SystemLog::CATEGORY_MAIL)
+        ->whereJsonContains('log->history->entity', $request->entity)
         ->whereJsonContains('log->history->entity_id', $this->encodePrimaryKey($request->entity_id))
         ->orderBy('id', 'DESC')
         ->cursor()

app/Http/Controllers/ExpenseController.php

@@ -497,7 +497,7 @@ class ExpenseController extends BaseController
 
         $expenses = Expense::withTrashed()->find($request->ids);
 
-        if($request->action == 'bulk_categorize' && $user->can('edit', $expenses->first())) {
+        if ($request->action == 'bulk_categorize' && $user->can('edit', $expenses->first())) {
             $this->expense_repo->categorize($expenses, $request->category_id);
             $expenses = collect([]);
         }
@@ -573,7 +573,7 @@ class ExpenseController extends BaseController
      */
     public function upload(UploadExpenseRequest $request, Expense $expense)
     {
-        if (! $this->checkFeature(Account::FEATURE_DOCUMENTS)) {
+        if (!$this->checkFeature(Account::FEATURE_DOCUMENTS)) {
             return $this->featureFailure();
         }
 
@@ -584,14 +584,60 @@ class ExpenseController extends BaseController
         return $this->itemResponse($expense->fresh());
     }
 
-    public function edocument(EDocumentRequest $request): string
+    /**
+     * @OA\Post(
+     *      path="/api/v1/expenses/edocument",
+     *      operationId="edocumentExpense",
+     *      tags={"expenses"},
+     *      summary="Uploads an electronic document to a expense",
+     *      description="Handles the uploading of an electronic document to a expense",
+     *      @OA\Parameter(ref="#/components/parameters/X-API-TOKEN"),
+     *      @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
+     *      @OA\Parameter(ref="#/components/parameters/include"),
+     *      @OA\RequestBody(
+     *         description="User credentials",
+     *         required=true,
+     *         @OA\MediaType(
+     *             mediaType="multipart/form-data",
+     *             @OA\Schema(
+     *                 type="array",
+     *                 @OA\Items(
+     *                     type="string",
+     *                     format="binary",
+     *                     description="The files to be uploaded",
+     *                 ),
+     *             )
+     *         )
+     *     ),
+     *      @OA\Response(
+     *          response=200,
+     *          description="Returns a HTTP status",
+     *          @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
+     *          @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
+     *          @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
+     *       ),
+     *       @OA\Response(
+     *          response=422,
+     *          description="Validation error",
+     *          @OA\JsonContent(ref="#/components/schemas/ValidationError"),
+     *
+     *       ),
+     *       @OA\Response(
+     *           response="default",
+     *           response="default",
+     *           description="Unexpected Error",
+     *           @OA\JsonContent(ref="#/components/schemas/Error"),
+     *       ),
+     *     )
+     */
+    public function edocument(EDocumentRequest $request)
     {
-        if ($request->hasFile("documents")) {
-            return (new ImportEDocument($request->file("documents")[0]->get(), $request->file("documents")[0]->getClientOriginalName()))->handle();
-        }
-        else {
-            return "No file found";
+        $user = auth()->user();
+
+        foreach ($request->file("documents") as $file) {
+            ImportEDocument::dispatch($file->get(), $file->getClientOriginalName(), $request->file("documents")->getMimeType(), $user->company());
         }
 
+        return response()->json(['message' => 'Processing....'], 200);
     }
 }

app/Http/Controllers/ExportController.php

@@ -59,9 +59,9 @@ class ExportController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        $hash = Str::uuid();
+        $hash = Str::uuid()->toString();
         $url = \Illuminate\Support\Facades\URL::temporarySignedRoute('protected_download', now()->addHour(), ['hash' => $hash]);
-        Cache::put($hash, $url, now()->addHour());
+        Cache::put($hash, $url, 3600);
 
         CompanyExport::dispatch($user->getCompany(), $user, $hash);
 

app/Http/Controllers/Gateways/GoCardlessController.php

@@ -20,6 +20,7 @@ class GoCardlessController extends Controller
 {
     public function ibpRedirect(IbpRequest $request)
     {
+
         return $request
             ->getCompanyGateway()
             ->driver($request->getClient())

app/Http/Controllers/ImportController.php

@@ -118,9 +118,36 @@ class ImportController extends Controller
 
         })->toArray();
 
-
+        //Exact string match
         foreach($headers as $key => $value) {
 
+            foreach($translated_keys as $tkey => $tvalue) {
+
+                $concat_needle = str_ireplace(" ", "", $tvalue['index'].$tvalue['label']);
+                $concat_value = str_ireplace(" ", "", $value);
+
+                if($this->testMatch($concat_value, $concat_needle)) {
+
+                $hit = $tvalue['key'];
+                $hints[$key] = $hit;
+                unset($translated_keys[$tkey]);
+                break;
+
+                } else {
+                    $hints[$key] = null;
+                }
+
+            }
+
+        }
+
+        //Label Match
+        foreach($headers as $key => $value) {
+
+            if(isset($hints[$key])) {
+                continue;
+            }
+
             foreach($translated_keys as $tkey => $tvalue) {
 
                 if($this->testMatch($value, $tvalue['label'])) {
@@ -134,10 +161,9 @@ class ImportController extends Controller
 
             }
 
-
         }
 
-        //second pass using the index of the translation here
+        //Index matching pass using the index of the translation here
         foreach($headers as $key => $value) {
             if(isset($hints[$key])) {
                 continue;

app/Http/Controllers/ImportQuickbooksController.php

@@ -0,0 +1,63 @@
+<?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\Http\Controllers;
+
+use App\Http\Requests\Quickbooks\AuthorizedQuickbooksRequest;
+use App\Libraries\MultiDB;
+use Illuminate\Support\Facades\Cache;
+use App\Http\Requests\Quickbooks\AuthQuickbooksRequest;
+use App\Services\Quickbooks\QuickbooksService;
+
+class ImportQuickbooksController extends BaseController
+{
+    // private array $import_entities = [
+    //     'client' => 'Customer',
+    //     'invoice' => 'Invoice',
+    //     'product' => 'Item',
+    //     'payment' => 'Payment'
+    // ];
+
+    public function onAuthorized(AuthorizedQuickbooksRequest $request)
+    {
+
+        MultiDB::findAndSetDbByCompanyKey($request->getTokenContent()['company_key']);
+        $company = $request->getCompany();
+        $qb = new QuickbooksService($company);
+
+        $realm = $request->query('realmId');
+        $access_token_object = $qb->sdk()->accessTokenFromCode($request->query('code'), $realm);
+        $qb->sdk()->saveOAuthToken($access_token_object);
+
+        return redirect(config('ninja.react_url'));
+
+    }
+
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     */
+    public function authorizeQuickbooks(AuthQuickbooksRequest $request, string $token)
+    {
+
+        MultiDB::findAndSetDbByCompanyKey($request->getTokenContent()['company_key']);
+        $company = $request->getCompany();
+        $qb = new QuickbooksService($company);
+
+        $authorizationUrl = $qb->sdk()->getAuthorizationUrl();
+        $state = $qb->sdk()->getState();
+
+        Cache::put($state, $token, 190);
+
+        return redirect()->to($authorizationUrl);
+    }
+
+}

app/Http/Controllers/InvoiceController.php

@@ -475,7 +475,10 @@ class InvoiceController extends BaseController
      */
     public function destroy(DestroyInvoiceRequest $request, Invoice $invoice)
     {
-        $this->invoice_repo->delete($invoice);
+
+        if (!$invoice->is_deleted) {
+            $this->invoice_repo->delete($invoice);
+        }
 
         return $this->itemResponse($invoice->fresh());
     }
@@ -503,7 +506,7 @@ class InvoiceController extends BaseController
 
         $invoices = Invoice::withTrashed()->whereIn('id', $this->transformKeys($ids))->company()->get();
 
-        if ($invoices->count() == 0 ) {
+        if ($invoices->count() == 0) {
             return response()->json(['message' => 'No Invoices Found']);
         }
 

app/Http/Controllers/MailgunController.php

@@ -0,0 +1,147 @@
+<?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\Http\Controllers;
+
+use App\Models\Company;
+use App\Libraries\MultiDB;
+use Illuminate\Http\Request;
+use App\Jobs\Mailgun\ProcessMailgunWebhook;
+use App\Jobs\Mailgun\ProcessMailgunInboundWebhook;
+
+/**
+ * Class MailgunController.
+ */
+class MailgunController extends BaseController
+{
+    public function __construct()
+    {
+    }
+
+    /**
+     * Process Mailgun Webhook.
+     *
+     *
+     * @OA\Post(
+     *      path="/api/v1/mailgun_webhook",
+     *      operationId="mailgunWebhook",
+     *      tags={"mailgun"},
+     *      summary="Processing webhooks from Mailgun",
+     *      description="Adds an credit to the system",
+     *      @OA\Parameter(ref="#/components/parameters/X-API-TOKEN"),
+     *      @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
+     *      @OA\Parameter(ref="#/components/parameters/include"),
+     *      @OA\Response(
+     *          response=200,
+     *          description="Returns the saved credit object",
+     *          @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
+     *          @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
+     *          @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
+     *          @OA\JsonContent(ref="#/components/schemas/Credit"),
+     *       ),
+     *       @OA\Response(
+     *          response=422,
+     *          description="Validation error",
+     *          @OA\JsonContent(ref="#/components/schemas/ValidationError"),
+     *
+     *       ),
+     *       @OA\Response(
+     *           response="default",
+     *           description="Unexpected Error",
+     *           @OA\JsonContent(ref="#/components/schemas/Error"),
+     *       ),
+     *     )
+     */
+    public function webhook(Request $request)
+    {
+
+        $input = $request->all();
+        
+        nlog($input);
+
+        if (\abs(\time() - $request['signature']['timestamp']) > 15) {
+            return response()->json(['message' => 'Success'], 200);
+        }
+
+        if (\hash_equals(\hash_hmac('sha256', $input['signature']['timestamp'] . $input['signature']['token'], config('services.mailgun.webhook_signing_key')), $input['signature']['signature'])) {
+            ProcessMailgunWebhook::dispatch($request->all())->delay(rand(2, 10));
+        }
+
+        return response()->json(['message' => 'Success.'], 200);
+    }
+
+    /**
+     * Process Mailgun Inbound Webhook.
+     *
+     * IMPORTANT NOTICE: mailgun does NOT strip old sended emails, therefore all past attachements are present
+     *
+     * IMPORTANT NOTICE: mailgun saves the message and attachemnts for later retrieval, therefore we can process it within a async job for performance reasons
+     *
+     *
+     * @OA\Post(
+     *      path="/api/v1/mailgun_inbound_webhook",
+     *      operationId="mailgunInboundWebhook",
+     *      tags={"mailgun"},
+     *      summary="Processing inbound webhooks from Mailgun",
+     *      description="Adds an credit to the system",
+     *      @OA\Parameter(ref="#/components/parameters/X-API-TOKEN"),
+     *      @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
+     *      @OA\Parameter(ref="#/components/parameters/include"),
+     *      @OA\Response(
+     *          response=200,
+     *          description="Returns the saved credit object",
+     *          @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
+     *          @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
+     *          @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
+     *          @OA\JsonContent(ref="#/components/schemas/Credit"),
+     *       ),
+     *       @OA\Response(
+     *          response=422,
+     *          description="Validation error",
+     *          @OA\JsonContent(ref="#/components/schemas/ValidationError"),
+     *
+     *       ),
+     *       @OA\Response(
+     *           response="default",
+     *           description="Unexpected Error",
+     *           @OA\JsonContent(ref="#/components/schemas/Error"),
+     *       ),
+     *     )
+     */
+    public function inboundWebhook(Request $request)
+    {
+        $input = $request->all();
+
+        nlog($input);
+
+        if (!array_key_exists('sender', $input) || !array_key_exists('recipient', $input) || !array_key_exists('message-url', $input)) {
+            nlog('Failed: Message could not be parsed, because required parameters are missing. Please ensure contacting this api-endpoint with a store & notify operation instead of a forward operation!');
+            return response()->json(['message' => 'Failed. Missing Parameters. Use store and notify!'], 400);
+        }
+
+        // @turbo124 TODO: how to check for services.mailgun.webhook_signing_key on company level, when custom credentials are defined
+        // TODO: validation for client mail credentials by recipient
+        $authorizedByHash = \hash_equals(\hash_hmac('sha256', $input['timestamp'] . $input['token'], config('services.mailgun.webhook_signing_key')), $input['signature']);
+        $authorizedByToken = $request->has('token') && $request->get('token') == config('ninja.inbound_mailbox.inbound_webhook_token');
+        if (!$authorizedByHash && !$authorizedByToken)
+            return response()->json(['message' => 'Unauthorized'], 403); 
+
+        /** @var \App\Models\Company $company */
+        $company = MultiDB::findAndSetDbByExpenseMailbox($input["recipient"]);
+
+        if(!$company)
+            return response()->json(['message' => 'Ok'], 200);  // Fail gracefully
+
+        ProcessMailgunInboundWebhook::dispatch($input["sender"], $input["recipient"], $input["message-url"], $company)->delay(rand(2, 10));
+
+        return response()->json(['message' => 'Success.'], 200);
+    }
+}

app/Http/Controllers/MailgunWebhookController.php

@@ -1,43 +0,0 @@
-<?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\Http\Controllers;
-
-use App\Jobs\Mailgun\ProcessMailgunWebhook;
-use App\Jobs\PostMark\ProcessPostmarkWebhook;
-use Illuminate\Http\Request;
-
-/**
- * Class MailgunWebhookController.
- */
-class MailgunWebhookController extends BaseController
-{
-
-    public function __construct()
-    {
-    }
-
-    public function webhook(Request $request)
-    {
-
-        $input = $request->all();
-
-        if (\abs(\time() - $request['signature']['timestamp']) > 15) {
-            return response()->json(['message' => 'Success'], 200);
-        }
-
-        if(\hash_equals(\hash_hmac('sha256', $input['signature']['timestamp'] . $input['signature']['token'], config('services.mailgun.webhook_signing_key')), $input['signature']['signature'])) {
-            ProcessMailgunWebhook::dispatch($request->all())->delay(rand(2,10));
-        }
-
-        return response()->json(['message' => 'Success.'], 200);
-    }
-}

app/Http/Controllers/OneTimeTokenController.php

@@ -22,7 +22,6 @@ use Illuminate\Support\Str;
 
 class OneTimeTokenController extends BaseController
 {
-
     public function __construct()
     {
         parent::__construct();
@@ -74,6 +73,10 @@ class OneTimeTokenController extends BaseController
             'is_react' => $request->hasHeader('X-REACT') ? true : false,
         ];
 
+        if($request->institution_id) {
+            $data['institution_id'] = $request->institution_id;
+        }
+
         Cache::put($hash, $data, 3600);
 
         return response()->json(['hash' => $hash], 200);

app/Http/Controllers/PaymentNotificationWebhookController.php

@@ -25,7 +25,7 @@ class PaymentNotificationWebhookController extends Controller
     {
         /** @var \App\Models\CompanyGateway $company_gateway */
         $company_gateway = CompanyGateway::find($this->decodePrimaryKey($company_gateway_id));
-        
+
         /** @var \App\Models\Client $client */
         $client = Client::find($this->decodePrimaryKey($client_hash));
 

app/Http/Controllers/PostMarkController.php

@@ -12,6 +12,11 @@
 namespace App\Http\Controllers;
 
 use App\Jobs\PostMark\ProcessPostmarkWebhook;
+use App\Libraries\MultiDB;
+use App\Services\InboundMail\InboundMail;
+use App\Services\InboundMail\InboundMailEngine;
+use App\Utils\TempFile;
+use Illuminate\Support\Carbon;
 use Illuminate\Http\Request;
 
 /**
@@ -19,7 +24,6 @@ use Illuminate\Http\Request;
  */
 class PostMarkController extends BaseController
 {
-
     public function __construct()
     {
     }
@@ -61,11 +65,271 @@ class PostMarkController extends BaseController
     public function webhook(Request $request)
     {
         if ($request->header('X-API-SECURITY') && $request->header('X-API-SECURITY') == config('services.postmark.token')) {
-            ProcessPostmarkWebhook::dispatch($request->all())->delay(10);
+            ProcessPostmarkWebhook::dispatch($request->all())->delay(rand(2, 10));
 
             return response()->json(['message' => 'Success'], 200);
         }
 
         return response()->json(['message' => 'Unauthorized'], 403);
     }
+
+    /**
+     * Process Postmark Webhook.
+     *
+     * IMPORTANT NOTICE: postmark does NOT strip old sended emails, therefore also all past attachements are present
+     *
+     * IMPORTANT NOTICE: postmark does not saves attachements for later retrieval, therefore we cannot process it within a async job
+     *
+     * @OA\Post(
+     *      path="/api/v1/postmark_inbound_webhook",
+     *      operationId="postmarkInboundWebhook",
+     *      tags={"postmark"},
+     *      summary="Processing inbound webhooks from PostMark",
+     *      description="Adds an credit to the system",
+     *      @OA\Parameter(ref="#/components/parameters/X-API-TOKEN"),
+     *      @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
+     *      @OA\Parameter(ref="#/components/parameters/include"),
+     *      @OA\Response(
+     *          response=200,
+     *          description="Returns the saved credit object",
+     *          @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
+     *          @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
+     *          @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
+     *          @OA\JsonContent(ref="#/components/schemas/Credit"),
+     *       ),
+     *       @OA\Response(
+     *          response=422,
+     *          description="Validation error",
+     *          @OA\JsonContent(ref="#/components/schemas/ValidationError"),
+     *
+     *       ),
+     *       @OA\Response(
+     *           response="default",
+     *           description="Unexpected Error",
+     *           @OA\JsonContent(ref="#/components/schemas/Error"),
+     *       ),
+     *     )
+     *
+     * array (
+     *   'FromName' => 'Max Mustermann',
+     *   'MessageStream' => 'inbound',
+     *   'From' => 'max@mustermann.de',
+     *   'FromFull' =>
+     *   array (
+     *     'Email' => 'max@mustermann.de',
+     *     'Name' => 'Max Mustermann',
+     *     'MailboxHash' => NULL,
+     *   ),
+     *   'To' => '370c69ad9e41d616fc914b3c60250224@inbound.postmarkapp.com',
+     *   'ToFull' =>
+     *   array (
+     *     0 =>
+     *     array (
+     *       'Email' => '370c69ad9e41d616fc914b3c60250224@inbound.postmarkapp.com',
+     *       'Name' => NULL,
+     *       'MailboxHash' => NULL,
+     *     ),
+     *   ),
+     *   'Cc' => NULL,
+     *   'CcFull' =>
+     *   array (
+     *   ),
+     *   'Bcc' => NULL,
+     *   'BccFull' =>
+     *   array (
+     *   ),
+     *   'OriginalRecipient' => '370c69ad9e41d616fc914b3c60250224@inbound.postmarkapp.com',
+     *   'Subject' => 'Re: adaw',
+     *   'MessageID' => 'd37fde00-b4cf-4b64-ac64-e9f6da523c25',
+     *   'ReplyTo' => NULL,
+     *   'MailboxHash' => NULL,
+     *   'Date' => 'Sun, 24 Mar 2024 13:17:52 +0100',
+     *   'TextBody' => 'wadwad
+     *
+     *   Am So., 24. März 2024 um 13:17 Uhr schrieb Max Mustermann <max@mustermann.de>:
+     *
+     *   > test
+     *   >
+     *
+     *   --
+     *   test.de - Max Mustermann <https://test.de/>kontakt@test.de
+     *   <mailto:kontakt@test.de>',
+     *   'HtmlBody' => '<div dir="ltr">wadwad</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Am So., 24. März 2024 um 13:17 Uhr schrieb Max Mustermann &lt;<a href="mailto:max@mustermann.de">max@mustermann.de</a>&gt;:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr">test</div>
+     *   </blockquote></div>
+     *
+     *   <br>
+     *   <font size="3"><a href="https://test.de/" target="_blank">test.de - Max Mustermann</a></font><div><a href="mailto:kontakt@test.de" style="font-size:medium" target="_blank">kontakt@test.de</a><br></div>',
+     *   'StrippedTextReply' => 'wadwad
+     *
+     *   Am So., 24. März 2024 um 13:17 Uhr schrieb Max Mustermann <max@mustermann.de>:',
+     *   'Tag' => NULL,
+     *   'Headers' =>
+     *   array (
+     *     0 =>
+     *     array (
+     *       'Name' => 'Return-Path',
+     *       'Value' => '<max@mustermann.de>',
+     *     ),
+     *     1 =>
+     *     array (
+     *       'Name' => 'Received',
+     *       'Value' => 'by p-pm-inboundg02a-aws-euwest1a.inbound.postmarkapp.com (Postfix, from userid 996)	id 8ED1A453CA4; Sun, 24 Mar 2024 12:18:10 +0000 (UTC)',
+     *     ),
+     *     2 =>
+     *     array (
+     *       'Name' => 'X-Spam-Checker-Version',
+     *       'Value' => 'SpamAssassin 3.4.0 (2014-02-07) on	p-pm-inboundg02a-aws-euwest1a',
+     *     ),
+     *     3 =>
+     *     array (
+     *       'Name' => 'X-Spam-Status',
+     *       'Value' => 'No',
+     *     ),
+     *     4 =>
+     *     array (
+     *       'Name' => 'X-Spam-Score',
+     *       'Value' => '-0.1',
+     *     ),
+     *     5 =>
+     *     array (
+     *       'Name' => 'X-Spam-Tests',
+     *       'Value' => 'DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HTML_MESSAGE,	RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,RCVD_IN_ZEN_BLOCKED_OPENDNS,	SPF_HELO_NONE,SPF_PASS,URIBL_DBL_BLOCKED_OPENDNS,URIBL_ZEN_BLOCKED_OPENDNS',
+     *     ),
+     *     6 =>
+     *     array (
+     *       'Name' => 'Received-SPF',
+     *       'Value' => 'pass (test.de: Sender is authorized to use \'max@mustermann.de\' in \'mfrom\' identity (mechanism \'include:_spf.google.com\' matched)) receiver=p-pm-inboundg02a-aws-euwest1a; identity=mailfrom; envelope-from="max@mustermann.de"; helo=mail-lf1-f51.google.com; client-ip=209.85.167.51',
+     *     ),
+     *     7 =>
+     *     array (
+     *       'Name' => 'Received',
+     *       'Value' => 'from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51])	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))	(No client certificate requested)	by p-pm-inboundg02a-aws-euwest1a.inbound.postmarkapp.com (Postfix) with ESMTPS id 437BD453CA2	for <370c69ad9e41d616fc914b3c60250224@inbound.postmarkapp.com>; Sun, 24 Mar 2024 12:18:10 +0000 (UTC)',
+     *     ),
+     *     8 =>
+     *     array (
+     *       'Name' => 'Received',
+     *       'Value' => 'by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-513cf9bacf1so4773866e87.0        for <370c69ad9e41d616fc914b3c60250224@inbound.postmarkapp.com>; Sun, 24 Mar 2024 05:18:10 -0700 (PDT)',
+     *     ),
+     *     9 =>
+     *     array (
+     *       'Name' => 'DKIM-Signature',
+     *       'Value' => 'v=1; a=rsa-sha256; c=relaxed/relaxed;        d=test.de; s=google; t=1711282689; x=1711887489; darn=inbound.postmarkapp.com;        h=to:subject:message-id:date:from:in-reply-to:references:mime-version         :from:to:cc:subject:date:message-id:reply-to;        bh=NvjmqLXF/5L5ZrpToR/6FgVOhTOGC9j0/B2Na5Ke6J8=;        b=AMXIEoh6yGrOT6X3eBBClQ3NXFNuEoqxeM6aPONsqbpShAcT24iAJmqXylaLHv3fyX         Hm6mwp3a029NnrLP/VRyKZbzIMBN2iycidtrEMXF/Eg2e42Q/08/2dZ7nxH6NqE/jz01         3M7qvwHvuoZ2Knhj7rnZc6I5m/nFxBsZc++Aj0Vv9sFoWZZooqAeTXbux1I5NyE17MrL         D6byca43iINARZN7XOkoChRRZoZbOqZEtc2Va5yw7v+aYguLB4HHrIFC7G+L8hAJ0IAo         3R3DFeBw58M1xtxXCREI8Y6qMQTw60XyFw0gVmZzqR4hZiTerBSJJsZLZOBgmXxq3WLS         +xVQ==',
+     *     ),
+     *     10 =>
+     *     array (
+     *       'Name' => 'X-Google-DKIM-Signature',
+     *       'Value' => 'v=1; a=rsa-sha256; c=relaxed/relaxed;        d=1e100.net; s=20230601; t=1711282689; x=1711887489;        h=to:subject:message-id:date:from:in-reply-to:references:mime-version         :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;        bh=NvjmqLXF/5L5ZrpToR/6FgVOhTOGC9j0/B2Na5Ke6J8=;        b=uKoMhir+MX/wycNEr29Sffj45ooKksCJ1OfSRkIIGHk0rnHn8Vh+c7beYipwRPW4F2         h46K64vtIX00guYMdL2Qo2eY96+wALTqHCy67PGhvotVTROz21yxjx62pCDPGs5tefOu         IkyxoybpIK8zAfLoDTd9p2GIrr5brKJyB2w1NQc1htxTQ5D4RgBxUAOKv4uVEr8r47iA         MIo5d8/AifA+vCOAh7iJ7EmvDQ1R+guhQyH9m1Jo8PLapiYuHXggpBJvooyGuflKqbnt         gJ/dscEr4d5aWJbw/x1dmIJ5gyJPGdBWq8NRqV/qbkXQW3H/gylifDUPXbki+EQBD5Yu         EuLQ==',
+     *     ),
+     *     11 =>
+     *     array (
+     *       'Name' => 'X-Gm-Message-State',
+     *       'Value' => 'AOJu0Yxpbp1sRh17lNzg+pLnIx1jCn8ZFJQMgFuHK+6Z8RqFS5KKKTxR	8onpEbxWYYVUbrJFExNBHPD/3jdxqifCVVNaDmbpwHgmW5lHLJmA5vYRq5NFZ9OA6zKx/N6Gipr	iXE4fXmSqghFNTzy9V/RT08Zp+F5RiFh/Ta6ltQl8XfCPFfSawLz6cagUgt8bBuF4RqdrYmWwzj	ty86V5Br1htRNEFYivoXnNmaRcsD0tca1D23ny62O6RwWugrj1IpAYhViNyTZAWu+loKgfjJJoI	MsyiSU=',
+     *     ),
+     *     12 =>
+     *     array (
+     *       'Name' => 'X-Google-Smtp-Source',
+     *       'Value' => 'AGHT+IEdtZqbVI6j7WLeaSL3dABGSnWIXaSjbYqXvFvE2H+f2zsn0gknQ4OdTJecQRCabpypVF2ue91Jb7aKl6RiyEQ=',
+     *     ),
+     *     13 =>
+     *     array (
+     *       'Name' => 'X-Received',
+     *       'Value' => 'by 2002:a19:385a:0:b0:513:c876:c80a with SMTP id d26-20020a19385a000000b00513c876c80amr2586776lfj.34.1711282689140; Sun, 24 Mar 2024 05:18:09 -0700 (PDT)',
+     *     ),
+     *     14 =>
+     *     array (
+     *       'Name' => 'MIME-Version',
+     *       'Value' => '1.0',
+     *     ),
+     *     15 =>
+     *     array (
+     *       'Name' => 'References',
+     *       'Value' => '<CADfEuNsNFmNNCJDPjpS36amoLv2XEm41HmgYJT7Tj=R96PkxnA@mail.gmail.com>',
+     *     ),
+     *     16 =>
+     *     array (
+     *       'Name' => 'In-Reply-To',
+     *       'Value' => '<CADfEuNsNFmNNCJDPjpS36amoLv2XEm41HmgYJT7Tj=R96PkxnA@mail.gmail.com>',
+     *     ),
+     *     17 =>
+     *     array (
+     *       'Name' => 'Message-ID',
+     *       'Value' => '<CADfEuNvyCLsnp=CwJ3BF=-L6rn=o+DmUOPP6Cp4F-SO0p0hVwQ@mail.gmail.com>',
+     *     ),
+     *   ),
+     *   'Attachments' =>
+     *   array (
+     *      array (
+     *          'Content' => "base64-String",
+     *          'ContentLength' => 60164,
+     *          'Name' => 'Unbenannt.png',
+     *          'ContentType' => 'image/png',
+     *          'ContentID' => 'ii_luh2h8lg0',
+     *      )
+     *   ),
+     *  )
+     */
+    public function inboundWebhook(Request $request)
+    {
+
+        $input = $request->all();
+
+        if (!$request->has('token') || $request->token != config('ninja.inbound_mailbox.inbound_webhook_token'))
+            return response()->json(['message' => 'Unauthorized'], 403);
+
+        if (!(array_key_exists("MessageStream", $input) && $input["MessageStream"] == "inbound") || !array_key_exists("To", $input) || !array_key_exists("From", $input) || !array_key_exists("MessageID", $input)) {
+            nlog('Failed: Message could not be parsed, because required parameters are missing.');
+            return response()->json(['message' => 'Failed. Missing/Invalid Parameters.'], 400);
+        }
+
+        $company = MultiDB::findAndSetDbByExpenseMailbox($input["ToFull"][0]["Email"]);
+
+        if (!$company) {
+            nlog('[PostmarkInboundWebhook] unknown Expense Mailbox occured while handling an inbound email from postmark: ' . $input["To"]);
+            return response()->json(['message' => 'Ok'], 200);
+        }
+
+        $inboundEngine = new InboundMailEngine($company);
+
+        if ($inboundEngine->isInvalidOrBlocked($input["From"], $input["ToFull"][0]["Email"])) {
+            return response()->json(['message' => 'Blocked.'], 403);
+        }
+
+        try { // important to save meta if something fails here to prevent spam
+
+            // prepare data for ingresEngine
+            $inboundMail = new InboundMail();
+
+            $inboundMail->from = $input["From"] ?? '';
+            $inboundMail->to = $input["To"]; // usage of data-input, because we need a single email here
+            $inboundMail->subject = $input["Subject"] ?? '';
+            $inboundMail->body = $input["HtmlBody"] ?? '';
+            $inboundMail->text_body = $input["TextBody"] ?? '';
+            $inboundMail->date = Carbon::createFromTimeString($input["Date"]);
+
+            // parse documents as UploadedFile from webhook-data
+            foreach ($input["Attachments"] as $attachment) {
+
+                $inboundMail->documents[] = TempFile::UploadedFileFromBase64($attachment["Content"], $attachment["Name"], $attachment["ContentType"]);
+
+            }
+
+        } catch (\Exception $e) {
+            $inboundEngine->saveMeta($input["From"], $input["To"]); // important to save this, to protect from spam
+            throw $e;
+        }
+
+        // perform
+        try {
+
+            $inboundEngine->handleExpenseMailbox($inboundMail);
+
+        } catch (\Exception $e) {
+            if ($e->getCode() == 409)
+                return response()->json(['message' => $e->getMessage()], 409);
+
+            throw $e;
+        }
+
+        return response()->json(['message' => 'Success'], 200);
+    }
 }

app/Http/Controllers/PreviewController.php

@@ -148,6 +148,9 @@ class PreviewController extends BaseController
             ! empty(request()->input('entity')) &&
             ! empty(request()->input('entity_id'))) {
 
+            if($request->input('entity') == 'purchase_order')
+                return $preview = app(\App\Http\Controllers\PreviewPurchaseOrderController::class)->show($request);
+
             $design_object = json_decode(json_encode(request()->input('design')));
 
             if (! is_object($design_object)) {
@@ -293,10 +296,14 @@ class PreviewController extends BaseController
         $ts = (new TemplateService());
 
         try {
+            
             $ts->setCompany($company)
                 ->setTemplate($design_object)
                 ->mock();
+
         } catch(SyntaxError $e) {
+        } catch(\Exception $e) {
+            return response()->json(['message' => 'invalid data access', 'errors' => ['design.design.body' => $e->getMessage()]], 422);
         }
 
         if (request()->query('html') == 'true') {

app/Http/Controllers/PreviewPurchaseOrderController.php

@@ -36,6 +36,7 @@ use App\Utils\Traits\Pdf\PageNumbering;
 use App\Utils\VendorHtmlEngine;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Response;
 use Turbo124\Beacon\Facades\LightLogs;
 
@@ -83,7 +84,7 @@ class PreviewPurchaseOrderController extends BaseController
      *       ),
      *     )
      */
-    public function show()
+    public function show($request)
     {
         if (request()->has('entity') &&
             request()->has('entity_id') &&