Merge pull request #9248 from turbo124/v5-develop

Fixes for edge cases in reports
invoiceninja · Feb 5, 2024 · 4ec312b · 4ec312b
2 parents fe82342 + 150258b
commit 4ec312b
Show file tree

Hide file tree

Showing 4 changed files with 715 additions and 329 deletions.
diff --git a/app/Export/CSV/BaseExport.php b/app/Export/CSV/BaseExport.php
@@ -450,9 +450,18 @@ class BaseExport
     protected function filterByClients($query)
     {
         if (isset($this->input['client_id']) && $this->input['client_id'] != 'all') {
+
+            if(!is_int($this->input['client_id'])) 
+                $this->input['client_id'] = $this->decodePrimaryKey($this->input['client_id']);
+
             $client = Client::withTrashed()->find($this->input['client_id']);
+
+            if(!$client)
+                return $query;
+
             $this->client_description = $client->present()->name;
             return $query->where('client_id', $this->input['client_id']);
+
         } elseif(isset($this->input['clients']) && count($this->input['clients']) > 0) {
 
             $this->client_description = 'Multiple Clients';

diff --git a/app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php b/app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php
@@ -45,7 +45,7 @@ public function rules(): array
             'parameters.end_date' => ['bail', 'sometimes', 'date:Y-m-d', 'required_if:parameters.date_rate,custom', 'after_or_equal:parameters.start_date'],
             'parameters.entity' => ['bail', 'sometimes', 'string', 'in:invoice,credit,quote,purchase_order'],
             'parameters.entity_id' => ['bail', 'sometimes', 'string'],
-            'parameters.report_name' => ['bail','sometimes', 'string', 'required_if:template,email_report','in:ar_detailed,ar_summary,client_balance,tax_summary,profitloss,client_sales,user_sales,product_sales,activity,client,contact,client_contact,credit,document,expense,invoice,invoice_item,quote,quote_item,recurring_invoice,payment,product,task'],
+            'parameters.report_name' => ['bail','sometimes', 'string', 'required_if:template,email_report','in:vendor,purchase_order_item,purchase_order,ar_detailed,ar_summary,client_balance,tax_summary,profitloss,client_sales,user_sales,product_sales,activity,client,contact,client_contact,credit,document,expense,invoice,invoice_item,quote,quote_item,recurring_invoice,payment,product,task'],
             'parameters.date_key' => ['bail','sometimes', 'string'],
             'parameters.status' => ['bail','sometimes', 'string'],
         ];