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

Release 2.41 (#5653)

Browse Source
This commit is contained in:
Kevin Papst
2025-11-08 23:03:44 +01:00
committed by GitHub
parent 636a51e721
commit 1a38c7d7a3
57 changed files with 705 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/Invoice/Calculator/PriceInvoiceCalculatorTest.php
View File

@@ -68,13 +68,16 @@ class PriceInvoiceCalculatorTest extends AbstractCalculatorTestCase
$timesheet2 = new Timesheet();
$timesheet2->setBegin(new DateTime('2018-11-29'));
$timesheet2->setEnd(new DateTime());
$timesheet2->setDuration(400);
$timesheet2->setDuration(400); // 396
$timesheet2->setHourlyRate(293.27);
$timesheet2->setRate(84.75);
$timesheet2->setRate(84.75); // 32,26
$timesheet2->setUser($user);
$timesheet2->setActivity((new Activity())->setName('bar'));
$timesheet2->setProject($project2);
// 325,53
// duration 4000 = 3996
$timesheet3 = new Timesheet();
$timesheet3->setBegin(new DateTime('2018-11-28'));
$timesheet3->setEnd(new DateTime());
@@ -85,25 +88,34 @@ class PriceInvoiceCalculatorTest extends AbstractCalculatorTestCase
$timesheet3->setActivity((new Activity())->setName('foo'));
$timesheet3->setProject($project1);
// 325,53+111,11
// duration 1800
$timesheet4 = new Timesheet();
$timesheet4->setBegin(new DateTime('2018-11-28'));
$timesheet4->setEnd(new DateTime());
$timesheet4->setDuration(400);
$timesheet4->setDuration(400); // 396
$timesheet4->setHourlyRate(0);
$timesheet4->setRate(1947.99);
$timesheet4->setUser($user);
$timesheet4->setActivity((new Activity())->setName('blub'));
$timesheet4->setProject($project2);
// 325,53+111,11+1947,99
// duration 400
$timesheet5 = new Timesheet();
$timesheet5->setBegin(new DateTime('2018-11-28'));
$timesheet5->setEnd(new DateTime());
$timesheet5->setDuration(400);
$timesheet5->setDuration(400); // 396
$timesheet5->setRate(84);
$timesheet5->setUser(new User());
$timesheet5->setActivity(new Activity());
$timesheet5->setProject($project3);
// 325,53+111,11+1947,99+84
// duration 400
$entries = [$timesheet, $timesheet2, $timesheet3, $timesheet4, $timesheet5];
$query = new InvoiceQuery();
@@ -115,12 +127,14 @@ class PriceInvoiceCalculatorTest extends AbstractCalculatorTestCase
$sut = $this->getCalculator();
$sut->setModel($model);
// (325,53+111,11+1947,99+84)*1,19
self::assertEquals('price', $sut->getId());
self::assertEquals(3000.13, $sut->getTotal());
self::assertEquals(2937.67, $sut->getTotal());
$this->assertTax($sut, 19);
self::assertEquals('EUR', $model->getCurrency());
self::assertEquals(2521.12, $sut->getSubtotal());
self::assertEquals(6600, $sut->getTimeWorked());
self::assertEquals(2468.63, $sut->getSubtotal());
self::assertEquals(6596, $sut->getTimeWorked());
$entries = $sut->getEntries();
self::assertCount(4, $entries);
@@ -130,7 +144,7 @@ class PriceInvoiceCalculatorTest extends AbstractCalculatorTestCase
self::assertEquals('2018-11-28', $entries[2]->getBegin()?->format('Y-m-d'));
self::assertEquals('2018-11-29', $entries[3]->getBegin()?->format('Y-m-d'));
self::assertEquals(378.02, $entries[3]->getRate());
self::assertEquals(325.53, $entries[3]->getRate());
self::assertEquals(111.11, $entries[0]->getRate());
self::assertEquals(1947.99, $entries[1]->getRate());
self::assertEquals(84, $entries[2]->getRate());

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

@@ -94,11 +94,11 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTestCase
$sut->setModel($model);
self::assertEquals('short', $sut->getId());
self::assertEquals(562.28, $sut->getTotal());
self::assertEquals(561.87, $sut->getTotal());
$this->assertTax($sut, 19);
self::assertEquals('EUR', $model->getCurrency());
self::assertEquals(472.5, $sut->getSubtotal());
self::assertEquals(5800, $sut->getTimeWorked());
self::assertEquals(472.16, $sut->getSubtotal());
self::assertEquals(5796, $sut->getTimeWorked());
self::assertEquals(1, \count($sut->getEntries()));
$entries = $sut->getEntries();
@@ -109,8 +109,8 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTestCase
self::assertEquals('', $result->getDescription());
self::assertEquals(293.27, $result->getHourlyRate());
self::assertNull($result->getFixedRate());
self::assertEquals(472.5, $result->getRate());
self::assertEquals(5800, $result->getDuration());
self::assertEquals(472.16, $result->getRate());
self::assertEquals(5796, $result->getDuration());
self::assertEquals(3, $result->getAmount());
self::assertEquals(['foo', 'bar', 'bar1'], $result->getTags());
}

22
tests/Invoice/InvoiceItemTest.php
View File

@@ -25,7 +25,8 @@ class InvoiceItemTest extends TestCase
self::assertNull($sut->getFixedRate());
self::assertNull($sut->getEnd());
self::assertEquals(0.00, $sut->getRate());
self::assertEquals(0.00, $sut->getInternalRate());
self::assertEquals(0.00, $sut->getInternalRate()); // @phpstan-ignore method.deprecated
self::assertEquals(0.00, $sut->getAppliedRate());
self::assertNull($sut->getProject());
self::assertIsArray($sut->getAdditionalFields());
self::assertEmpty($sut->getAdditionalFields());
@@ -53,4 +54,23 @@ class InvoiceItemTest extends TestCase
$sut->addTag('foo1');
self::assertEquals(['foo', 'foo1', 'BaR'], $sut->getTags());
}
public function testRates(): void
{
$sut = new InvoiceItem();
self::assertEquals(0.00, $sut->getHourlyRate());
self::assertNull($sut->getFixedRate());
self::assertEquals(0.00, $sut->getAppliedRate());
$sut->setHourlyRate(13.50);
self::assertEquals(13.50, $sut->getHourlyRate());
self::assertNull($sut->getFixedRate());
self::assertEquals(13.50, $sut->getAppliedRate());
$sut->setFixedRate(30.24);
self::assertEquals(13.50, $sut->getHourlyRate());
self::assertEquals(30.24, $sut->getFixedRate());
self::assertEquals(30.24, $sut->getAppliedRate());
}
}