diff --git a/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php b/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php index e6e5556174b2..4a8d34fe58b2 100644 --- a/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php +++ b/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php @@ -49,7 +49,7 @@ class StoreSchedulerRequest extends Request '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.date_key' => ['bail','sometimes', 'string'], - 'parameters.status' => ['bail','sometimes', 'string', 'in:all,draft,paid,unpaid,overdue'], + 'parameters.status' => ['bail','sometimes', 'string'], ]; return $rules; @@ -71,6 +71,14 @@ class StoreSchedulerRequest extends Request $input['parameters']['clients'] = []; } + if(isset($input['parameters']['status'])) { + + $input['parameters']['status'] = collect(explode(",", $input['parameter']['status'])) + ->filter(function($status) { + return in_array($status, ['all','draft','paid','unpaid','overdue']); + })->implode(",") ?? ''; + } + $this->replace($input); } } diff --git a/app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php b/app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php index 882c5f971271..1c04329d2806 100644 --- a/app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php +++ b/app/Http/Requests/TaskScheduler/UpdateSchedulerRequest.php @@ -46,6 +46,7 @@ class UpdateSchedulerRequest extends Request '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,client,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'], ]; return $rules; @@ -67,6 +68,15 @@ class UpdateSchedulerRequest extends Request $input['parameters']['clients'] = []; } + if(isset($input['parameters']['status'])) { + + $input['parameters']['status'] = collect(explode(",", $input['parameter']['status'])) + ->filter(function ($status) { + return in_array($status, ['all','draft','paid','unpaid','overdue']); + })->implode(",") ?? ''; + } + + $this->replace($input);