Merge branch 'v5-develop' into einvoicing-peppol-form-api

Signed-off-by: David Bomba <[email protected]>
turbo124 · Oct 21, 2024 · 73364b5 · 73364b5
2 parents 56264b1 + e697790
commit 73364b5
Show file tree

Hide file tree

Showing 150 changed files with 4,881 additions and 837 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-5.10.34
+5.10.42
diff --git a/app/Console/Commands/CreateSingleAccount.php b/app/Console/Commands/CreateSingleAccount.php
@@ -385,9 +385,12 @@ private function createSmallAccount()
 
         });
 
-
         $this->countryClients($company, $user);
 
+        $cc = ClientContact::where('company_id', $company->id)->latest()->first();
+        $cc->email = '[email protected]';
+        $cc->save();
+
         $this->info("finished");
 
     }
@@ -472,13 +475,13 @@ private function createClient($company, $user)
                 'company_id' => $company->id,
             ]);
 
-        ClientContact::factory()->create([
-                    'user_id' => $user->id,
-                    'client_id' => $client->id,
-                    'company_id' => $company->id,
-                    'is_primary' => 1,
-                    'email' => '[email protected]',
-                ]);
+        // ClientContact::factory()->create([
+        //             'user_id' => $user->id,
+        //             'client_id' => $client->id,
+        //             'company_id' => $company->id,
+        //             'is_primary' => 1,
+        //             'email' => '[email protected]',
+        //         ]);
 
         ClientContact::factory()->count(rand(1, 2))->create([
                     'user_id' => $user->id,
@@ -490,7 +493,6 @@ private function createClient($company, $user)
 
         $settings = $client->settings;
         $settings->currency_id = "1";
-        //        $settings->use_credits_payment = "always";
 
         $client->settings = $settings;
 

diff --git a/app/Console/Commands/TypeCheck.php b/app/Console/Commands/TypeCheck.php
@@ -11,15 +11,18 @@
 
 namespace App\Console\Commands;
 
-use App\Libraries\MultiDB;
 use App\Models\Client;
 use App\Models\Company;
-use App\Utils\Traits\ClientGroupSettingsSaver;
+use App\Models\Invoice;
+use App\Libraries\MultiDB;
 use Illuminate\Console\Command;
+use App\Utils\Traits\CleanLineItems;
+use App\Utils\Traits\ClientGroupSettingsSaver;
 
 class TypeCheck extends Command
 {
     use ClientGroupSettingsSaver;
+    use CleanLineItems;
 
     /**
      * The name and signature of the console command.
@@ -126,6 +129,13 @@ private function checkAll()
             $this->logMessage("Checking company {$company->id}");
             $company->saveSettings($company->settings, $company);
         });
+
+        Invoice::query()->cursor()->each(function ($invoice){
+            $this->logMessage("Checking invoice {$invoice->id}");
+            $invoice->line_items = $this->cleanItems($invoice->line_items);
+            $invoice->saveQuietly();
+        });
+
     }
 
     private function logMessage($str)

diff --git a/app/DataMapper/Tax/TaxModel.php b/app/DataMapper/Tax/TaxModel.php
@@ -35,7 +35,7 @@ public function __construct(public mixed $model = null)
             $this->regions = $this->init();
         } else {
 
-            if(is_null($model->seller_subregion)) {
+            if(is_null($model->seller_subregion)) {//@phpstan-ignore-line
                 $this->seller_subregion = '';
             }
 

diff --git a/app/Events/Credit/CreditWasCreated.php b/app/Events/Credit/CreditWasCreated.php
@@ -11,17 +11,21 @@
 
 namespace App\Events\Credit;
 
+use App\Models\BaseModel;
 use App\Models\Company;
 use App\Models\Credit;
+use App\Utils\Traits\Invoice\Broadcasting\DefaultResourceBroadcast;
 use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
-class CreditWasCreated
+class CreditWasCreated implements ShouldBroadcast
 {
     use Dispatchable;
     use InteractsWithSockets;
     use SerializesModels;
+    use DefaultResourceBroadcast;
 
     public $credit;
 
@@ -41,5 +45,12 @@ public function __construct(Credit $credit, Company $company, array $event_vars)
         $this->credit = $credit;
         $this->company = $company;
         $this->event_vars = $event_vars;
+
+        $this->dontBroadcastToCurrentUser();
+    }
+
+    public function broadcastModel(): BaseModel
+    {
+        return $this->credit;
     }
 }
diff --git a/app/Events/Credit/CreditWasUpdated.php b/app/Events/Credit/CreditWasUpdated.php
@@ -11,17 +11,21 @@
 
 namespace App\Events\Credit;
 
+use App\Models\BaseModel;
 use App\Models\Company;
 use App\Models\Credit;
+use App\Utils\Traits\Invoice\Broadcasting\DefaultResourceBroadcast;
 use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 
-class CreditWasUpdated
+class CreditWasUpdated implements ShouldBroadcast
 {
     use Dispatchable;
     use InteractsWithSockets;
     use SerializesModels;
+    use DefaultResourceBroadcast;
 
     public $credit;
 
@@ -41,5 +45,12 @@ public function __construct(Credit $credit, Company $company, array $event_vars)
         $this->credit = $credit;
         $this->company = $company;
         $this->event_vars = $event_vars;
+
+        $this->dontBroadcastToCurrentUser();
+    }
+
+    public function broadcastModel(): BaseModel
+    {
+        return $this->credit;
     }
 }
diff --git a/app/Events/Invoice/InvoiceWasPaid.php b/app/Events/Invoice/InvoiceWasPaid.php
@@ -12,10 +12,11 @@
 
 namespace App\Events\Invoice;
 
+use App\Models\BaseModel;
 use App\Models\Company;
 use App\Models\Invoice;
 use App\Models\Payment;
-use App\Utils\Traits\Invoice\Broadcasting\DefaultInvoiceBroadcast;
+use App\Utils\Traits\Invoice\Broadcasting\DefaultResourceBroadcast;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Queue\SerializesModels;
@@ -25,7 +26,7 @@
  */
 class InvoiceWasPaid implements ShouldBroadcast
 {
-    use SerializesModels, DefaultInvoiceBroadcast, InteractsWithSockets;
+    use SerializesModels, DefaultResourceBroadcast, InteractsWithSockets;
 
     /**
      * Create a new event instance.
@@ -39,4 +40,9 @@ public function __construct(public Invoice $invoice, public Payment $payment, pu
     {
         $this->dontBroadcastToCurrentUser();
     }
+
+    public function broadcastModel(): BaseModel
+    {
+        return $this->invoice;
+    }
 }
diff --git a/app/Events/Invoice/InvoiceWasViewed.php b/app/Events/Invoice/InvoiceWasViewed.php
@@ -11,17 +11,23 @@
 
 namespace App\Events\Invoice;
 
+use App\Models\BaseModel;
 use App\Models\Company;
 use App\Models\InvoiceInvitation;
+use App\Utils\Traits\Invoice\Broadcasting\DefaultResourceBroadcast;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Queue\SerializesModels;
+use League\Fractal\Manager;
 
 /**
  * Class InvoiceWasViewed.
  */
-class InvoiceWasViewed
+class InvoiceWasViewed implements ShouldBroadcast
 {
     use SerializesModels;
-
+    use InteractsWithSockets;
+    use DefaultResourceBroadcast;
 
     /**
      * Create a new event instance.
@@ -32,5 +38,18 @@ class InvoiceWasViewed
      */
     public function __construct(public InvoiceInvitation $invitation, public Company $company, public array $event_vars)
     {
+        //
+    }
+
+    public function broadcastModel(): BaseModel
+    {
+        return $this->invitation->invoice;
+    }
+
+    public function broadcastManager(Manager $manager): Manager
+    {
+        $manager->parseIncludes('client');
+
+        return $manager;
     }
 }
diff --git a/app/Events/Payment/PaymentWasUpdated.php b/app/Events/Payment/PaymentWasUpdated.php
@@ -11,16 +11,20 @@
 
 namespace App\Events\Payment;
 
+use App\Models\BaseModel;
 use App\Models\Company;
 use App\Models\Payment;
+use App\Utils\Traits\Invoice\Broadcasting\DefaultResourceBroadcast;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Queue\SerializesModels;
 
 /**
  * Class PaymentWasUpdated.
  */
-class PaymentWasUpdated
+class PaymentWasUpdated implements ShouldBroadcast
 {
-    use SerializesModels;
+    use SerializesModels, InteractsWithSockets, DefaultResourceBroadcast;
 
     /**
      * @var Payment
@@ -43,5 +47,12 @@ public function __construct(Payment $payment, Company $company, array $event_var
         $this->payment = $payment;
         $this->company = $company;
         $this->event_vars = $event_vars;
+
+        $this->dontBroadcastToCurrentUser();
+    }
+
+    public function broadcastModel(): BaseModel
+    {
+        return $this->payment;
     }
 }
diff --git a/app/Export/CSV/TaskExport.php b/app/Export/CSV/TaskExport.php
@@ -62,10 +62,9 @@ public function init(): Builder
 
         if (count($this->input['report_keys']) == 0) {
             $this->input['report_keys'] = array_values($this->task_report_keys);
+            $this->input['report_keys'] = array_merge($this->input['report_keys'], array_diff($this->forced_client_fields, $this->input['report_keys']));
         }
 
-        $this->input['report_keys'] = array_merge($this->input['report_keys'], array_diff($this->forced_client_fields, $this->input['report_keys']));
-
         $query = Task::query()
                         ->withTrashed()
                         ->where('company_id', $this->company->id);
@@ -207,15 +206,23 @@ private function iterateLogs(Task $task, array $entity)
                 $entity['task.end_time'] = ctrans('texts.is_running');
             }
 
+            $seconds = $task->calcDuration();
+            $time_log_entry = (isset($item[1]) && $item[1] != 0) ? $item[1] - $item[0] : ctrans('texts.is_running');
+
             if (in_array('task.duration', $this->input['report_keys']) || in_array('duration', $this->input['report_keys'])) {
-                $seconds = $task->calcDuration();
                 $entity['task.duration'] = $seconds;
-                $entity['task.duration_words'] =  $seconds > 86400 ? CarbonInterval::seconds($seconds)->locale($this->company->locale())->cascade()->forHumans() : now()->startOfDay()->addSeconds($seconds)->format('H:i:s');
+            }
 
-                $time_log_entry = (isset($item[1]) && $item[1] != 0) ? $item[1] - $item[0] : ctrans('texts.is_running');
+            if (in_array('task.time_log', $this->input['report_keys']) || in_array('time_log', $this->input['report_keys'])) {
                 $entity['task.time_log'] = $time_log_entry;
-                $entity['task.time_log_duration_words'] =  is_int($time_log_entry) && $time_log_entry > 86400 ? CarbonInterval::seconds($time_log_entry)->locale($this->company->locale())->cascade()->forHumans() : $time_log_entry;
+            }
 
+            if (in_array('task.time_log_duration_words', $this->input['report_keys']) || in_array('time_log_duration_words', $this->input['report_keys'])) {
+                $entity['task.time_log_duration_words'] =  is_int($time_log_entry) ? CarbonInterval::seconds($time_log_entry)->locale($this->company->locale())->cascade()->forHumans() : $time_log_entry;
+            }
+
+            if (in_array('task.duration_words', $this->input['report_keys']) || in_array('duration_words', $this->input['report_keys'])) {
+                $entity['task.duration_words'] =  $seconds > 86400 ? CarbonInterval::seconds($seconds)->locale($this->company->locale())->cascade()->forHumans() : now()->startOfDay()->addSeconds($seconds)->format('H:i:s');
             }
 
             if (in_array('task.billable', $this->input['report_keys']) || in_array('billable', $this->input['report_keys'])) {
@@ -227,7 +234,6 @@ private function iterateLogs(Task $task, array $entity)
             }
 
 
-
             $this->storage_array[] = $entity;
 
             $entity['task.start_date'] = '';
@@ -237,7 +243,7 @@ private function iterateLogs(Task $task, array $entity)
             $entity['task.duration'] = '';
             $entity['task.duration_words'] = '';
             $entity['task.time_log'] = '';
-            $entity['task.time_log_duration_words'];
+            $entity['task.time_log_duration_words'] = '';
             $entity['task.billable'] = '';
             $entity['task.item_notes'] = '';
 

diff --git a/app/Filters/ExpenseFilters.php b/app/Filters/ExpenseFilters.php
@@ -177,6 +177,15 @@ public function categories(string $categories = ''): Builder
         return $this->builder->whereIn('category_id', $categories_keys);
     }
 
+    public function amount(string $amount = ''): Builder
+    {
+        if (strlen($amount) == 0) {
+            return $this->builder;
+        }
+
+        return $this->builder->where('amount', $amount);
+    }
+
     public function number(string $number = ''): Builder
     {
         if (strlen($number) == 0) {

diff --git a/app/Filters/InvoiceFilters.php b/app/Filters/InvoiceFilters.php
@@ -276,7 +276,7 @@ public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
-        if (!is_array($sort_col) || count($sort_col) != 2 || in_array($sort_col[0], ['documents'])) {
+        if (!is_array($sort_col) || count($sort_col) != 2 || !in_array($sort_col[0], \Illuminate\Support\Facades\Schema::getColumnListing($this->builder->getModel()->getTable()))) {
             return $this->builder;
         }
 
@@ -290,9 +290,6 @@ public function sort(string $sort = ''): Builder
         }
 
         if($sort_col[0] == 'number') {
-            // return $this->builder->orderByRaw('CAST(number AS UNSIGNED), number ' . $dir);
-            // return $this->builder->orderByRaw("number REGEXP '^[A-Za-z]+$',CAST(number as SIGNED INTEGER),CAST(REPLACE(number,'-','')AS SIGNED INTEGER) ,number");
-            // return $this->builder->orderByRaw('ABS(number) ' . $dir);
             return $this->builder->orderByRaw("REGEXP_REPLACE(invoices.number,'[^0-9]+','')+0 " . $dir);
         }
 

diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php
@@ -59,7 +59,7 @@ public function index(ShowInvoicesRequest $request)
     public function show(ShowInvoiceRequest $request, Invoice $invoice, ?string $hash = null)
     {
         set_time_limit(0);
-
+        
         $invitation = $invoice->invitations()->where('client_contact_id', auth()->guard('contact')->user()->id)->first();
 
         // @phpstan-ignore-next-line
@@ -91,7 +91,6 @@ public function show(ShowInvoiceRequest $request, Invoice $invoice, ?string $has
 
         return auth()->guard('contact')->user()->client->getSetting('payment_flow') == 'default' ? $this->render('invoices.show', $data) : $this->render('invoices.show_smooth', $data);
 
-        // return $this->render('invoices.show_smooth', $data);
     }
 
     public function showBlob($hash)

diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php
@@ -644,8 +644,6 @@ private function performAction(Credit $credit, $action, $bulk = false)
                     EmailEntity::dispatch($invitation, $credit->company, 'credit');
                 });
 
-                // $credit->sendEvent(Webhook::EVENT_SENT_CREDIT, "client");
-
                 if (! $bulk) {
                     return response()->json(['message' => 'email sent'], 200);
                 }