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

Fix for no due date set on recurring invoices

Browse Source
This commit is contained in:
David Bomba 2020-10-04 20:47:38 +11:00
parent fccc98caa7
commit a6234da23a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Models/RecurringInvoice.php
View File

@ -392,9 +392,9 @@ 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_send_date = Carbon::parse($next_send_date); $next_send_date = Carbon::parse($next_send_date);
$next_due_date = Carbon::parse($next_due_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'),
@ -406,12 +406,12 @@ class RecurringInvoice extends BaseModel
} }
/*If no due date is set - unset the due_date value */ /*If no due date is set - unset the due_date value */
if(!$this->due_date_days || $this->due_date_days == 0){ // if(!$this->due_date_days || $this->due_date_days == 0){
foreach($data as $key => $value) // foreach($data as $key => $value)
$data[$key]['due_date'] = ''; // $data[$key]['due_date'] = '';
} // }
return $data; return $data;