Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 08:21:34 +02:00
Code Issues Releases Activity

Working on recurringDates Array

Browse Source
This commit is contained in:
David Bomba 2020-09-12 20:33:12 +10:00
parent 89dcd43e47
commit 2b877d3414
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/Models/RecurringInvoice.php
View File

@ -219,7 +219,11 @@ class RecurringInvoice extends BaseModel
{
if ($this->remaining_cycles == 0) {
return 0;
} else {
}
else if($this->remaining_cycles == -1) {
return -1;
}
else {
return $this->remaining_cycles - 1;
}
}
@ -298,5 +302,43 @@ class RecurringInvoice extends BaseModel
public function recurringDates()
{
//todo send back a list of the next send dates and due dates
/* Return early if nothing to send back! */
if( $this->status_id == self::STATUS_COMPLETED ||
$this->status_id == self::STATUS_DRAFT ||
$this->status_id == self::STATUS_CANCELLED ||
$this->remaining_cycles == 0) {
return [];
}
/* Endless - lets send 10 back*/
$iterations = $this->remaining_cycles;
if($this->remaining_cycles == -1)
$iterations = 10;
$next_send_date = $this->next_send_date;
$due_date_days = $this->due_date_days;
if(!$due_date_days)
$due_date_days = 1;
$data = [];
for($x=0; $x<$iterations; $x++)
{
$data[] = [
'next_send_date' => $next_send_date->format('Y-m-d'),
'due_date' => $next_send_date->addDays($due_date_days)->format('Y-m-d')
];
}
return $data;
}
}

2
database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
View File

@ -69,6 +69,8 @@ class AddIsPublicToDocumentsTable extends Migration
Schema::table('recurring_invoices', function (Blueprint $table) {
$table->integer('remaining_cycles')->nullable()->change();
$table->dropColumn('start_date');
$table->integer('due_date_days')->nullable();
});
}