tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes for recurring invoice subscription ID passing

Browse source
This commit is contained in:
David Bomba 2021-07-15 11:31:11 +10:00
parent 46bc8fa495
commit 6a771de80c
2 changed files with 59 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Factory/RecurringInvoiceToInvoiceFactory.php
View file

@ -38,6 +38,8 @@ class RecurringInvoiceToInvoiceFactory
$invoice->tax_rate2 = $recurring_invoice->tax_rate2;
$invoice->tax_name3 = $recurring_invoice->tax_name3;
$invoice->tax_rate3 = $recurring_invoice->tax_rate3;
$invoice->total_taxes = $recurring_invoice->total_taxes;
$invoice->subscription_id = $recurring_invoice->subscription_id;
$invoice->custom_value1 = $recurring_invoice->custom_value1;
$invoice->custom_value2 = $recurring_invoice->custom_value2;
$invoice->custom_value3 = $recurring_invoice->custom_value3;

57
tests/Feature/RecurringInvoiceTest.php
View file

@ -10,6 +10,8 @@
*/
namespace Tests\Feature;
use App\Factory\InvoiceToRecurringInvoiceFactory;
use App\Factory\RecurringInvoiceToInvoiceFactory;
use App\Models\Client;
use App\Models\ClientContact;
use App\Models\RecurringInvoice;
@ -155,4 +157,59 @@ class RecurringInvoiceTest extends TestCase
$response->assertStatus(200);
}
public function testSubscriptionIdPassesToInvoice()
{
$recurring_invoice = InvoiceToRecurringInvoiceFactory::create($this->invoice);
$recurring_invoice->user_id = $this->user->id;
$recurring_invoice->next_send_date = \Carbon\Carbon::now()->addDays(10);
$recurring_invoice->status_id = RecurringInvoice::STATUS_ACTIVE;
$recurring_invoice->remaining_cycles = 2;
$recurring_invoice->next_send_date = \Carbon\Carbon::now()->addDays(10);
$recurring_invoice->save();
$recurring_invoice->number = $this->getNextRecurringInvoiceNumber($this->invoice->client, $this->invoice);
$recurring_invoice->subscription_id = 10;
$recurring_invoice->save();
$invoice = RecurringInvoiceToInvoiceFactory::create($recurring_invoice, $this->client);
$this->assertEquals(10, $invoice->subscription_id);
}
public function testSubscriptionIdPassesToInvoiceIfNull()
{
$recurring_invoice = InvoiceToRecurringInvoiceFactory::create($this->invoice);
$recurring_invoice->user_id = $this->user->id;
$recurring_invoice->next_send_date = \Carbon\Carbon::now()->addDays(10);
$recurring_invoice->status_id = RecurringInvoice::STATUS_ACTIVE;
$recurring_invoice->remaining_cycles = 2;
$recurring_invoice->next_send_date = \Carbon\Carbon::now()->addDays(10);
$recurring_invoice->save();
$recurring_invoice->number = $this->getNextRecurringInvoiceNumber($this->invoice->client, $this->invoice);
$recurring_invoice->save();
$invoice = RecurringInvoiceToInvoiceFactory::create($recurring_invoice, $this->client);
$this->assertEquals(null, $invoice->subscription_id);
}
public function testSubscriptionIdPassesToInvoiceIfNothingSet()
{
$recurring_invoice = InvoiceToRecurringInvoiceFactory::create($this->invoice);
$recurring_invoice->user_id = $this->user->id;
$recurring_invoice->next_send_date = \Carbon\Carbon::now()->addDays(10);
$recurring_invoice->status_id = RecurringInvoice::STATUS_ACTIVE;
$recurring_invoice->remaining_cycles = 2;
$recurring_invoice->next_send_date = \Carbon\Carbon::now()->addDays(10);
$recurring_invoice->save();
$recurring_invoice->number = $this->getNextRecurringInvoiceNumber($this->invoice->client, $this->invoice);
$recurring_invoice->save();
$invoice = RecurringInvoiceToInvoiceFactory::create($recurring_invoice, $this->client);
$this->assertEquals(null, $invoice->subscription_id);
}
}