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

sort invoice items by date before passing to template (#4495)

Browse Source
This commit is contained in:
Kevin Papst
2023-12-17 16:50:47 +01:00
committed by GitHub
parent 5f4b6d3cfa
commit 2edcbcca50
14 changed files with 113 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/Invoice/Calculator/DateInvoiceCalculatorTest.php
View File

@@ -37,6 +37,7 @@ class DateInvoiceCalculatorTest extends AbstractCalculatorTest
public function testWithMultipleEntries(): void
{
$date = new DateTime();
$customer = new Customer('foo');
$template = new InvoiceTemplate();
$template->setVat(19);
@@ -85,7 +86,7 @@ class DateInvoiceCalculatorTest extends AbstractCalculatorTest
$timesheet4 = new Timesheet();
$timesheet4
->setBegin(new DateTime())
->setBegin($date)
->setEnd(new DateTime('2018-11-28'))
->setDuration(400)
->setRate(1947.99)
@@ -123,8 +124,11 @@ class DateInvoiceCalculatorTest extends AbstractCalculatorTest
$entries = $sut->getEntries();
self::assertCount(3, $entries);
$this->assertEquals(378.02, $entries[0]->getRate());
$this->assertEquals(195.11, $entries[1]->getRate());
$this->assertEquals('2018-11-28', $entries[0]->getBegin()?->format('Y-m-d'));
$this->assertEquals('2018-11-29', $entries[1]->getBegin()?->format('Y-m-d'));
$this->assertEquals($date->format('Y-m-d'), $entries[2]->getBegin()?->format('Y-m-d'));
$this->assertEquals(378.02, $entries[1]->getRate());
$this->assertEquals(195.11, $entries[0]->getRate());
$this->assertEquals(1947.99, $entries[2]->getRate());
self::assertEquals(2521.12, $entries[0]->getRate() + $entries[1]->getRate() + $entries[2]->getRate());
}