Merge branch 'v5-develop' of https://github.com/invoiceninja/invoiceninja into feature-inbound-email-expenses

.github/workflows/phpunit.yml

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

.github/workflows/react_release.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           extensions: mysql, mysqlnd, sqlite3, bcmath, gd, curl, zip, openssl, mbstring, xml
 
       - name: Checkout code
@@ -44,6 +44,7 @@ jobs:
           git clone https://${{secrets.commit_secret}}@github.com/invoiceninja/ui.git
           cd ui
           git checkout develop
+          cp ../vite.config.ts.react ./vite.config.js
           npm i
           npm run build
           cp -r dist/* ../public/
@@ -60,6 +61,7 @@ jobs:
           sudo rm -rf node_modules
           sudo rm -rf .git
           sudo rm .env
+          sudo rm -rf ui
           
       - name: Build project
         run: |

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
           extensions: mysql, mysqlnd, sqlite3, bcmath, gd, curl, zip, openssl, mbstring, xml
 
       - name: Checkout code
@@ -72,7 +72,6 @@ jobs:
 
       - name: Build project
         run: |
-          zip -r /home/runner/work/invoiceninja/invoiceninja.zip .* -x "../*"
           shopt -s dotglob
           tar --exclude='public/storage' --exclude='./htaccess' --exclude='invoiceninja.zip' -zcvf /home/runner/work/invoiceninja/invoiceninja.tar *
       - name: Release
@@ -83,4 +82,3 @@ jobs:
         with:
           files: |
             /home/runner/work/invoiceninja/invoiceninja.tar
-            /home/runner/work/invoiceninja/invoiceninja.zip

VERSION.txt

@@ -1 +1 @@
-5.8.57
+5.9.6

app/Console/Commands/CheckData.php

@@ -478,10 +478,9 @@ class CheckData extends Command
                     } else {
                         $this->logMessage("No contact present, so cannot add invitation for {$entity_key} - {$entity->id}");
 
-                        try{
+                        try {
                             $entity->service()->createInvitations()->save();
-                        }
+                        } catch(\Exception $e) {
-                        catch(\Exception $e){
 
                         }
 
@@ -949,12 +948,12 @@ class CheckData extends Command
 
             });
 
-            Company::whereDoesntHave('company_users', function ($query){
+            Company::whereDoesntHave('company_users', function ($query) {
                 $query->where('is_owner', 1);
             })
             ->cursor()
             ->when(Ninja::isHosted())
-            ->each(function ($c){
+            ->each(function ($c) {
 
                 $this->logMessage("Orphan Account # {$c->account_id}");
 
@@ -963,7 +962,7 @@ class CheckData extends Command
             CompanyUser::whereDoesntHave('tokens')
             ->cursor()
             ->when(Ninja::isHosted())
-            ->each(function ($cu){
+            ->each(function ($cu) {
 
                 $this->logMessage("Missing tokens for Company User # {$cu->id}");
 

app/Console/Commands/EDocLint.php

@@ -1,69 +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\Console\Commands;
-
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Storage;
-use App\DataProviders\FatturaPADataProvider;
-
-class EDocLint extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'ninja:edoclint';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Builds json files component data maps';
-
-    private array $classes = [
-        FatturaPADataProvider::class,
-    ];
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        foreach($this->classes as $class)
-        {
-
-            $provider = new $class();
-
-            foreach($provider as $key => $value) {
-
-                $json = json_encode($provider->{$key}, JSON_PRETTY_PRINT);
-                Storage::disk('local')->put($key.'.json', $json);
-
-            }
-
-        }
-
-    }
-}

app/DataMapper/Analytics/DbQuery.php

@@ -66,12 +66,14 @@ class DbQuery extends GenericMixedMetric
 
     public $double_metric2 = 1;
 
-    public function __construct($string_metric5, $string_metric6, $int_metric1, $double_metric2, $string_metric7)
+    public function __construct($string_metric5, $string_metric6, $int_metric1, $double_metric2, $string_metric7, $string_metric8, $string_metric9)
     {
         $this->int_metric1 = $int_metric1;
         $this->string_metric5 = $string_metric5;
         $this->string_metric6 = $string_metric6;
         $this->double_metric2 = $double_metric2;
         $this->string_metric7 = $string_metric7;
+        $this->string_metric8 = $string_metric8;
+        $this->string_metric9 = $string_metric9;
     }
 }

app/DataMapper/Analytics/LoginMeta.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\Analytics;
+
+use Turbo124\Beacon\ExampleMetric\GenericMixedMetric;
+
+class LoginMeta 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 = 'login.meta';
+
+    /**
+     * 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 = 'email';
+    public $string_metric6 = 'ip';
+    public $string_metric7 = 'result';
+
+    public $int_metric1 = 1;
+
+    public function __construct($string_metric5, $string_metric6, $string_metric7)
+    {
+        $this->string_metric7 = $string_metric7;
+        $this->string_metric6 = $string_metric6;
+        $this->string_metric5 = $string_metric5;
+    }
+}

app/DataMapper/CompanySettings.php

@@ -29,7 +29,7 @@ class CompanySettings extends BaseSettings
 
     public $besr_id = ''; //@implemented
 
-    public $lock_invoices = 'off'; //off,when_sent,when_paid //@implemented
+    public $lock_invoices = 'off'; //off,when_sent,when_paid,end_of_month //@implemented
 
     public $enable_client_portal_tasks = false; //@ben to implement
 

app/DataMapper/EDoc/Fact1.php

@@ -1,23 +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\DataMapper\EDoc;
-
-use Spatie\LaravelData\Data;
-
-class Fact1 extends Data
-{
-    public string $sectorCode = 'SECTOR1';
-    public string $BankId = '';
-    public string $BankName = '';
-    public string $PaymentMeans = 'TP02';
-
-}

app/DataMapper/EDocSettings.php

@@ -1,29 +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\DataMapper;
-
-use Spatie\LaravelData\Data;
-use Spatie\LaravelData\Optional;
-use Invoiceninja\Einvoice\Models\FatturaPA\FatturaElettronica;
-
-class EDocSettings extends Data
-{
-    public FatturaElettronica|Optional $FatturaElettronica;
-
-    public function __construct() {}
-
-    public function createFatturaPA(): FatturaElettronica
-    {
-        return $this->FatturaElettronica ??= new FatturaElettronica;
-    }
-
-}

app/DataMapper/Sources/PayPalBalanceAffecting.php

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

app/DataMapper/Tax/TaxData.php

@@ -24,6 +24,7 @@ class TaxData
 
     public function __construct(public Response $origin)
     {
+        // @phpstan-ignore-next-line
         foreach($origin as $key => $value) {
             $this->{$key} = $value;
         }

app/DataProviders/Domains.php

@@ -18,6 +18,7 @@ namespace App\DataProviders;
 class Domains
 {
     private static array $verify_domains = [
+            'looksecure.net',
             '0-00.usa.cc',
             '0-180.com',
             '0-30-24.com',

app/DataProviders/FatturaPADataProvider.php

@@ -1,124 +0,0 @@
-<?php
-/**
-* Invoice Ninja (https://invoiceninja.com).
-*
-* @link https://github.com/invoiceninja/invoiceninja source repository
-*
-* @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
-*
-* @license https://www.elastic.co/licensing/elastic-license
-*/
-
-namespace App\DataProviders;
-
-class FatturaPADataProvider
-{
-    public array $regime_fiscale = [
-        "RF01" => "Regime ordinario",
-        "RF02" => "Regime dei contribuenti minimi (art. 1,c.96-117, L. 244/2007)",
-        "RF04" => "Agricoltura e attività connesse e pesca (artt. 34 e 34-bis, D.P.R. 633/1972)",
-        "RF05" => "Vendita sali e tabacchi (art. 74, c.1, D.P.R. 633/1972)",
-        "RF06" => "Commercio dei fiammiferi (art. 74, c.1, D.P.R. 633/1972)",
-        "RF07" => "Editoria (art. 74, c.1, D.P.R. 633/1972)",
-        "RF08" => "Gestione di servizi di telefonia pubblica (art. 74, c.1, D.P.R. 633/1972)" ,
-        "RF09" => "Rivendita di documenti di trasporto pubblico e di sosta (art. 74, c.1, D.P.R. 633/1972)" ,
-        "RF10" => "Intrattenimenti, giochi e altre attività di cui alla tariffa allegata al D.P.R. 640/72 (art. 74, c.6, D.P.R. 633/1972)" ,
-        "RF11" => "Agenzie di viaggi e turismo (art. 74-ter, D.P.R. 633/1972)" ,
-        "RF12" => "Agriturismo (art. 5, c.2, L. 413/1991)" ,
-        "RF13" => "Vendite a domicilio (art. 25-bis, c.6, D.P.R. 600/1973)" ,
-        "RF14" => "Rivendita di beni usati, di oggetti d’arte, d’antiquariato o da collezione (art. 36, D.L. 41/1995)" ,
-        "RF15" => "Agenzie di vendite all’asta di oggetti d’arte, antiquariato o da collezione (art. 40-bis, D.L. 41/1995)" ,
-        "RF16" => "IVA per cassa P.A. (art. 6, c.5, D.P.R. 633/1972)" ,
-        "RF17" => "IVA per cassa (art. 32-bis, D.L. 83/2012)" ,
-        "RF19" => "Regime forfettario" ,
-        "RF18" => "Altro"
-    ];
-
-    public array $tipo_documento = [
-        'TD01' => 'Fattura',
-        'TD02' => 'Acconto/Anticipo su fattura',
-        'TD03' => 'Acconto/Anticipo su parcella',
-        'TD04' => 'Nota di Credito',
-        'TD05' => 'Nota di Debito',
-        'TD06' => 'Parcella',
-        'TD16' => 'Integrazione fattura reverse charge interno',
-        'TD17' => 'Integrazione/autofattura per acquisto servizi dall’estero',
-        'TD18' => 'Integrazione per acquisto di beni intracomunitari',
-        'TD19' => 'Integrazione/autofattura per acquisto di beni ex art.17 c.2 DPR 633/72',
-        'TD20' => 'Autofattura per regolarizzazione e integrazione delle fatture',
-        'TD21' => 'Autofattura per splafonamento',
-        'TD22' => 'Estrazione beni da Deposito IVA',
-        'TD23' => 'Estrazione beni da Deposito IVA con versamento dell’IVA',
-        'TD24' => 'Fattura differita di cui all’art.21, comma 4, lett. a)',
-        'TD25' => 'Fattura differita di cui all’art.21, comma 4, terzo periodo lett. b)',
-        'TD26' => 'Cessione di beni ammortizzabili e per passaggi interni ',
-        'TD27' => 'Fattura per autoconsumo o per cessioni gratuite senza rivalsa',
-    ];
-
-    public array $esigibilita_iva = [
-        'I' => 'IVA ad esigibilità immediata',
-        'D' => 'IVA ad esigibilità differita',
-        'S' => 'Scissione dei pagamenti',
-    ];
-
-    public array $modalita_pagamento = [
-        'MP01' => 'contanti', //cash
-        'MP02' => 'assegno', //check
-        'MP03' => 'assegno circolare', //cashier's check
-        'MP04' => 'contanti presso Tesoreria', //cash at treasury
-        'MP05' => 'bonifico', //bank transfer
-        'MP06' => 'vaglia cambiario', //bill of exchange
-        'MP07' => 'bollettino bancario', //bank bulletin
-        'MP08' => 'carta di pagamento', //payment card
-        'MP09' => 'RID', //RID
-        'MP10' => 'RID utenze', //RID utilities
-        'MP11' => 'RID veloce', //fast RID
-        'MP12' => 'Riba', //Riba
-        'MP13' => 'MAV //MAV',
-        'MP14' => 'quietanza erario stato', //state treasury receipt
-        'MP15' => 'giroconto su conti di contabilità speciale', //transfer to special accounting accounts
-        'MP16' => 'domiciliazione bancaria', //bank domiciliation
-        'MP17' => 'domiciliazione postale', //postal domiciliation
-        'MP18' => 'bollettino di c/c postale', //postal giro account
-        'MP19' => 'SEPA Direct Debit', //SEPA Direct Debit
-        'MP20' => 'SEPA Direct Debit CORE', //SEPA Direct Debit CORE
-        'MP21' => 'SEPA Direct Debit B2B', //SEPA Direct Debit B2B
-        'MP22' => 'Trattenuta su somme già riscosse', //Withholding on sums already collected
-        'MP23' => 'PagoPA', //PagoPA
-    ];
-
-    public array $esigibilita_pagamento = [
-        'TP01' => 'Pagamento a rate',
-        'TP02' => 'Pagamento completo',
-        'TP03' => 'Anticipo',
-    ];
-
-    public function __construct()
-    {
-    }
-    
-    public function getRegimeFiscale(): array
-    {
-        return $this->regime_fiscale;
-    }
-    public function getTipoDocumento(): array
-    {
-        return $this->tipo_documento;
-    }
-    
-    public function getEsigibilitaIva(): array
-    {
-        return $this->esigibilita_iva;
-    }
-
-    public function getModalitaPagamento(): array
-    {
-        return $this->modalita_pagamento;
-    }
-
-    public function getEsigibilitaPagamento(): array
-    {
-        return $this->esigibilita_pagamento;
-    }
-
-}

