Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 03:57:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Minor updates

Browse Source
This commit is contained in:
David Bomba 2024-09-29 14:33:22 +10:00
parent 498fb51faa
commit 256d30ee66
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php
View File

@ -62,8 +62,8 @@ class StoreSchedulerRequest extends Request
'parameters' => 'bail|array', 'parameters' => 'bail|array',
'parameters.clients' => ['bail','sometimes', 'array', new ValidClientIds()], 'parameters.clients' => ['bail','sometimes', 'array', new ValidClientIds()],
'parameters.date_range' => 'bail|sometimes|string|in:last7_days,last30_days,last365_days,this_month,last_month,this_quarter,last_quarter,this_year,last_year,all_time,custom,all', 'parameters.date_range' => 'bail|sometimes|string|in:last7_days,last30_days,last365_days,this_month,last_month,this_quarter,last_quarter,this_year,last_year,all_time,custom,all',
'parameters.start_date' => ['bail', 'sometimes', 'date:Y-m-d', 'required_if:parameters.date_rate,custom'], 'parameters.start_date' => ['bail', 'date:Y-m-d', 'required_if:parameters.date_rate,custom'],
'parameters.end_date' => ['bail', 'sometimes', 'date:Y-m-d', 'required_if:parameters.date_rate,custom', 'after_or_equal:parameters.start_date'], 'parameters.end_date' => ['bail', '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' => ['bail', 'sometimes', 'string', 'in:invoice,credit,quote,purchase_order'],
'parameters.entity_id' => ['bail', 'sometimes', 'string'], 'parameters.entity_id' => ['bail', 'sometimes', 'string'],
'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,activities,client,clients,client_contact,client_contacts,credit,credits,document,documents,expense,expenses,invoice,invoices,invoice_item,invoice_items,quote,quotes,quote_item,quote_items,recurring_invoice,recurring_invoices,payment,payments,product,products,task,tasks'], '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,activities,client,clients,client_contact,client_contacts,credit,credits,document,documents,expense,expenses,invoice,invoices,invoice_item,invoice_items,quote,quotes,quote_item,quote_items,recurring_invoice,recurring_invoices,payment,payments,product,products,task,tasks'],

8
app/Jobs/Ninja/TaskScheduler.php
View File

@ -57,13 +57,13 @@ class TaskScheduler implements ShouldQueue
->cursor() ->cursor()
->each(function ($scheduler) { ->each(function ($scheduler) {
nlog("Doing job {$scheduler->name}"); nlog("Doing job ::{$scheduler->id}:: {$scheduler->name}");
try { try {
//@var \App\Models\Schedule $scheduler //@var \App\Models\Schedule $scheduler
$scheduler->service()->runTask(); $scheduler->service()->runTask();
} catch(\Exception $e) { } catch(\Exception $e) {
nlog("Exception:: TaskScheduler:: Doing job {$scheduler->name}" . $e->getMessage()); nlog("Exception:: TaskScheduler:: Doing job :: {$scheduler->id} :: {$scheduler->name}" . $e->getMessage());
} }
}); });
@ -83,13 +83,13 @@ class TaskScheduler implements ShouldQueue
->cursor() ->cursor()
->each(function ($scheduler) { ->each(function ($scheduler) {
nlog("Doing job {$scheduler->name}"); nlog("Doing job ::{$scheduler->id}:: {$scheduler->name}");
try { try {
/** @var \App\Models\Scheduler $scheduler */ /** @var \App\Models\Scheduler $scheduler */
$scheduler->service()->runTask(); $scheduler->service()->runTask();
} catch(\Exception $e) { } catch(\Exception $e) {
nlog("Exception:: TaskScheduler::" . $e->getMessage()); nlog("Exception:: TaskScheduler:: #{$scheduler->id}::" . $e->getMessage());
nlog($e->getMessage()); nlog($e->getMessage());
} }