diff --git a/app/Export/CSV/BaseExport.php b/app/Export/CSV/BaseExport.php index c3d9c2fdeb4f..1cfd5bf6d880 100644 --- a/app/Export/CSV/BaseExport.php +++ b/app/Export/CSV/BaseExport.php @@ -1309,7 +1309,7 @@ class BaseExport if(auth()->user() && auth()->user()->account_id == $this->company->account_id) $user = auth()->user(); - if($this->input['user_id']) + if($this->input['user_id'] ?? false) $user = User::where('id', $this->input['user_id'])->where('account_id', $this->company->account_id)->first(); ZipDocuments::dispatch($documents, $this->company, $user); diff --git a/app/Export/CSV/ExpenseExport.php b/app/Export/CSV/ExpenseExport.php index 50fd64835e5e..3ab505511330 100644 --- a/app/Export/CSV/ExpenseExport.php +++ b/app/Export/CSV/ExpenseExport.php @@ -104,7 +104,6 @@ class ExpenseExport extends BaseExport $query = $this->addCategoryFilter($query, $this->input['categories']); } - nlog($this->input); if($this->input['document_email_attachment'] ?? false) { $this->queueDocuments($query); } @@ -123,8 +122,6 @@ class ExpenseExport extends BaseExport //insert the header $this->csv->insertOne($this->buildHeader()); - nlog("expense counter = "); - nlog($query->count()); $query->cursor() ->each(function ($expense) { $this->csv->insertOne($this->buildRow($expense)); diff --git a/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php b/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php index 78481ef80717..42416cea35c6 100644 --- a/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php +++ b/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php @@ -47,7 +47,7 @@ class StoreSchedulerRequest extends Request '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', 'nullable', 'string'], ];