app/Exceptions/Handler.php

@@ -109,10 +109,11 @@ class Handler extends ExceptionHandler
             Integration::configureScope(function (Scope $scope): void {
                 $name = 'hosted@invoiceninja.com';
 
-                if (auth()->guard('contact') && auth()->guard('contact')->user()) {
+                if (auth()->guard('contact') && auth()->guard('contact')->user()) { // @phpstan-ignore-line
                     $name = 'Contact = '.auth()->guard('contact')->user()->email;
                     $key = auth()->guard('contact')->user()->company->account->key;
-                } elseif (auth()->guard('user') && auth()->guard('user')->user()) {
+                } elseif (auth()->guard('user') && auth()->guard('user')->user()) { // @phpstan-ignore-line
+
                     $name = 'Admin = '.auth()->guard('user')->user()->email;
                     $key = auth()->user()->account->key;
                 } else {
@@ -131,13 +132,14 @@ class Handler extends ExceptionHandler
             }
         } elseif (app()->bound('sentry')) {
             Integration::configureScope(function (Scope $scope): void {
-                if (auth()->guard('contact') && auth()->guard('contact')->user() && auth()->guard('contact')->user()->company->account->report_errors) {
+                if (auth()->guard('contact') && auth()->guard('contact')->user() && auth()->guard('contact')->user()->company->account->report_errors) {// @phpstan-ignore-line
+
                     $scope->setUser([
                         'id'    => auth()->guard('contact')->user()->company->account->key,
                         'email' => 'anonymous@example.com',
                         'name'  => 'Anonymous User',
                     ]);
-                } elseif (auth()->guard('user') && auth()->guard('user')->user() && auth()->user()->companyIsSet() && auth()->user()->company()->account->report_errors) {
+                } elseif (auth()->guard('user') && auth()->guard('user')->user() && auth()->user()->companyIsSet() && auth()->user()->company()->account->report_errors) {// @phpstan-ignore-line
                     $scope->setUser([
                         'id'    => auth()->user()->account->key,
                         'email' => 'anonymous@example.com',

app/Export/CSV/ActivityExport.php

@@ -25,8 +25,6 @@ use League\Csv\Writer;
 
 class ActivityExport extends BaseExport
 {
-    private $entity_transformer;
-
     public string $date_key = 'created_at';
 
     private string $date_format = 'YYYY-MM-DD';
@@ -43,7 +41,7 @@ class ActivityExport extends BaseExport
     {
         $this->company = $company;
         $this->input = $input;
-        $this->entity_transformer = new ActivityTransformer();
+
     }
 
     public function returnJson()
@@ -143,10 +141,10 @@ class ActivityExport extends BaseExport
 
     }
 
-    private function decorateAdvancedFields(Task $task, array $entity): array
+    // private function decorateAdvancedFields(Task $task, array $entity): array
-    {
+    // {
-        return $entity;
+    //     return $entity;
-    }
+    // }
 
 
     public function processMetaData(array $row, $resource): array

app/Export/CSV/BaseExport.php

@@ -971,9 +971,10 @@ class BaseExport
     protected function addPaymentStatusFilters(Builder $query, string $status): Builder
     {
 
+        /** @var array $status_parameters */
         $status_parameters = explode(',', $status);
 
-        if(in_array('all', $status_parameters) || count($status_parameters) == 0) {
+        if((count($status_parameters) == 0) || in_array('all', $status_parameters)) {
             return $query;
         }
 
@@ -1028,9 +1029,10 @@ class BaseExport
     protected function addRecurringInvoiceStatusFilter(Builder $query, string $status): Builder
     {
 
+        /** @var array $status_parameters */
         $status_parameters = explode(',', $status);
 
-        if (in_array('all', $status_parameters) || count($status_parameters) == 0){
+        if (in_array('all', $status_parameters) || count($status_parameters) == 0) {
             return $query;
         }
 
@@ -1132,6 +1134,7 @@ class BaseExport
     protected function addPurchaseOrderStatusFilter(Builder $query, string $status): Builder
     {
 
+        /** @var array $status_parameters */
         $status_parameters = explode(',', $status);
 
         if (in_array('all', $status_parameters) || count($status_parameters) == 0) {
@@ -1180,6 +1183,7 @@ class BaseExport
     protected function addInvoiceStatusFilter(Builder $query, string $status): Builder
     {
                
+        /** @var array $status_parameters */
         $status_parameters = explode(',', $status);
 
         if(in_array('all', $status_parameters) || count($status_parameters) == 0) {

app/Export/CSV/ClientExport.php

@@ -125,8 +125,11 @@ class ClientExport extends BaseExport
 
         $query = Client::query()->with('contacts')
                                 ->withTrashed()
-                                ->where('company_id', $this->company->id)
+                                ->where('company_id', $this->company->id);
-                                ->where('is_deleted', $this->input['include_deleted'] ?? false);
+
+        if(!$this->input['include_deleted'] ?? false) {
+            $query->where('is_deleted', 0);
+        }
 
         $query = $this->addDateRange($query);
 
@@ -240,16 +243,16 @@ class ClientExport extends BaseExport
         return $entity;
     }
 
-    private function calculateStatus($client)
+    // private function calculateStatus($client)
-    {
+    // {
-        if ($client->is_deleted) {
+    //     if ($client->is_deleted) {
-            return ctrans('texts.deleted');
+    //         return ctrans('texts.deleted');
-        }
+    //     }
 
-        if ($client->deleted_at) {
+    //     if ($client->deleted_at) {
-            return ctrans('texts.archived');
+    //         return ctrans('texts.archived');
-        }
+    //     }
 
-        return ctrans('texts.active');
+    //     return ctrans('texts.active');
-    }
+    // }
 }

app/Export/CSV/ContactExport.php

@@ -59,7 +59,7 @@ class ContactExport extends BaseExport
 
         $query = ClientContact::query()
                         ->where('company_id', $this->company->id)
-                        ->whereHas('client', function ($q){
+                        ->whereHas('client', function ($q) {
                             $q->where('is_deleted', false);
                         });
 
@@ -155,7 +155,7 @@ class ContactExport extends BaseExport
         }
 
         if (in_array('client.user_id', $this->input['report_keys'])) {
-            $entity['client.user_id'] = $client->user ? $client->user->present()->name() : '';
+            $entity['client.user_id'] = $client->user ? $client->user->present()->name() : '';// @phpstan-ignore-line
         }
 
         if (in_array('client.assigned_user_id', $this->input['report_keys'])) {

app/Export/CSV/CreditExport.php

@@ -102,7 +102,7 @@ class CreditExport extends BaseExport
         $query = Credit::query()
                         ->withTrashed()
                         ->with('client')
-                        ->whereHas('client', function ($q){
+                        ->whereHas('client', function ($q) {
                             $q->where('is_deleted', false);
                         })
                         ->where('company_id', $this->company->id)

app/Export/CSV/ExpenseExport.php

@@ -82,8 +82,12 @@ class ExpenseExport extends BaseExport
         $query = Expense::query()
                         ->with('client')
                         ->withTrashed()
-                        ->where('company_id', $this->company->id)
+                        ->where('company_id', $this->company->id);
-                        ->where('is_deleted', $this->input['include_deleted'] ?? false);
+
+
+        if(!$this->input['include_deleted'] ?? false) {
+            $query->where('is_deleted', 0);
+        }
 
         $query = $this->addDateRange($query);
 
@@ -216,17 +220,17 @@ class ExpenseExport extends BaseExport
         //     $entity['expense.client'] = $expense->client ? $expense->client->present()->name() : '';
         // }
 
-        // if (in_array('expense.invoice_id', $this->input['report_keys'])) {
+        if (in_array('expense.invoice_id', $this->input['report_keys'])) {
-        //     $entity['expense.invoice_id'] = $expense->invoice ? $expense->invoice->number : '';
+            $entity['expense.invoice_id'] = $expense->invoice ? $expense->invoice->number : '';
-        // }
+        }
 
         // if (in_array('expense.category', $this->input['report_keys'])) {
         //     $entity['expense.category'] = $expense->category ? $expense->category->name : '';
         // }
 
-        // if (in_array('expense.vendor_id', $this->input['report_keys'])) {
+        if (in_array('expense.vendor_id', $this->input['report_keys'])) {
-        //     $entity['expense.vendor'] = $expense->vendor ? $expense->vendor->name : '';
+            $entity['expense.vendor'] = $expense->vendor ? $expense->vendor->name : '';
-        // }
+        }
 
         // if (in_array('expense.payment_type_id', $this->input['report_keys'])) {
         //     $entity['expense.payment_type_id'] = $expense->payment_type ? $expense->payment_type->name : '';

app/Export/CSV/InvoiceExport.php

@@ -57,11 +57,15 @@ class InvoiceExport extends BaseExport
         $query = Invoice::query()
                         ->withTrashed()
                         ->with('client')
-                        ->whereHas('client', function ($q){
+                        ->whereHas('client', function ($q) {
                             $q->where('is_deleted', false);
                         })
-                        ->where('company_id', $this->company->id)
+                        ->where('company_id', $this->company->id);
-                        ->where('is_deleted', $this->input['include_deleted'] ?? false);
+
+
+        if(!$this->input['include_deleted'] ?? false) {
+            $query->where('is_deleted', 0);
+        }
 
         $query = $this->addDateRange($query);
 

app/Export/CSV/InvoiceItemExport.php

@@ -70,11 +70,14 @@ class InvoiceItemExport extends BaseExport
         $query = Invoice::query()
                         ->withTrashed()
                         ->with('client')
-                        ->whereHas('client', function ($q){
+                        ->whereHas('client', function ($q) {
                             $q->where('is_deleted', false);
                         })
-                        ->where('company_id', $this->company->id)
+                        ->where('company_id', $this->company->id);
-                        ->where('is_deleted', $this->input['include_deleted'] ?? false);
+
+        if(!$this->input['include_deleted'] ?? false) {
+            $query->where('is_deleted', 0);
+        }
 
         $query = $this->addDateRange($query);
 

app/Export/CSV/PaymentExport.php

@@ -56,7 +56,7 @@ class PaymentExport extends BaseExport
 
         $query = Payment::query()
                             ->withTrashed()
-                            ->whereHas('client', function ($q){
+                            ->whereHas('client', function ($q) {
                                 $q->where('is_deleted', false);
                             })
                             ->where('company_id', $this->company->id)

app/Export/CSV/ProductExport.php

@@ -73,8 +73,12 @@ class ProductExport extends BaseExport
 
         $query = Product::query()
                         ->withTrashed()
-                        ->where('company_id', $this->company->id)
+                        ->where('company_id', $this->company->id);
-                        ->where('is_deleted', 0);
+
+
+        if(!$this->input['include_deleted'] ?? false) {
+            $query->where('is_deleted', 0);
+        }
 
         $query = $this->addDateRange($query);
 
@@ -129,16 +133,16 @@ class ProductExport extends BaseExport
         // return $this->decorateAdvancedFields($product, $entity);
     }
 
-    private function decorateAdvancedFields(Product $product, array $entity): array
+    // private function decorateAdvancedFields(Product $product, array $entity): array
-    {
+    // {
-        if (in_array('vendor_id', $this->input['report_keys'])) {
+    //     if (in_array('vendor_id', $this->input['report_keys'])) {
-            $entity['vendor'] = $product->vendor()->exists() ? $product->vendor->name : '';
+    //         $entity['vendor'] = $product->vendor()->exists() ? $product->vendor->name : '';
-        }
-
-        // if (array_key_exists('project_id', $this->input['report_keys'])) {
-        //     $entity['project'] = $product->project()->exists() ? $product->project->name : '';
     //     }
 
-        return $entity;
+    //     // if (array_key_exists('project_id', $this->input['report_keys'])) {
-    }
+    //     //     $entity['project'] = $product->project()->exists() ? $product->project->name : '';
+    //     // }
+
+    //     return $entity;
+    // }
 }

app/Export/CSV/ProductSalesExport.php

@@ -25,6 +25,7 @@ class ProductSalesExport extends BaseExport
 {
     public string $date_key = 'created_at';
 
+    /** @var Collection<\App\Models\Product> $products*/
     protected Collection $products;
 
     public Writer $csv;
@@ -65,11 +66,11 @@ class ProductSalesExport extends BaseExport
         'custom_value4' => 'custom_value4',
     ];
 
-    private array $decorate_keys = [
+    // private array $decorate_keys = [
-        'client',
+    //     'client',
-        'currency',
+    //     'currency',
-        'date',
+    //     'date',
-    ];
+    // ];
 
     public function __construct(Company $company, array $input)
     {
@@ -86,7 +87,7 @@ class ProductSalesExport extends BaseExport
         if ($product_keys && !empty($this->input['product_key'])) {
 
             $keys = explode(",", $product_keys);
-            $query->where(function ($q) use ($keys){
+            $query->where(function ($q) use ($keys) {
 
                 foreach($keys as $key) {
                     $q->orWhereJsonContains('line_items', ['product_key' => $key]);
@@ -121,7 +122,7 @@ class ProductSalesExport extends BaseExport
         //insert the header
         $query = Invoice::query()
                         ->withTrashed()
-                        ->whereHas('client', function ($q){
+                        ->whereHas('client', function ($q) {
                             $q->where('is_deleted', false);
                         })
                         ->where('company_id', $this->company->id)
@@ -138,20 +139,19 @@ class ProductSalesExport extends BaseExport
 
         $product_keys = &$this->input['product_key'];
 
-        if($product_keys){
+        if($product_keys) {
             $product_keys = explode(",", $product_keys);
         }
 
         $query->cursor()
-              ->each(function ($invoice) use($product_keys) {
+              ->each(function ($invoice) use ($product_keys) {
                   foreach ($invoice->line_items as $item) {
 
-                    if($product_keys)
+                      if($product_keys) {
-                    {
+                          if(in_array($item->product_key, $product_keys)) {
-                     if(in_array($item->product_key, $product_keys))
                               $this->csv->insertOne($this->buildRow($invoice, $item));
                           }
-                    else {
+                      } else {
                           $this->csv->insertOne($this->buildRow($invoice, $item));
                       }
 
@@ -159,9 +159,9 @@ class ProductSalesExport extends BaseExport
               });
 
 
-        $grouped = $this->sales->groupBy('product_key')->map(function ($key, $value) use($product_keys){
+        $grouped = $this->sales->groupBy('product_key')->map(function ($key, $value) use ($product_keys) {
 
-            if($product_keys && !in_array($value, $product_keys)){
+            if($product_keys && !in_array($value, $product_keys)) {
                 return false;
             }
 
@@ -185,7 +185,8 @@ class ProductSalesExport extends BaseExport
 
         })->reject(function ($value) {
             return $value === false;
-        });;
+        });
+        ;
 
         $this->csv->insertOne([]);
         $this->csv->insertOne([]);
@@ -327,10 +328,10 @@ class ProductSalesExport extends BaseExport
      * getProduct
      *
      * @param  string $product_key
-     * @return Product
+     * @return ?\Illuminate\Database\Eloquent\Model
      */
-    private function getProduct(string $product_key): ?Product
+    // private function getProduct(string $product_key)
-    {
+    // {
-        return $this->products->firstWhere('product_key', $product_key);
+    //     return $this->products->firstWhere('product_key', $product_key);
-    }
+    // }
 }

app/Export/CSV/PurchaseOrderExport.php

@@ -58,19 +58,23 @@ class PurchaseOrderExport extends BaseExport
         $query = PurchaseOrder::query()
                         ->withTrashed()
                         ->with('vendor')
-                        ->whereHas('vendor', function ($q){
+                        ->whereHas('vendor', function ($q) {
                             $q->where('is_deleted', false);
                         })
-                        ->where('company_id', $this->company->id)
+                        ->where('company_id', $this->company->id);
-                        ->where('is_deleted', $this->input['include_deleted'] ?? false);
+
+        if(!$this->input['include_deleted'] ?? false) {
+            $query->where('is_deleted', 0);
+        }
 
         $query = $this->addDateRange($query);
 
 
         $clients = &$this->input['client_id'];
 
-        if($clients)
+        if($clients) {
             $query = $this->addClientFilter($query, $clients);
+        }
 
         $query = $this->addPurchaseOrderStatusFilter($query, $this->input['status'] ?? '');
 

app/Export/CSV/PurchaseOrderItemExport.php

@@ -62,11 +62,14 @@ class PurchaseOrderItemExport extends BaseExport
 
         $query = PurchaseOrder::query()
                         ->withTrashed()
-                        ->whereHas('vendor', function ($q){
+                        ->whereHas('vendor', function ($q) {
                             $q->where('is_deleted', false);
                         })
-                        ->with('vendor')->where('company_id', $this->company->id)
+                        ->with('vendor')->where('company_id', $this->company->id);
-                        ->where('is_deleted', $this->input['include_deleted'] ?? false);
+
+        if(!$this->input['include_deleted'] ?? false) {
+            $query->where('is_deleted', 0);
+        }
 
         $query = $this->addDateRange($query);
 

app/Export/CSV/QuoteExport.php

@@ -64,11 +64,14 @@ class QuoteExport extends BaseExport
         $query = Quote::query()
                         ->withTrashed()
                         ->with('client')
-                        ->whereHas('client', function ($q){
+                        ->whereHas('client', function ($q) {
                             $q->where('is_deleted', false);
                         })
-                        ->where('company_id', $this->company->id)
+                        ->where('company_id', $this->company->id);
-                        ->where('is_deleted', $this->input['include_deleted'] ?? false);
+
+        if(!$this->input['include_deleted'] ?? false) {
+            $query->where('is_deleted', 0);
+        }
 
         $query = $this->addDateRange($query);
 

app/Export/CSV/QuoteItemExport.php

@@ -65,11 +65,14 @@ class QuoteItemExport extends BaseExport
 
         $query = Quote::query()
                             ->withTrashed()
-                            ->whereHas('client', function ($q){
+                            ->whereHas('client', function ($q) {
                                 $q->where('is_deleted', false);
                             })
-                            ->with('client')->where('company_id', $this->company->id)
+                            ->with('client')->where('company_id', $this->company->id);
-                            ->where('is_deleted', $this->input['include_deleted'] ?? false);
+
+        if(!$this->input['include_deleted'] ?? false) {
+            $query->where('is_deleted', 0);
+        }
 
         $query = $this->addDateRange($query);
 

app/Export/CSV/RecurringInvoiceExport.php

@@ -56,11 +56,14 @@ class RecurringInvoiceExport extends BaseExport
         $query = RecurringInvoice::query()
                         ->withTrashed()
                         ->with('client')
-                        ->whereHas('client', function ($q){
+                        ->whereHas('client', function ($q) {
                             $q->where('is_deleted', false);
                         })
-                        ->where('company_id', $this->company->id)
+                        ->where('company_id', $this->company->id);
-                        ->where('is_deleted', $this->input['include_deleted'] ?? false);
+
+        if(!$this->input['include_deleted'] ?? false) {
+            $query->where('is_deleted', 0);
+        }
 
         $query = $this->addDateRange($query);
 

app/Export/CSV/TaskExport.php

@@ -68,20 +68,25 @@ class TaskExport extends BaseExport
 
         $query = Task::query()
                         ->withTrashed()
-                        ->where('company_id', $this->company->id)
+                        ->where('company_id', $this->company->id);
-                        ->where('is_deleted', $this->input['include_deleted'] ?? false);
+
+        if(!$this->input['include_deleted'] ?? false) {
+            $query->where('is_deleted', 0);
+        }
 
         $query = $this->addDateRange($query);
 
         $clients = &$this->input['client_id'];
 
-        if($clients)
+        if($clients) {
             $query = $this->addClientFilter($query, $clients);
+        }
 
         $document_attachments = &$this->input['document_email_attachment'];
 
-        if($document_attachments) 
+        if($document_attachments) {
             $this->queueDocuments($query);
+        }
 
         return $query;
 

app/Export/CSV/VendorExport.php

@@ -62,8 +62,11 @@ class VendorExport extends BaseExport
 
         $query = Vendor::query()->with('contacts')
                         ->withTrashed()
-                        ->where('company_id', $this->company->id)
+                        ->where('company_id', $this->company->id);
-                        ->where('is_deleted', $this->input['include_deleted'] ?? false);
+
+        if(!$this->input['include_deleted'] ?? false) {
+            $query->where('is_deleted', 0);
+        }
 
         $query = $this->addDateRange($query);
 

app/Factory/BankIntegrationFactory.php

@@ -23,14 +23,13 @@ class BankIntegrationFactory
         $bank_integration->company_id = $company_id;
 
         $bank_integration->provider_name = '';
-        $bank_integration->bank_account_id = '';
         $bank_integration->bank_account_name = '';
         $bank_integration->bank_account_number = '';
         $bank_integration->bank_account_status = '';
         $bank_integration->bank_account_type = '';
         $bank_integration->balance = 0;
         $bank_integration->currency = '';
-        $bank_integration->auto_sync = 1;
+        $bank_integration->auto_sync = true;
 
         return $bank_integration;
     }

app/Factory/ClientFactory.php

@@ -29,7 +29,7 @@ class ClientFactory
         $client->balance = 0;
         $client->paid_to_date = 0;
         $client->country_id = null;
-        $client->is_deleted = 0;
+        $client->is_deleted = false;
         $client->client_hash = Str::random(40);
         $client->settings = ClientSettings::defaults();
         $client->classification = '';

app/Factory/CloneQuoteToProjectFactory.php

@@ -33,7 +33,7 @@ class CloneQuoteToProjectFactory
         $project->custom_value2 = '';
         $project->custom_value3 = '';
         $project->custom_value4 = '';
-        $project->is_deleted = 0;
+        $project->is_deleted = false;
 
         return $project;
     }

app/Factory/CompanyFactory.php

@@ -48,7 +48,7 @@ class CompanyFactory
         $company->markdown_email_enabled = true;
         $company->markdown_enabled = false;
         $company->tax_data = new TaxModel();
-        $company->first_month_of_year = 1;
+        $company->first_month_of_year = '1';
         $company->smtp_encryption = 'tls';
         $company->smtp_host = '';
         $company->smtp_local_domain = '';

app/Factory/SubscriptionFactory.php

@@ -23,7 +23,7 @@ class SubscriptionFactory
         $billing_subscription->company_id = $company_id;
         $billing_subscription->user_id = $user_id;
         $billing_subscription->steps = collect(Purchase::defaultSteps())
-            ->map(fn($step) => StepService::mapClassNameToString($step))
+            ->map(fn ($step) => StepService::mapClassNameToString($step))
             ->implode(',');
 
         return $billing_subscription;

app/Factory/TaxRateFactory.php

@@ -20,7 +20,7 @@ class TaxRateFactory
         $tax_rate = new TaxRate();
 
         $tax_rate->name = '';
-        $tax_rate->rate = '';
+        $tax_rate->rate = 0;
         $tax_rate->company_id = $company_id;
         $tax_rate->user_id = $user_id;
 

app/Factory/UserFactory.php

@@ -12,6 +12,7 @@
 namespace App\Factory;
 
 use App\Models\User;
+use Illuminate\Support\Str;
 
 class UserFactory
 {
@@ -29,6 +30,7 @@ class UserFactory
         $user->signature = '';
         $user->theme_id = 0;
         $user->user_logged_in_notification = true;
+        $user->referral_code = Str::lower(Str::random(32));
 
         return $user;
     }

app/Factory/VendorFactory.php

@@ -26,7 +26,7 @@ class VendorFactory
         $vendor->private_notes = '';
         $vendor->public_notes = '';
         $vendor->country_id = 4;
-        $vendor->is_deleted = 0;
+        $vendor->is_deleted = false;
         $vendor->vendor_hash = Str::random(40);
         // $vendor->classification = '';
 

app/Filters/BankTransactionFilters.php

@@ -115,6 +115,29 @@ class BankTransactionFilters extends QueryFilters
         return $this->builder;
     }
 
+
+    /**
+     * Filters the list based on Bank Accounts.
+     *
+     * @param string $ids Comma Separated List of bank account ids
+     * @return Builder
+     */
+    public function bank_integration_ids(string $ids = ''): Builder
+    {
+        if(strlen($ids) == 0) {
+            return $this->builder;
+        }
+
+        $ids = $this->transformKeys(explode(",", $ids));
+
+        $this->builder->where(function ($query) use ($ids) {
+            $query->whereIn('bank_integration_id', $ids);
+        });
+
+        return $this->builder;
+
+    }
+
     /**
      * Sorts the list based on $sort.
      *

app/Filters/ClientFilters.php

@@ -160,8 +160,9 @@ class ClientFilters extends QueryFilters
             return $this->builder;
         }
 
-        if($sort_col[0] == 'documents')
+        if($sort_col[0] == 'documents') {
             return $this->builder;
+        }
 
         if ($sort_col[0] == 'display_name') {
             $sort_col[0] = 'name';

app/Filters/DesignFilters.php

@@ -59,8 +59,9 @@ class DesignFilters extends QueryFilters
     public function entities(string $entities = ''): Builder
     {
 
-        if(stripos($entities, 'statement') !== false)
+        if(stripos($entities, 'statement') !== false) {
             $entities = 'client';
+        }
 
         if (strlen($entities) == 0 || str_contains($entities, ',')) {
             return $this->builder;

app/Filters/DocumentFilters.php

@@ -74,8 +74,7 @@ class DocumentFilters extends QueryFilters
     {
         $types = explode(',', $types);
 
-        foreach ($types as $type)
+        foreach ($types as $type) {
-        {
             match($type) {
                 'private' => $this->builder->where('is_public', 0),
                 'public' => $this->builder->where('is_public', 1),

app/Filters/ExpenseFilters.php

@@ -44,6 +44,9 @@ class ExpenseFilters extends QueryFilters
                 })
                 ->orWhereHas('vendor', function ($q) use ($filter) {
                     $q->where('name', 'like', '%'.$filter.'%');
+                })
+                ->orWhereHas('client', function ($q) use ($filter) {
+                    $q->where('name', 'like', '%'.$filter.'%');
                 });
         });
     }
@@ -108,8 +111,8 @@ class ExpenseFilters extends QueryFilters
                 });
             }
 
-            if(in_array('uncategorized', $status_parameters)){
+            if(in_array('uncategorized', $status_parameters)) {
-                $query->orWhere(function ($query){
+                $query->orWhere(function ($query) {
                     $query->whereNull('category_id');
                 });
             }

app/Filters/InvoiceFilters.php

@@ -228,10 +228,9 @@ class InvoiceFilters extends QueryFilters
             $date = Carbon::createFromTimestamp((int)$date);
         } else {
 
-            try{
+            try {
                 $date = Carbon::parse($date);
-            }
+            } catch(\Exception $e) {
-            catch(\Exception $e){
                 return $this->builder;
             }
         }

app/Filters/RecurringInvoiceFilters.php

@@ -133,7 +133,7 @@ class RecurringInvoiceFilters extends QueryFilters
             return $this->builder->orderByRaw("REGEXP_REPLACE(number,'[^0-9]+','')+0 " . $dir);
         }
 
-        if($sort_col[0] == 'next_send_datetime'){
+        if($sort_col[0] == 'next_send_datetime') {
             $sort_col[0] = 'next_send_date';
         }
 

app/Filters/TaskFilters.php

@@ -26,7 +26,6 @@ class TaskFilters extends QueryFilters
      *
      * @param string $filter
      * @return Builder
-     * @deprecated
      */
     public function filter(string $filter = ''): Builder
     {
@@ -89,7 +88,7 @@ class TaskFilters extends QueryFilters
         return $this->builder;
     }
 
-    public function project_tasks($project): Builder
+    public function project_tasks(string $project = ''): Builder
     {
         if (strlen($project) == 0) {
             return $this->builder;

app/Helpers/Bank/Nordigen/Nordigen.php

@@ -24,9 +24,10 @@ use App\Services\Email\Email;
 use App\Models\BankIntegration;
 use App\Services\Email\EmailObject;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Mail\Mailables\Address;
 use App\Helpers\Bank\Nordigen\Transformer\AccountTransformer;
 use App\Helpers\Bank\Nordigen\Transformer\TransactionTransformer;
-use Illuminate\Mail\Mailables\Address;
 
 class Nordigen
 {
@@ -149,6 +150,11 @@ class Nordigen
 
     public function disabledAccountEmail(BankIntegration $bank_integration): void
     {
+        $cache_key = "email_quota:{$bank_integration->company->company_key}:{$bank_integration->id}";
+
+        if(Cache::has($cache_key)) {
+            return;
+        }
 
         App::setLocale($bank_integration->company->getLocale());
 
@@ -164,6 +170,7 @@ class Nordigen
 
         Email::dispatch($mo, $bank_integration->company);
 
+        Cache::put($cache_key, true, 60 * 60 * 24);
 
     }
 

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

@@ -71,7 +71,7 @@ class TransactionTransformer implements BankRevenueInterface
 
     private Company $company;
 
-    function __construct(Company $company)
+    public function __construct(Company $company)
     {
         $this->company = $company;
     }
@@ -148,7 +148,7 @@ class TransactionTransformer implements BankRevenueInterface
             'description' => $description,
             'participant' => $participant,
             'participant_name' => $participant_name,
-            'base_type' => (int) $transaction["transactionAmount"]["amount"] <= 0 ? 'DEBIT' : 'CREDIT',
+            'base_type' => $amount < 0 ? 'DEBIT' : 'CREDIT',
         ];
 
     }

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

@@ -16,6 +16,7 @@ use Spatie\LaravelData\Attributes\MapInputName;
 use Spatie\LaravelData\Data;
 
 /**
+ * @deprecated
  * [
     "account": [
       [

app/Helpers/Epc/EpcQrGenerator.php

@@ -59,13 +59,13 @@ class EpcQrGenerator
           <rect x='0' y='0' width='100%'' height='100%' />{$qr}</svg>";
 
         } catch(\Throwable $e) {
-            // nlog("EPC QR failure => ".$e->getMessage());
+            nlog("EPC QR failure => ".$e->getMessage());
             return '';
         } catch(\Exception $e) {
-            // nlog("EPC QR failure => ".$e->getMessage());
+            nlog("EPC QR failure => ".$e->getMessage());
             return '';
         } catch(InvalidArgumentException $e) {
-            // nlog("EPC QR failure => ".$e->getMessage());
+            nlog("EPC QR failure => ".$e->getMessage());
             return '';
         }
 
@@ -73,22 +73,42 @@ class EpcQrGenerator
 
     public function encodeMessage()
     {
-        return rtrim(implode("\n", [
+        // return rtrim(implode("\n", [
-            $this->sepa['serviceTag'],
+        //     $this->sepa['serviceTag'],
-            sprintf('%03d', $this->sepa['version']),
+        //     sprintf('%03d', $this->sepa['version']),
-            $this->sepa['characterSet'],
+        //     $this->sepa['characterSet'],
-            $this->sepa['identification'],
+        //     $this->sepa['identification'],
-            isset($this->company?->custom_fields?->company2) ? $this->company->settings->custom_value2 : '',
+        //     isset($this->company?->custom_fields?->company2) ? $this->company->settings->custom_value2 : '',
-            $this->company->present()->name(),
+        //     $this->company->present()->name(),
-            isset($this->company?->custom_fields?->company1) ? $this->company->settings->custom_value1 : '',
+        //     isset($this->company?->custom_fields?->company1) ? $this->company->settings->custom_value1 : '',
-            $this->formatMoney($this->amount),
+        //     $this->formatMoney($this->amount),
-            $this->sepa['purpose'],
+        //     $this->sepa['purpose'],
-            substr($this->invoice->number, 0, 34),
+        //     substr($this->invoice->number, 0, 34),
-            '',
+        //     '',
-            ' '
+        //     ' '
-        ]), "\n");
+        // ]), "\n");
+
+
+        $data = [
+            'BCD',
+            '002', // Version
+            '1', // Encoding: 1 = UTF-8
+            'SCT', // Service Tag: SEPA Credit Transfer
+            isset($this->company?->custom_fields?->company2) ? $this->company->settings->custom_value2 : '', // BIC
+            $this->company->present()->name(), // Name of the beneficiary
+            isset($this->company?->custom_fields?->company1) ? $this->company->settings->custom_value1 : '', // IBAN
+            $this->formatMoney($this->amount), // Amount with EUR prefix
+            '', // Reference
+            substr($this->invoice->number, 0, 34) // Unstructured remittance information
+        ];
+
+        return implode("\n", $data);
+
     }
 
+
+    //            substr("{$this->invoice->number} {$this->invoice->client->number}", 0,139),
+
     private function validateFields()
     {
         if (Ninja::isSelfHost() && isset($this->company?->custom_fields?->company2)) {

app/Helpers/Invoice/CustomValuer.php

@@ -35,7 +35,8 @@ trait CustomValuer
         return 0;
     }
 
-    public function multiInclusiveTax($custom_value, $has_custom_invoice_taxes) {
+    public function multiInclusiveTax($custom_value, $has_custom_invoice_taxes)
+    {
 
         if (isset($custom_value) && is_numeric($custom_value) && $has_custom_invoice_taxes !== false) {
 
@@ -45,7 +46,7 @@ trait CustomValuer
             $tax += $this->formatValue($custom_value - ($custom_value / (1 + ($this->invoice->tax_rate2 / 100))), 2);
             $tax += $this->formatValue($custom_value - ($custom_value / (1 + ($this->invoice->tax_rate3 / 100))), 2);
 
-                return round($tax,2);
+            return round($tax, 2);
         }
 
         return 0;

app/Helpers/Invoice/InvoiceSum.php

@@ -245,10 +245,9 @@ class InvoiceSum
      */
     private function setCalculatedAttributes(): self
     {
-        if($this->invoice->status_id == Invoice::STATUS_CANCELLED){
+        if($this->invoice->status_id == Invoice::STATUS_CANCELLED) {
             $this->invoice->balance = 0;
-        }
+        } elseif ($this->invoice->status_id != Invoice::STATUS_DRAFT) {
-        elseif ($this->invoice->status_id != Invoice::STATUS_DRAFT) {
             if ($this->invoice->amount != $this->invoice->balance) {
                 $this->invoice->balance = Number::roundValue($this->getTotal(), $this->precision) - $this->invoice->paid_to_date; //21-02-2024 cannot use the calculated $paid_to_date here as it could send the balance backward.
             } else {
@@ -258,7 +257,7 @@ class InvoiceSum
         /* Set new calculated total */
         $this->invoice->amount = $this->formatValue($this->getTotal(), $this->precision);
 
-        if($this->rappen_rounding){
+        if($this->rappen_rounding) {
             $this->invoice->amount = $this->roundRappen($this->invoice->amount);
             $this->invoice->balance = $this->roundRappen($this->invoice->balance);
         }
@@ -269,7 +268,7 @@ class InvoiceSum
     }
 
 
-    function roundRappen($value): float
+    public function roundRappen($value): float
     {
         return round($value / .05, 0) * .05;
     }

app/Helpers/Invoice/InvoiceSumInclusive.php

@@ -279,10 +279,9 @@ class InvoiceSumInclusive
     private function setCalculatedAttributes()
     {
         /* If amount != balance then some money has been paid on the invoice, need to subtract this difference from the total to set the new balance */
-        if($this->invoice->status_id == Invoice::STATUS_CANCELLED){
+        if($this->invoice->status_id == Invoice::STATUS_CANCELLED) {
             $this->invoice->balance = 0;
-        }
+        } elseif ($this->invoice->status_id != Invoice::STATUS_DRAFT) {
-        elseif ($this->invoice->status_id != Invoice::STATUS_DRAFT) {
             if ($this->invoice->amount != $this->invoice->balance) {
                 $this->invoice->balance = $this->formatValue($this->getTotal(), $this->precision) - $this->invoice->paid_to_date;
             } else {
@@ -303,7 +302,7 @@ class InvoiceSumInclusive
         return $this;
     }
 
-    function roundRappen($value): float
+    public function roundRappen($value): float
     {
         return round($value / .05, 0) * .05;
     }

app/Helpers/Mail/GmailTransport.php

@@ -34,7 +34,7 @@ class GmailTransport extends AbstractTransport
         $message = MessageConverter::toEmail($message->getOriginalMessage());
 
         /** @phpstan-ignore-next-line **/
-        $token = $message->getHeaders()->get('gmailtoken')->getValue();
+        $token = $message->getHeaders()->get('gmailtoken')->getValue(); // @phpstan-ignore-line
         $message->getHeaders()->remove('gmailtoken');
 
         $client = new Client();
@@ -53,9 +53,8 @@ class GmailTransport extends AbstractTransport
         if ($bccs) {
             $bcc_list = 'Bcc: ';
 
-
-            /** @phpstan-ignore-next-line **/
             foreach ($bccs->getAddresses() as $address) { 
+
                 $bcc_list .= $address->getAddress() .',';
             }
 
@@ -64,23 +63,23 @@ class GmailTransport extends AbstractTransport
 
         $body->setRaw($this->base64_encode($bcc_list.$message->toString()));
 
-        try {
+        // try {
         $service->users_messages->send('me', $body, []);
-        } catch(\Google\Service\Exception $e) {
+        // } catch(\Google\Service\Exception $e) {
-            /* Need to slow down */
+        //     /* Need to slow down */
-            if ($e->getCode() == '429') {
+        //     if ($e->getCode() == '429') {
-                nlog("429 google - retrying ");
+        //         nlog("429 google - retrying ");
 
-                sleep(rand(3,8));
+        //         sleep(rand(3,8));
 
-                try {
+        //         try {
-                    $service->users_messages->send('me', $body, []);
+        //             $service->users_messages->send('me', $body, []);
-                } catch(\Google\Service\Exception $e) {
+        //         } catch(\Google\Service\Exception $e) {
 
-                }
+        //         }
 
-            }
+        //     }
-        }
+        // }
     }
 
     private function base64_encode($data)

app/Helpers/Mail/Office365MailTransport.php

@@ -55,7 +55,7 @@ class Office365MailTransport extends AbstractTransport
                 ->execute();
         } catch (\Exception $e) {
 
-            sleep(rand(5,10));
+            sleep(rand(5, 10));
 
             try {
                 $graphMessage = $graph->createRequest('POST', '/users/'.$symfony_message->getFrom()[0]->getAddress().'/sendmail')

app/Http/Controllers/AccountController.php

@@ -61,7 +61,7 @@ class AccountController extends BaseController
      * Store a newly created resource in storage.
      *
      * @param CreateAccountRequest $request
-     * @return Response
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
      *
      */
     public function store(CreateAccountRequest $request)

app/Http/Controllers/ActivityController.php

@@ -105,6 +105,14 @@ class ActivityController extends BaseController
 
     }
 
+        
+    /**
+     * downloadHistoricalEntity
+     *
+     * @param  DownloadHistoricalEntityRequest $request
+     * @param  Activity $activity
+     * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse
+     */
     public function downloadHistoricalEntity(DownloadHistoricalEntityRequest $request, Activity $activity)
     {
         $backup = $activity->backup;

app/Http/Controllers/Auth/ContactLoginController.php

@@ -41,6 +41,9 @@ class ContactLoginController extends Controller
         $company = false;
         $account = false;
 
+        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();
@@ -81,6 +84,7 @@ class ContactLoginController extends Controller
 
     public function login(Request $request)
     {
+
         Auth::shouldUse('contact');
 
         if (Ninja::isHosted() && $request->has('company_key')) {
@@ -125,6 +129,9 @@ class ContactLoginController extends Controller
 
     protected function sendLoginResponse(Request $request)
     {
+
+        $intended = $request->session()->has('url.intended') ? $request->session()->get('url.intended') : false;
+
         $request->session()->regenerate();
 
         $this->clearLoginAttempts($request);
@@ -135,6 +142,9 @@ class ContactLoginController extends Controller
 
         $this->setRedirectPath();
         
+        if($intended)
+            $this->redirectTo = $intended;
+
         return $request->wantsJson()
                     ? new JsonResponse([], 204)
                     : redirect()->intended($this->redirectPath());
@@ -146,8 +156,8 @@ class ContactLoginController extends Controller
 
         event(new ContactLoggedIn($client, $client->company, Ninja::eventVars()));
 
-        if (session()->get('url.intended')) {
+        if ($request->session()->has('url.intended')) {
-            return redirect(session()->get('url.intended'));
+            return redirect($request->session()->get('url.intended'));
         }
 
         $this->setRedirectPath();
@@ -165,19 +175,20 @@ class ContactLoginController extends Controller
 
     private function setRedirectPath()
     {
+
         if (auth()->guard('contact')->user()->client->getSetting('enable_client_portal_dashboard') === true) {
             $this->redirectTo = '/client/dashboard';
-        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES) {
+        } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES)) {
             $this->redirectTo = '/client/invoices';
-        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES) {
+        } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES)) {
             $this->redirectTo = '/client/recurring_invoices';
-        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES) {
+        } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES)) {
             $this->redirectTo = '/client/quotes';
-        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS) {
+        } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS)) {
             $this->redirectTo = '/client/credits';
-        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_TASKS) {
+        } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_TASKS)) {
             $this->redirectTo = '/client/tasks';
-        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_EXPENSES) {
+        } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_EXPENSES)) {
             $this->redirectTo = '/client/expenses';
         }
     }

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -46,7 +46,7 @@ class ForgotPasswordController extends Controller
 
     /**
      * @param Request $request
-     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
      * @throws \Illuminate\Validation\ValidationException
      */
     public function sendResetLinkEmail(Request $request)

app/Http/Controllers/Auth/LoginController.php

@@ -13,6 +13,7 @@
 namespace App\Http\Controllers\Auth;
 
 use App\DataMapper\Analytics\LoginFailure;
+use App\DataMapper\Analytics\LoginMeta;
 use App\DataMapper\Analytics\LoginSuccess;
 use App\Events\User\UserLoggedIn;
 use App\Http\Controllers\BaseController;
@@ -111,6 +112,9 @@ class LoginController extends BaseController
                 ->increment()
                 ->batch();
 
+            LightLogs::create(new LoginMeta($request->email, $request->ip, 'success'))
+                ->batch();
+
             /** @var \App\Models\User $user */
             $user = $this->guard()->user();
 
@@ -159,6 +163,9 @@ class LoginController extends BaseController
                 ->increment()
                 ->batch();
 
+            LightLogs::create(new LoginMeta($request->email, $request->ip, 'failure'))
+                ->batch();
+
             $this->incrementLoginAttempts($request);
 
             return response()
@@ -172,7 +179,7 @@ class LoginController extends BaseController
      * Refreshes the data feed with the current Company User.
      *
      * @param Request $request
-     * @return Response|JsonResponse
+     * @return \Illuminate\Http\Response|JsonResponse
      */
     public function refresh(Request $request)
     {
@@ -391,8 +398,8 @@ class LoginController extends BaseController
         $truth->setCompany($set_company);
 
         //21-03-2024
-        $cu->each(function ($cu){
+        $cu->each(function ($cu) {
-            if(CompanyToken::where('company_id', $cu->company_id)->where('user_id', $cu->user_id)->where('is_system', true)->doesntExist()){
+            if(CompanyToken::where('company_id', $cu->company_id)->where('user_id', $cu->user_id)->where('is_system', true)->doesntExist()) {
                 (new CreateCompanyToken($cu->company, $cu->user, request()->server('HTTP_USER_AGENT')))->handle();
             }
         });
@@ -481,7 +488,7 @@ class LoginController extends BaseController
      * send login response to oauthed users
      *
      * @param \App\Models\User $existing_user
-     * @return Response | JsonResponse
+     * @return Response| \Illuminate\Http\JsonResponse | JsonResponse
      */
     private function existingOauthUser($existing_user)
     {
@@ -651,7 +658,9 @@ class LoginController extends BaseController
         }
 
         if(request()->hasHeader('X-REACT') || request()->query('react')) {
-            Cache::put("react_redir:".auth()->user()?->account->key, 'true', 300);
+            /**@var \App\Models\User $user */
+            $user = auth()->user();
+            Cache::put("react_redir:".$user?->account->key, 'true', 300);
         }
 
         if (request()->has('code')) {

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -78,7 +78,7 @@ class ResetPasswordController extends Controller
      * Reset the given user's password.
      *
      * @param Request $request
-     * @return RedirectResponse|JsonResponse
+     * @return \Illuminate\Http\RedirectResponse | \Illuminate\Http\RedirectResponse|JsonResponse
      * @throws \Illuminate\Validation\ValidationException
      */
     public function reset(Request $request)

app/Http/Controllers/Bank/NordigenController.php

@@ -35,7 +35,7 @@ class NordigenController extends BaseController
         /** @var array $context */
         $context = $request->getTokenContent();
         $company = $request->getCompany();
-        $lang = $company->locale();
+        $lang = substr($company->locale(), 0, 2);
         $context["lang"] = $lang;
 
         if (!$context) {
@@ -143,7 +143,7 @@ class NordigenController extends BaseController
         $data = $request->all();
         $company = $request->getCompany();
         $account = $company->account;
-        $lang = $company->locale();
+        $lang = substr($company->locale(), 0, 2);
 
         /** @var array $context */
         $context = $request->getTokenContent();

app/Http/Controllers/Bank/YodleeController.php

@@ -301,8 +301,30 @@ class YodleeController extends BaseController
 
         $summary = $yodlee->getAccountSummary($account_number);
 
-        $transformed_summary = AccountSummary::from($summary[0]);
+        //@todo remove laravel-data
+        // $transformed_summary = AccountSummary::from($summary[0]);
+        $transformed_summary = $this->transformSummary($summary[0]);
 
         return response()->json($transformed_summary, 200);
     }
+
+    private function transformSummary($summary): array
+    {
+        $dto = new \stdClass();
+        $dto->id = $summary['id'] ?? 0;
+        $dto->account_type = $summary['CONTAINER'] ?? '';
+
+        $dto->account_status = $summary['accountStatus'] ?? '';
+        $dto->account_number = $summary['accountNumber'] ?? '';
+        $dto->provider_account_id = $summary['providerAccountId'] ?? '';
+        $dto->provider_id = $summary['providerId'] ?? '';
+        $dto->provider_name = $summary['providerName'] ?? '';
+        $dto->nickname = $summary['nickname'] ?? '';
+        $dto->account_name = $summary['accountName'] ?? '';
+        $dto->current_balance = $summary['currentBalance']['amount'] ?? 0;
+        $dto->account_currency = $summary['currentBalance']['currency'] ?? 0;
+
+        return (array)$dto;
+
+    }
 }

app/Http/Controllers/BankIntegrationController.php

@@ -55,7 +55,7 @@ class BankIntegrationController extends BaseController
 
     /**
      * @param BankIntegrationFilters $filters
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      */
     public function index(BankIntegrationFilters $filters)
     {
@@ -69,7 +69,7 @@ class BankIntegrationController extends BaseController
      *
      * @param ShowBankIntegrationRequest $request
      * @param BankIntegration $bank_integration
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      */
     public function show(ShowBankIntegrationRequest $request, BankIntegration $bank_integration)
@@ -83,7 +83,7 @@ class BankIntegrationController extends BaseController
      *
      * @param EditBankIntegrationRequest $request
      * @param BankIntegration $bank_integration
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      */
     public function edit(EditBankIntegrationRequest $request, BankIntegration $bank_integration)
@@ -96,7 +96,7 @@ class BankIntegrationController extends BaseController
      *
      * @param UpdateBankIntegrationRequest $request
      * @param BankIntegration $bank_integration
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      */
     public function update(UpdateBankIntegrationRequest $request, BankIntegration $bank_integration)
@@ -111,7 +111,7 @@ class BankIntegrationController extends BaseController
      * Show the form for creating a new resource.
      *
      * @param CreateBankIntegrationRequest $request
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      */
@@ -130,7 +130,7 @@ class BankIntegrationController extends BaseController
      * Store a newly created resource in storage.
      *
      * @param StoreBankIntegrationRequest $request
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      */
     public function store(StoreBankIntegrationRequest $request)
@@ -150,7 +150,7 @@ class BankIntegrationController extends BaseController
      *
      * @param DestroyBankIntegrationRequest $request
      * @param BankIntegration $bank_integration
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      * @throws \Exception
      */
@@ -165,7 +165,7 @@ class BankIntegrationController extends BaseController
     /**
      * Perform bulk actions on the list view.
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      */
     public function bulk(BulkBankIntegrationRequest $request)
@@ -295,7 +295,7 @@ class BankIntegrationController extends BaseController
      * Return the remote list of accounts stored on the third party provider
      * and update our local cache.
      *
-     * @return Response | JsonResponse
+     * @return Response| \Illuminate\Http\JsonResponse | JsonResponse
      *
      */
 

app/Http/Controllers/BankTransactionRuleController.php

@@ -85,7 +85,7 @@ class BankTransactionRuleController extends BaseController
      *       ),
      *     )
      * @param BankTransactionRuleFilters $filters
-     * @return Response|mixed
+     * @return Response| \Illuminate\Http\JsonResponse|mixed
      */
     public function index(BankTransactionRuleFilters $filters)
     {
@@ -99,7 +99,7 @@ class BankTransactionRuleController extends BaseController
      *
      * @param ShowBankTransactionRuleRequest $request
      * @param BankTransactionRule $bank_transaction_rule
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response|\Illuminate\Http\Response
      *
      *
      * @OA\Get(
@@ -154,7 +154,7 @@ class BankTransactionRuleController extends BaseController
      *
      * @param EditBankTransactionRuleRequest $request
      * @param BankTransactionRule $bank_transaction_rule
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
      *
      *
      * @OA\Get(
@@ -208,7 +208,7 @@ class BankTransactionRuleController extends BaseController
      *
      * @param UpdateBankTransactionRuleRequest $request
      * @param BankTransactionRule $bank_transaction_rule
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
      *
      *
      *
@@ -269,7 +269,7 @@ class BankTransactionRuleController extends BaseController
      * Show the form for creating a new resource.
      *
      * @param CreateBankTransactionRuleRequest $request
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
      *
      *
      *
@@ -317,7 +317,7 @@ class BankTransactionRuleController extends BaseController
      * Store a newly created resource in storage.
      *
      * @param StoreBankTransactionRuleRequest $request
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
      *
      *
      *
@@ -369,7 +369,7 @@ class BankTransactionRuleController extends BaseController
      *
      * @param DestroyBankTransactionRuleRequest $request
      * @param BankTransactionRule $bank_transaction_rule
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
      *
      *
      * @throws \Exception
@@ -424,7 +424,7 @@ class BankTransactionRuleController extends BaseController
     /**
      * Perform bulk actions on the list view.
      *
-     * @return \Illuminate\Support\Collection
+     * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse
      *
      * @OA\Post(
      *      path="/api/v1/bank_transation_rules/bulk",

app/Http/Controllers/BaseController.php

@@ -38,10 +38,10 @@ use App\Transformers\ArraySerializer;
 use App\Transformers\EntityTransformer;
 use League\Fractal\Resource\Collection;
 use Illuminate\Database\Eloquent\Builder;
+use InvoiceNinja\EInvoice\Decoder\Schema;
 use League\Fractal\Serializer\JsonApiSerializer;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use Illuminate\Contracts\Container\BindingResolutionException;
-use Invoiceninja\Einvoice\Decoder\Schema;
 
 /**
  * Class BaseController.
@@ -262,7 +262,7 @@ class BaseController extends Controller
 
     /**
      * 404 for the client portal.
-     * @return Response 404 response
+     * @return Response| \Illuminate\Http\JsonResponse 404 response
      */
     public function notFoundClient()
     {
@@ -279,7 +279,7 @@ class BaseController extends Controller
      *
      * @param string|array    $message        The return error message
      * @param int       $httpErrorCode  404/401/403 etc
-     * @return Response                 The JSON response
+     * @return Response| \Illuminate\Http\JsonResponse                 The JSON response
      * @throws BindingResolutionException
      */
     protected function errorResponse($message, $httpErrorCode = 400)
@@ -297,7 +297,7 @@ class BaseController extends Controller
      * Refresh API response with latest cahnges
      *
      * @param  Builder           $query
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      */
     protected function refreshResponse($query)
     {
@@ -460,7 +460,7 @@ class BaseController extends Controller
                     }
                 },
                 'company.tasks' => function ($query) use ($updated_at, $user) {
-                    $query->where('updated_at', '>=', $updated_at)->with('project','documents');
+                    $query->where('updated_at', '>=', $updated_at)->with('project', 'documents');
 
                     if (! $user->hasPermission('view_task')) {
                         $query->whereNested(function ($query) use ($user) {
@@ -798,7 +798,7 @@ class BaseController extends Controller
                     }
                 },
                 'company.tasks' => function ($query) use ($created_at, $user) {
-                    $query->where('created_at', '>=', $created_at)->with('project.documents','documents');
+                    $query->where('created_at', '>=', $created_at)->with('project.documents', 'documents');
 
                     if (! $user->hasPermission('view_task')) {
                         $query->whereNested(function ($query) use ($user) {
@@ -969,7 +969,7 @@ class BaseController extends Controller
      * Sorts the response by keys
      *
      * @param  mixed $response
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      */
     protected function response($response)
     {
@@ -995,11 +995,12 @@ class BaseController extends Controller
 
                 $response_data = Statics::company($user->getCompany()->getLocale());
 
-                if(request()->has('einvoice')){
+                if(request()->has('einvoice')) {
 
+                    if(class_exists(Schema::class)){
                         $ro = new Schema();
-                    $response_data['einvoice_schema'] = $ro('FACT1');
+                        $response_data['einvoice_schema'] = $ro('Peppol');
-
+                    }
                 }
 
                 $response['static'] = $response_data;
@@ -1020,7 +1021,7 @@ class BaseController extends Controller
      * Item Response
      *
      * @param  mixed $item
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      */
     protected function itemResponse($item)
     {

app/Http/Controllers/ClientController.php

@@ -89,7 +89,7 @@ class ClientController extends BaseController
     /**
      *
      * @param ClientFilters $filters
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      */
     public function index(ClientFilters $filters)
@@ -106,7 +106,7 @@ class ClientController extends BaseController
      *
      * @param ShowClientRequest $request
      * @param Client $client
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      */
     public function show(ShowClientRequest $request, Client $client)
@@ -119,7 +119,7 @@ class ClientController extends BaseController
      *
      * @param EditClientRequest $request
      * @param Client $client
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      */
     public function edit(EditClientRequest $request, Client $client)
@@ -132,7 +132,7 @@ class ClientController extends BaseController
      *
      * @param UpdateClientRequest $request
      * @param Client $client
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      */
     public function update(UpdateClientRequest $request, Client $client)
@@ -157,7 +157,7 @@ class ClientController extends BaseController
      * Show the form for creating a new resource.
      *
      * @param CreateClientRequest $request
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      */
     public function create(CreateClientRequest $request)
@@ -174,7 +174,7 @@ class ClientController extends BaseController
      * Store a newly created resource in storage.
      *
      * @param StoreClientRequest $request
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      */
     public function store(StoreClientRequest $request)
@@ -203,7 +203,7 @@ class ClientController extends BaseController
      *
      * @param DestroyClientRequest $request
      * @param Client $client
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      * @throws \Exception
      */
@@ -217,7 +217,7 @@ class ClientController extends BaseController
     /**
      * Perform bulk actions on the list view.
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      */
     public function bulk(BulkClientRequest $request)
@@ -250,7 +250,7 @@ class ClientController extends BaseController
             return response()->json(['message' => $hash_or_response], 200);
         }
 
-        if($action == 'assign_group' && $user->can('edit', $clients->first())){
+        if($action == 'assign_group' && $user->can('edit', $clients->first())) {
 
             $this->client_repo->assignGroup($clients, $request->group_settings_id);
 
@@ -258,7 +258,7 @@ class ClientController extends BaseController
 
         }
 
-        if($action == 'bulk_update' && $user->can('edit', $clients->first())){
+        if($action == 'bulk_update' && $user->can('edit', $clients->first())) {
 
             $clients = Client::withTrashed()
                     ->company()
@@ -284,7 +284,7 @@ class ClientController extends BaseController
      *
      * @param UploadClientRequest $request
      * @param Client $client
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      */
     public function upload(UploadClientRequest $request, Client $client)
@@ -305,7 +305,7 @@ class ClientController extends BaseController
      *
      * @param PurgeClientRequest $request
      * @param Client $client
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
      *
      */
     public function purge(PurgeClientRequest $request, Client $client)
@@ -333,7 +333,7 @@ class ClientController extends BaseController
          * @param PurgeClientRequest $request
          * @param Client $client
          * @param string $mergeable_client
-         * @return \Illuminate\Http\JsonResponse
+         * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
          *
          */
 
@@ -351,8 +351,9 @@ class ClientController extends BaseController
             return response()->json(['message' => "Client not found"], 400);
         }
 
-        if($m_client->id == $client->id) 
+        if($m_client->id == $client->id) {
             return response()->json(['message' => "Attempting to merge the same client is not possible."], 400);
+        }
 
         $merged_client = $client->service()->merge($m_client)->save();
 
@@ -364,7 +365,7 @@ class ClientController extends BaseController
      *
      * @param  PurgeClientRequest $request
      * @param  Client $client
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
      */
     public function updateTaxData(PurgeClientRequest $request, Client $client)
     {
@@ -380,7 +381,7 @@ class ClientController extends BaseController
      *
      * @param  ReactivateClientEmailRequest $request
      * @param  string $bounce_id //could also be the invitationId
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
      */
     public function reactivateEmail(ReactivateClientEmailRequest $request, string $bounce_id)
     {

app/Http/Controllers/ClientGatewayTokenController.php

@@ -89,7 +89,7 @@ class ClientGatewayTokenController extends BaseController
      *       ),
      *     )
      * @param ListClientGatewayTokenRequest $request
-     * @return Response|mixed
+     * @return Response| \Illuminate\Http\JsonResponse|mixed
      */
     public function index(ListClientGatewayTokenRequest $request)
     {
@@ -103,7 +103,7 @@ class ClientGatewayTokenController extends BaseController
      *
      * @param ShowClientGatewayTokenRequest $request
      * @param ClientGatewayToken $client_gateway_token
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -157,7 +157,7 @@ class ClientGatewayTokenController extends BaseController
      *
      * @param EditClientGatewayTokenRequest $request
      * @param ClientGatewayToken $client_gateway_token
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -211,7 +211,7 @@ class ClientGatewayTokenController extends BaseController
      *
      * @param UpdateClientGatewayTokenRequest $request
      * @param ClientGatewayToken $client_gateway_token
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -267,7 +267,7 @@ class ClientGatewayTokenController extends BaseController
      * Show the form for creating a new resource.
      *
      * @param CreateClientGatewayTokenRequest $request
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -317,7 +317,7 @@ class ClientGatewayTokenController extends BaseController
      * Store a newly created resource in storage.
      *
      * @param StoreClientGatewayTokenRequest $request
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -369,7 +369,7 @@ class ClientGatewayTokenController extends BaseController
      *
      * @param DestroyClientGatewayTokenRequest $request
      * @param ClientGatewayToken $client_gateway_token
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @throws \Exception

app/Http/Controllers/ClientPortal/ContactHashLoginController.php

@@ -21,7 +21,7 @@ class ContactHashLoginController extends Controller
     /**
      * Logs a user into the client portal using their contact_key
      * @param  string $contact_key  The contact key
-     * @return Redirect
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function login(string $contact_key)
     {
@@ -50,7 +50,7 @@ class ContactHashLoginController extends Controller
     /**
      * Generic error page for client portal.
      *
-     * @return void
+     * @return \Illuminate\View\View
      */
     public function errorPage()
     {
@@ -66,15 +66,15 @@ class ContactHashLoginController extends Controller
     {
         if (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES) {
             return '/client/invoices';
-        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES) {
+        } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES)) {
             return '/client/recurring_invoices';
-        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES) {
+        } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES)) {
             return '/client/quotes';
-        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS) {
+        } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS)) {
             return '/client/credits';
-        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_TASKS) {
+        } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_TASKS)) {
             return '/client/tasks';
-        } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_EXPENSES) {
+        } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_EXPENSES)) {
             return '/client/expenses';
         }
     }

app/Http/Controllers/ClientPortal/InvitationController.php

@@ -115,14 +115,16 @@ class InvitationController extends Controller
                         ]);
             }
             
+            if(!auth()->guard('contact')->check()){
                 $this->middleware('auth:contact');
-            return redirect()->route('client.login');
+                return redirect()->route('client.login', ['intended' => route('client.'.$entity.'.show', [$entity => $this->encodePrimaryKey($invitation->{$key}), 'silent' => $is_silent])]);
+            }
+
         } else {
             request()->session()->invalidate();
             auth()->guard('contact')->loginUsingId($client_contact->id, true);
         }
 
-
         if (auth()->guard('contact')->user() && ! request()->has('silent') && ! $invitation->viewed_date) {
             $invitation->markViewed();
 

app/Http/Controllers/ClientPortal/PaymentController.php

@@ -103,7 +103,7 @@ class PaymentController extends Controller
      * and invoice ids for reference.
      *
      * @param Request $request
-     * @return RedirectResponse|mixed
+     * @return \Illuminate\Http\RedirectResponse|mixed
      */
     public function process(Request $request)
     {
@@ -157,7 +157,7 @@ class PaymentController extends Controller
      * Pay for invoice/s using credits only.
      *
      * @param Request $request The request object
-     * @return \Response         The response view
+     * @return \Illuminate\Http\RedirectResponse        The response view
      */
     public function credit_response(Request $request)
     {

app/Http/Controllers/ClientPortal/PaymentMethodController.php

@@ -127,7 +127,7 @@ class PaymentMethodController extends Controller
      * Remove the specified resource from storage.
      *
      * @param ClientGatewayToken $payment_method
-     * @return RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy(ClientGatewayToken $payment_method)
     {

app/Http/Controllers/ClientPortal/PrePaymentController.php

@@ -48,6 +48,9 @@ class PrePaymentController extends Controller
             'allows_recurring' => true,
             'minimum' => $minimum,
             'minimum_amount' =>  $minimum_amount,
+            'notes' => request()->has('notes') ? request()->input('notes') : "",
+            'amount' => request()->has('amount') ? request()->input('amount') : "",
+            'show' => request()->has('is_recurring') ? "true" : "false",
         ];
 
         return $this->render('pre_payments.index', $data);

app/Http/Controllers/ClientPortal/ProfileController.php

@@ -38,7 +38,7 @@ class ProfileController extends Controller
      *
      * @param UpdateContactRequest $request
      * @param ClientContact $client_contact
-     * @return RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse
      */
     public function update(UpdateContactRequest $request, ClientContact $client_contact)
     {

app/Http/Controllers/ClientPortal/QuoteController.php

@@ -178,7 +178,7 @@ class QuoteController extends Controller
             ->where('client_id', auth()->guard('contact')->user()->client->id)
             ->where('company_id', auth()->guard('contact')->user()->client->company_id)
             ->whereIn('status_id', [Quote::STATUS_DRAFT, Quote::STATUS_SENT])
-            ->where(function ($q){
+            ->where(function ($q) {
                 $q->whereNull('due_date')->orWhere('due_date', '>=', now());
             })
             ->withTrashed()

app/Http/Controllers/ClientPortal/RecurringInvoiceController.php

@@ -66,7 +66,7 @@ class RecurringInvoiceController extends Controller
      * @param  RequestCancellationRequest $request           [description]
      * @param  RecurringInvoice           $recurring_invoice [description]
      *
-     * @return \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View
      */
     public function requestCancellation(RequestCancellationRequest $request, RecurringInvoice $recurring_invoice)
     {

app/Http/Controllers/ClientPortal/TempRouteController.php

@@ -13,14 +13,13 @@ namespace App\Http\Controllers\ClientPortal;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Redirect;
 
 class TempRouteController extends Controller
 {
     /**
      * Logs a user into the client portal using their contact_key
      * @param  string $hash  The hash
-     * @return Redirect
+     * @return \Illuminate\View\View
      */
     public function index(string $hash)
     {

app/Http/Controllers/ClientPortal/UploadController.php

@@ -26,7 +26,7 @@ class UploadController extends Controller
      * Main logic behind uploading the files.
      *
      * @param StoreUploadRequest $request
-     * @return Response|ResponseFactory
+     * @return Response| \Illuminate\Http\JsonResponse|ResponseFactory
      */
     public function __invoke(StoreUploadRequest $request)
     {

app/Http/Controllers/ClientStatementController.php

@@ -33,7 +33,7 @@ class ClientStatementController extends BaseController
      * Update the specified resource in storage.
      *
      * @param CreateStatementRequest $request
-     * @return Response
+     * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse
      */
     public function statement(CreateStatementRequest $request)
     {

app/Http/Controllers/CompanyController.php

@@ -78,7 +78,7 @@ class CompanyController extends BaseController
     /**
      * Display a listing of the resource.
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      * @OA\Get(
      *      path="/api/v1/companies",
@@ -117,16 +117,26 @@ class CompanyController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        $companies = Company::whereAccountId($user->company()->account->id);
+        $companies = Company::where('account_id', $user->company()->account->id);
 
         return $this->listResponse($companies);
     }
 
+    public function current()
+    {
+        /** @var \App\Models\User $user */
+        $user = auth()->user();
+
+        $company = Company::find($user->company()->id);
+
+        return $this->itemResponse($company);
+    }
+
     /**
      * Show the form for creating a new resource.
      *
      * @param CreateCompanyRequest $request
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -176,7 +186,7 @@ class CompanyController extends BaseController
      * Store a newly created resource in storage.
      *
      * @param StoreCompanyRequest $request
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Post(
@@ -262,7 +272,7 @@ class CompanyController extends BaseController
      *
      * @param ShowCompanyRequest $request
      * @param Company $company
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -316,7 +326,7 @@ class CompanyController extends BaseController
      *
      * @param EditCompanyRequest $request
      * @param Company $company
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -370,7 +380,7 @@ class CompanyController extends BaseController
      *
      * @param UpdateCompanyRequest $request
      * @param Company $company
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Put(
@@ -447,7 +457,7 @@ class CompanyController extends BaseController
      *
      * @param DestroyCompanyRequest $request
      * @param Company $company
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @throws \Exception
@@ -563,7 +573,7 @@ class CompanyController extends BaseController
      *
      * @param UploadCompanyRequest $request
      * @param Company $company
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -626,7 +636,7 @@ class CompanyController extends BaseController
      *
      * @param DefaultCompanyRequest $request
      * @param Company $company
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -696,6 +706,11 @@ class CompanyController extends BaseController
         return $this->itemResponse($company->fresh());
     }
 
+    /**
+     * 
+     *
+     * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse
+     */
     public function logo()
     {
 
@@ -705,18 +720,16 @@ class CompanyController extends BaseController
         $logo = strlen($company->settings->company_logo) > 5 ? $company->settings->company_logo : 'https://pdf.invoicing.co/favicon-v2.png';
         $headers = ['Content-Disposition' => 'inline'];
 
-        try{
+        try {
             $response = \Illuminate\Support\Facades\Http::get($logo);
 
             if ($response->successful()) {
                 $logo = $response->body();
-            }
+            } else {
-            else {
                 $logo = base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=');
             }
 
-        }
+        } catch(\Exception $e) {
-        catch(\Exception $e){
 
             $logo = base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=');
 

app/Http/Controllers/CompanyGatewayController.php

@@ -72,7 +72,7 @@ class CompanyGatewayController extends BaseController
     /**
      * Display a listing of the resource.
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -119,7 +119,7 @@ class CompanyGatewayController extends BaseController
      * Show the form for creating a new resource.
      *
      * @param CreateCompanyGatewayRequest $request
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -168,7 +168,7 @@ class CompanyGatewayController extends BaseController
      * Store a newly created resource in storage.
      *
      * @param StoreCompanyGatewayRequest $request
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -248,7 +248,7 @@ class CompanyGatewayController extends BaseController
      *
      * @param ShowCompanyGatewayRequest $request
      * @param CompanyGateway $company_gateway
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -302,7 +302,7 @@ class CompanyGatewayController extends BaseController
      *
      * @param EditCompanyGatewayRequest $request
      * @param CompanyGateway $company_gateway
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -356,7 +356,7 @@ class CompanyGatewayController extends BaseController
      *
      * @param UpdateCompanyGatewayRequest $request
      * @param CompanyGateway $company_gateway
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Put(
@@ -420,7 +420,7 @@ class CompanyGatewayController extends BaseController
 
         if($company_gateway->gateway_key == $this->checkout_key) {
             CheckoutSetupWebhook::dispatch($company_gateway->company->company_key, $company_gateway->fresh()->id);
-        }elseif($company_gateway->gateway_key == $this->forte_key){
+        } elseif($company_gateway->gateway_key == $this->forte_key) {
 
             dispatch(function () use ($company_gateway) {
                 MultiDB::setDb($company_gateway->company->db);
@@ -437,7 +437,7 @@ class CompanyGatewayController extends BaseController
      *
      * @param DestroyCompanyGatewayRequest $request
      * @param CompanyGateway $company_gateway
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @throws \Exception
@@ -494,7 +494,7 @@ class CompanyGatewayController extends BaseController
     /**
      * Perform bulk actions on the list view.
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Post(
@@ -567,10 +567,11 @@ class CompanyGatewayController extends BaseController
     {
 
         //Throttle here
-        if (Cache::has("throttle_polling:import_customers:{$company_gateway->company->company_key}:{$company_gateway->hashed_id}")) 
+        if (Cache::has("throttle_polling:import_customers:{$company_gateway->company->company_key}:{$company_gateway->hashed_id}")) {
             return response()->json(['message' => 'Please wait whilst your previous attempts complete.'], 200);
+        }
 
-        dispatch(function () use($company_gateway) {
+        dispatch(function () use ($company_gateway) {
             MultiDB::setDb($company_gateway->company->db);
             $company_gateway->driver()->importCustomers();
         })->afterResponse();

app/Http/Controllers/CompanyLedgerController.php

@@ -31,7 +31,7 @@ class CompanyLedgerController extends BaseController
      * Store a newly created resource in storage.
      *
      * @param ShowCompanyLedgerRequest $request
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      * @OA\Get(
      *      path="/api/v1/company_ledger",

app/Http/Controllers/CompanyUserController.php

@@ -107,7 +107,7 @@ class CompanyUserController extends BaseController
      *     )
      * @param UpdateCompanyUserRequest $request
      * @param User $user
-     * @return Response|mixed|void
+     * @return Response| \Illuminate\Http\JsonResponse|mixed|void
      */
     public function update(UpdateCompanyUserRequest $request, User $user)
     {

app/Http/Controllers/ConnectedAccountController.php

@@ -38,7 +38,7 @@ class ConnectedAccountController extends BaseController
      * Connect an OAuth account to a regular email/password combination account
      *
      * @param Request $request
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
      *
      *
      * @OA\Post(

app/Http/Controllers/Contact/InvoiceController.php

@@ -36,7 +36,7 @@ class InvoiceController extends BaseController
      *
      * @param InvoiceFilters $filters  The filters
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      */
     public function index(InvoiceFilters $filters)
     {

app/Http/Controllers/Contact/LoginController.php

@@ -58,7 +58,7 @@ class LoginController extends BaseController
      *
      * @param Request $request The request
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
      * @throws \Illuminate\Validation\ValidationException
      */
     public function apiLogin(Request $request)
@@ -86,7 +86,7 @@ class LoginController extends BaseController
      * Redirect the user to the provider authentication page.
      *
      * @param string $provider
-     * @return void
+     * @return mixed
      */
     public function redirectToProvider(string $provider)
     {

app/Http/Controllers/CreditController.php

@@ -69,7 +69,7 @@ class CreditController extends BaseController
      *
      * @param CreditFilters $filters  The filters
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      * @OA\Get(
      *      path="/api/v1/credits",
@@ -115,7 +115,7 @@ class CreditController extends BaseController
      *
      * @param CreateCreditRequest $request  The request
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -164,7 +164,7 @@ class CreditController extends BaseController
      *
      * @param StoreCreditRequest $request  The request
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Post(
@@ -226,7 +226,7 @@ class CreditController extends BaseController
      * @param ShowCreditRequest $request  The request
      * @param Credit $credit  The credit
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -281,7 +281,7 @@ class CreditController extends BaseController
      * @param EditCreditRequest $request The request
      * @param Credit $credit The credit
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      * @OA\Get(
      *      path="/api/v1/credits/{id}/edit",
@@ -334,7 +334,7 @@ class CreditController extends BaseController
      *
      * @param UpdateCreditRequest $request The request
      * @param Credit $credit
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @throws \ReflectionException
@@ -458,7 +458,7 @@ class CreditController extends BaseController
     /**
      * Perform bulk actions on the list view.
      *
-     * @return \Illuminate\Support\Collection
+     * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse | \Illuminate\Http\Response
      *
      * @OA\Post(
      *      path="/api/v1/credits/bulk",
@@ -700,7 +700,7 @@ class CreditController extends BaseController
      *       ),
      *     )
      * @param $invitation_key
-     * @return \Symfony\Component\HttpFoundation\BinaryFileResponse
+     * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse | \Illuminate\Http\Response
      */
     public function downloadPdf($invitation_key)
     {
@@ -768,7 +768,7 @@ class CreditController extends BaseController
      *       ),
      *     )
      * @param $invitation_key
-     * @return \Symfony\Component\HttpFoundation\BinaryFileResponse
+     * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse | \Illuminate\Http\Response
      */
     public function downloadECredit($invitation_key)
     {
@@ -801,7 +801,7 @@ class CreditController extends BaseController
      *
      * @param UploadCreditRequest $request
      * @param Credit $credit
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *

app/Http/Controllers/DesignController.php

@@ -82,7 +82,7 @@ class DesignController extends BaseController
      *       ),
      *     )
      * @param DesignFilters $filters
-     * @return Response|mixed
+     * @return Response| \Illuminate\Http\JsonResponse|mixed
      */
     public function index(DesignFilters $filters)
     {
@@ -96,7 +96,7 @@ class DesignController extends BaseController
      *
      * @param ShowDesignRequest $request
      * @param Design $design
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -150,7 +150,7 @@ class DesignController extends BaseController
      *
      * @param EditDesignRequest $request
      * @param Design $design
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -204,7 +204,7 @@ class DesignController extends BaseController
      *
      * @param UpdateDesignRequest $request
      * @param Design $design
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -265,7 +265,7 @@ class DesignController extends BaseController
      * Show the form for creating a new resource.
      *
      * @param CreateDesignRequest $request
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -313,7 +313,7 @@ class DesignController extends BaseController
      * Store a newly created resource in storage.
      *
      * @param StoreDesignRequest $request
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -415,7 +415,7 @@ class DesignController extends BaseController
      *
      * @param DestroyDesignRequest $request
      * @param Design $design
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @throws \Exception
@@ -473,7 +473,7 @@ class DesignController extends BaseController
     /**
      * Perform bulk actions on the list view.
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Post(

app/Http/Controllers/DocumentController.php

@@ -70,7 +70,7 @@ class DocumentController extends BaseController
      *       ),
      *     )
      * @param DocumentFilters $filters
-     * @return Response|mixed
+     * @return Response| \Illuminate\Http\JsonResponse|mixed
      */
     public function index(DocumentFilters $filters)
     {
@@ -105,7 +105,7 @@ class DocumentController extends BaseController
      *
      * @param ShowDocumentRequest $request
      * @param Document $document
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      */
     public function show(ShowDocumentRequest $request, Document $document)
     {
@@ -131,7 +131,7 @@ class DocumentController extends BaseController
      *
      * @param EditDocumentRequest $request
      * @param Document $document
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      */
     public function edit(EditDocumentRequest $request, Document $document)
     {
@@ -143,7 +143,7 @@ class DocumentController extends BaseController
      *
      * @param UpdateDocumentRequest $request
      * @param Document $document
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      */
     public function update(UpdateDocumentRequest $request, Document $document)
     {
@@ -158,7 +158,7 @@ class DocumentController extends BaseController
      *
      * @param DestroyDocumentRequest $request
      * @param Document $document
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      */
     public function destroy(DestroyDocumentRequest $request, Document $document)
     {

app/Http/Controllers/ExpenseCategoryController.php

@@ -78,7 +78,7 @@ class ExpenseCategoryController extends BaseController
      *
      * Display a listing of the resource.
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      */
     public function index(ExpenseCategoryFilters $filters)
     {
@@ -93,7 +93,7 @@ class ExpenseCategoryController extends BaseController
      * Show the form for creating a new resource.
      *
      * @param CreateExpenseCategoryRequest $request
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -142,7 +142,7 @@ class ExpenseCategoryController extends BaseController
      * Store a newly created resource in storage.
      *
      * @param StoreExpenseCategoryRequest $request
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Post(
@@ -192,7 +192,7 @@ class ExpenseCategoryController extends BaseController
      *
      * @param ShowExpenseCategoryRequest $request
      * @param ExpenseCategory $expense_category
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -245,7 +245,7 @@ class ExpenseCategoryController extends BaseController
      *
      * @param EditExpenseCategoryRequest $request
      * @param ExpenseCategory $expense_category
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -298,7 +298,7 @@ class ExpenseCategoryController extends BaseController
      *
      * @param UpdateExpenseCategoryRequest $request
      * @param ExpenseCategory $expense_category
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -355,7 +355,7 @@ class ExpenseCategoryController extends BaseController
      *
      * @param DestroyExpenseCategoryRequest $request
      * @param ExpenseCategory $expense_category
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @throws \Exception
@@ -410,7 +410,7 @@ class ExpenseCategoryController extends BaseController
     /**
      * Perform bulk actions on the list view.
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Post(

app/Http/Controllers/ExpenseController.php

@@ -98,7 +98,7 @@ class ExpenseController extends BaseController
      *       ),
      *     )
      * @param ExpenseFilters $filters
-     * @return Response|mixed
+     * @return Response| \Illuminate\Http\JsonResponse|mixed
      */
     public function index(ExpenseFilters $filters)
     {
@@ -112,7 +112,7 @@ class ExpenseController extends BaseController
      *
      * @param ShowExpenseRequest $request
      * @param Expense $expense
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -166,7 +166,7 @@ class ExpenseController extends BaseController
      *
      * @param EditExpenseRequest $request
      * @param Expense $expense
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -220,7 +220,7 @@ class ExpenseController extends BaseController
      *
      * @param UpdateExpenseRequest $request
      * @param Expense $expense
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -286,7 +286,7 @@ class ExpenseController extends BaseController
      * Show the form for creating a new resource.
      *
      * @param CreateExpenseRequest $request
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -334,7 +334,7 @@ class ExpenseController extends BaseController
      * Store a newly created resource in storage.
      *
      * @param StoreExpenseRequest $request
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *
@@ -387,7 +387,7 @@ class ExpenseController extends BaseController
      *
      * @param DestroyExpenseRequest $request
      * @param Expense $expense
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @throws \Exception
@@ -441,7 +441,7 @@ class ExpenseController extends BaseController
     /**
      * Perform bulk actions on the list view.
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Post(
@@ -524,7 +524,7 @@ class ExpenseController extends BaseController
      *
      * @param UploadExpenseRequest $request
      * @param Expense $expense
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *

app/Http/Controllers/FilterController.php

@@ -24,7 +24,7 @@ class FilterController extends BaseController
     /**
      * Display a listing of the resource.
      *
-     * @return void
+     * @return \Illuminate\Http\JsonResponse
      */
     public function index(Request $request, string $entity)
     {

app/Http/Controllers/GroupSettingController.php

@@ -55,7 +55,7 @@ class GroupSettingController extends BaseController
      * Show the form for creating a new resource.
      *
      * @param GroupSettingFilters $filters
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
     */
     public function index(GroupSettingFilters $filters)
@@ -69,7 +69,7 @@ class GroupSettingController extends BaseController
      * Show the form for creating a new resource.
      *
      * @param CreateGroupSettingRequest $request
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
     */
     public function create(CreateGroupSettingRequest $request)
@@ -86,7 +86,7 @@ class GroupSettingController extends BaseController
      * Store a newly created resource in storage.
      *
      * @param StoreGroupSettingRequest $request
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      */
     public function store(StoreGroupSettingRequest $request)
@@ -108,7 +108,7 @@ class GroupSettingController extends BaseController
      *
      * @param ShowGroupSettingRequest $request
      * @param GroupSetting $group_setting
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      */
     public function show(ShowGroupSettingRequest $request, GroupSetting $group_setting)
@@ -121,7 +121,7 @@ class GroupSettingController extends BaseController
      *
      * @param EditGroupSettingRequest $request
      * @param GroupSetting $group_setting
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      */
     public function edit(EditGroupSettingRequest $request, GroupSetting $group_setting)
@@ -134,7 +134,7 @@ class GroupSettingController extends BaseController
      *
      * @param UpdateGroupSettingRequest $request
      * @param GroupSetting $group_setting
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      */
     public function update(UpdateGroupSettingRequest $request, GroupSetting $group_setting)
@@ -158,7 +158,7 @@ class GroupSettingController extends BaseController
      *
      * @param DestroyGroupSettingRequest $request
      * @param GroupSetting $group_setting
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @throws \Exception
@@ -173,7 +173,7 @@ class GroupSettingController extends BaseController
     /**
      * Perform bulk actions on the list view.
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      */
     public function bulk()
@@ -210,7 +210,7 @@ class GroupSettingController extends BaseController
      *
      * @param UploadGroupSettingRequest $request
      * @param GroupSetting $group_setting
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      */
     public function upload(UploadGroupSettingRequest $request, GroupSetting $group_setting)

app/Http/Controllers/ImportController.php

@@ -27,7 +27,7 @@ class ImportController extends Controller
      *
      * @param PreImportRequest $request
      *
-     * @return \Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
      *
      * @OA\Post(
      *      path="/api/v1/preimport",

app/Http/Controllers/InvoiceController.php

@@ -81,7 +81,7 @@ class InvoiceController extends BaseController
      *
      * @param InvoiceFilters $filters  The filters
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      * @OA\Get(
      *      path="/api/v1/invoices",
@@ -128,7 +128,7 @@ class InvoiceController extends BaseController
      *
      * @param CreateInvoiceRequest $request  The request
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -176,7 +176,7 @@ class InvoiceController extends BaseController
      *
      * @param StoreInvoiceRequest $request  The request
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Post(
@@ -248,7 +248,7 @@ class InvoiceController extends BaseController
      * @param ShowInvoiceRequest $request  The request
      * @param Invoice $invoice  The invoice
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Get(
@@ -303,7 +303,7 @@ class InvoiceController extends BaseController
      * @param EditInvoiceRequest $request  The request
      * @param Invoice $invoice  The invoice
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      * @OA\Get(
      *      path="/api/v1/invoices/{id}/edit",
@@ -357,7 +357,7 @@ class InvoiceController extends BaseController
      * @param UpdateInvoiceRequest $request  The request
      * @param Invoice $invoice  The invoice
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      * @OA\Put(
@@ -408,7 +408,7 @@ class InvoiceController extends BaseController
         }
 
         if ($invoice->isLocked()) {
-            return response()->json(['message' => ctrans('texts.locked_invoice')], 422);
+            return response()->json(['message' => '', 'errors' => ['number' => ctrans('texts.locked_invoice')]], 422);
         }
 
         $old_invoice = $invoice->line_items;
@@ -800,7 +800,7 @@ class InvoiceController extends BaseController
      *       ),
      *     )
      * @param $invitation_key
-     * @return \Symfony\Component\HttpFoundation\BinaryFileResponse
+     * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse | \Illuminate\Http\Response
      */
     public function downloadPdf($invitation_key)
     {
@@ -870,7 +870,7 @@ class InvoiceController extends BaseController
      *       ),
      *     )
      * @param $invitation_key
-     * @return \Symfony\Component\HttpFoundation\BinaryFileResponse
+     * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse | \Illuminate\Http\Response
      */
     public function downloadEInvoice($invitation_key)
     {
@@ -938,7 +938,7 @@ class InvoiceController extends BaseController
      *       ),
      *     )
      * @param $invoice
-     * @return \Symfony\Component\HttpFoundation\BinaryFileResponse
+     * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse | \Illuminate\Http\Response
      */
     public function deliveryNote(ShowInvoiceRequest $request, Invoice $invoice)
     {
@@ -954,7 +954,7 @@ class InvoiceController extends BaseController
      *
      * @param UploadInvoiceRequest $request
      * @param Invoice $invoice
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      *
      *

app/Http/Controllers/LicenseController.php

@@ -28,7 +28,7 @@ class LicenseController extends BaseController
     /**
      * Claim a white label license.
      *
-     * @return Response
+     * @return Response| \Illuminate\Http\JsonResponse
      *
      * @OA\Get(
      *      path="/api/v1/claim_license",