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

13
tests/Invoice/Calculator/ShortInvoiceCalculatorTest.php
View File

@@ -56,7 +56,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setBegin(new \DateTime('2018-11-29'))
->setEnd(new \DateTime())
->addTag((new Tag())->setName('foo'))
->addTag((new Tag())->setName('bar'))
@@ -70,7 +70,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setBegin(new \DateTime('2018-11-28'))
->setEnd(new \DateTime())
->addTag((new Tag())->setName('bar1'))
;
@@ -83,7 +83,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setBegin(new \DateTime('2018-11-29'))
->setEnd(new \DateTime())
;
@@ -106,8 +106,11 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
$this->assertEquals(5800, $sut->getTimeWorked());
$this->assertEquals(1, \count($sut->getEntries()));
/** @var InvoiceItem $result */
$result = $sut->getEntries()[0];
$entries = $sut->getEntries();
self::assertCount(1, $entries);
$result = $entries[0];
$this->assertEquals('2018-11-28', $result->getBegin()?->format('Y-m-d'));
$this->assertEquals('activity description', $result->getDescription());
$this->assertEquals(293.27, $result->getHourlyRate());
$this->assertNull($result->getFixedRate());