Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-05 07:24:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on recurring

Browse Source
This commit is contained in:
David Bomba 2020-10-06 12:36:25 +11:00
parent 484b28d3ce
commit 4fe1c29751
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Middleware/QueryLogging.php
View File

@ -53,7 +53,7 @@ class QueryLogging
Log::info($request->method().' - '.$request->url().": $count queries - ".$time); Log::info($request->method().' - '.$request->url().": $count queries - ".$time);
// if($count > 50) // if($count > 50)
Log::info($queries); // Log::info($queries);
} }
} }

4
app/Models/RecurringInvoice.php
View File

@ -392,13 +392,13 @@ class RecurringInvoice extends BaseModel
{ {
// we don't add the days... we calc the day of the month!! // we don't add the days... we calc the day of the month!!
$next_due_date = $this->calculateDueDate($next_send_date->copy()->format('Y-m-d')); $next_due_date = $this->calculateDueDate($next_send_date->copy()->format('Y-m-d'));
$next_due_date_string = $next_due_date ? $next_due_date->format('Y-m-d') : '';
$next_send_date = Carbon::parse($next_send_date); $next_send_date = Carbon::parse($next_send_date);
// $next_due_date = Carbon::parse($next_due_date);
$data[] = [ $data[] = [
'send_date' => $next_send_date->format('Y-m-d'), 'send_date' => $next_send_date->format('Y-m-d'),
'due_date' => $next_due_date->format('Y-m-d'), 'due_date' => $next_due_date_string
]; ];
$next_send_date = $this->nextDateByFrequency($next_send_date->format('Y-m-d')); $next_send_date = $this->nextDateByFrequency($next_send_date->format('Y-m-d'));