jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

add subtotal and payment date to invoices (#2450)

Browse Source
This commit is contained in:
Philipp
2021-03-29 00:51:34 +02:00
committed by GitHub
parent 7029bde555
commit d84beb957c
11 changed files with 222 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/Controller/InvoiceControllerTest.php
View File

@@ -320,6 +320,29 @@ class InvoiceControllerTest extends ControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
$this->request($client, '/invoice/change-status/' . $id . '/paid');
$this->assertTrue($client->getResponse()->isSuccessful());
$this->assertHasValidationError(
$client,
'/invoice/change-status/' . $id . '/paid',
'form[name=invoice_payment_date_form]',
[
'invoice_payment_date_form' => [
'paymentDate' => 'invalid'
]
],
['#invoice_payment_date_form_paymentDate']
);
$this->assertTrue($client->getResponse()->isSuccessful());
$form = $client->getCrawler()->filter('form[name=invoice_payment_date_form]')->form();
$client->submit($form, [
'invoice_payment_date_form' => [
'paymentDate' => (new \DateTime())->format('Y-m-d')
]
]);
$this->assertIsRedirect($client, '/invoice/show');
$client->followRedirect();
$this->assertTrue($client->getResponse()->isSuccessful());

11
tests/Entity/InvoiceTest.php
View File

@@ -52,6 +52,7 @@ class InvoiceTest extends TestCase
self::assertFalse($sut->isPending());
self::assertFalse($sut->isPaid());
self::assertFalse($sut->isOverdue());
self::assertNull($sut->getPaymentDate());
}
public function testSetterAndGetter()
@@ -75,6 +76,15 @@ class InvoiceTest extends TestCase
self::assertFalse($sut->isPaid());
self::assertFalse($sut->isOverdue());
$paymentDate = new \DateTime();
$sut->setPaymentDate($paymentDate);
self::assertEquals($paymentDate, $sut->getPaymentDate());
$sut->setIsPending();
self::assertNull($sut->getPaymentDate());
$sut->setPaymentDate($paymentDate);
$sut->setIsNew();
self::assertNull($sut->getPaymentDate());
$sut->setModel($this->getInvoiceModel($date));
self::assertTrue($sut->isOverdue());
@@ -86,6 +96,7 @@ class InvoiceTest extends TestCase
self::assertNull($sut->getId());
self::assertNull($sut->getInvoiceFilename());
self::assertEquals(date('ymd', $date->getTimestamp()), $sut->getInvoiceNumber());
self::assertEquals(293.27, $sut->getSubtotal());
self::assertEquals(55.72, $sut->getTax());
self::assertEquals(348.99, $sut->getTotal());
self::assertNotNull($sut->getUser());