Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

app/Filters/ClientFilters.php

@@ -18,6 +18,7 @@ use Illuminate\Database\Eloquent\Builder;
  */
 class ClientFilters extends QueryFilters
 {
+
     /**
      * Filter by name.
      *

app/Filters/QueryFilters.php

@@ -293,8 +293,16 @@ abstract class QueryFilters
         return $this->builder;
     }
 
-    public function with(string $value): Builder
+    public function with(string $value = ''): Builder
     {
+        if (strlen($value) == 0) {
+            return $this->builder;
+        }
+
+        if($this->with_property == 'id') {
+            $value = $this->decodePrimaryKey($value);
+        }
+
         return $this->builder
             ->orWhere($this->with_property, $value)
             ->orderByRaw("{$this->with_property} = ? DESC", [$value])

app/Providers/AppServiceProvider.php

@@ -40,15 +40,15 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        // DB::listen(function($query) {
+        \DB::listen(function($query) {
-        //     nlog(
+            nlog(
-        //         $query->sql,
+                $query->sql,
-        //         [
+                [
-        //             'bindings' => $query->bindings,
+                    'bindings' => $query->bindings,
-        //             'time' => $query->time
+                    'time' => $query->time
-        //         ]
+                ]
-        //     );
+            );
-        // });
+        });
 
         // Model::preventLazyLoading(
         //     !$this->app->isProduction()

phpstan.neon

@@ -4,8 +4,8 @@ includes:
 parameters:
     ignoreErrors:
         - '#Call to an undefined method .*badMethod\(\)#'
-        - 'Call to an undefined method Illuminate\Database\Eloquent\Builder::exclude().
+        - '#Call to an undefined method Illuminate\Database\Eloquent\Builder::exclude#'
-    level: 2
+    level: 4
     paths:
         - app
     universalObjectCratesClasses:

tests/Feature/EInvoice/FacturaeTest.php

@@ -9,7 +9,7 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-namespace Tests\Feature;
+namespace Tests\Feature\EInvoice;
 
 use App\Services\Invoice\EInvoice\FacturaEInvoice;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -19,7 +19,6 @@ use Tests\TestCase;
 
 /**
  * @test
- * @covers App\Http\Controllers\ActivityController
  */
 class FacturaeTest extends TestCase
 {

tests/Feature/EInvoice/FatturaPATest.php

@@ -9,7 +9,7 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-namespace Tests\Feature;
+namespace Tests\Feature\EInvoice;
 
 use App\Services\Invoice\EInvoice\FatturaPA;
 use Illuminate\Foundation\Testing\DatabaseTransactions;

tests/Feature/Export/ArDetailReportTest.php

@@ -19,7 +19,6 @@ use App\Models\Company;
 use App\Models\Invoice;
 use App\Models\User;
 use App\Services\Report\ARDetailReport;
-use App\Services\Report\UserSalesReport;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Routing\Middleware\ThrottleRequests;
 use Tests\MockAccountData;
@@ -28,7 +27,7 @@ use Tests\TestCase;
 /**
  * @test
  */
-class ARDetailReportTest extends TestCase
+class ArDetailReportTest extends TestCase
 {
     use MakesHash;
 

tests/Feature/Export/ArSummaryReportTest.php

@@ -27,7 +27,7 @@ use Tests\TestCase;
 /**
  * @test
  */
-class ARSummaryReportTest extends TestCase
+class ArSummaryReportTest extends TestCase
 {
     use MakesHash;