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

Release 1.6.1 (#1282)

Browse Source
This commit is contained in:
Kevin Papst
2019-11-26 17:22:31 +01:00
committed by GitHub
parent 724eb9c658
commit 5ee0396a02
27 changed files with 240 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@ use App\Entity\Project;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Invoice\Calculator\ShortInvoiceCalculator;
use App\Invoice\InvoiceItem;
use App\Invoice\InvoiceModel;
use App\Repository\Query\InvoiceQuery;
@@ -48,6 +49,88 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
$timesheet
->setDuration(3600)
->setRate(293.27)
->setHourlyRate(293.27)
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setEnd(new \DateTime())
;
$timesheet2 = new Timesheet();
$timesheet2
->setDuration(400)
->setRate(32.59)
->setHourlyRate(293.27)
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setEnd(new \DateTime())
;
$timesheet3 = new Timesheet();
$timesheet3
->setDuration(1800)
->setRate(146.64)
->setHourlyRate(293.27)
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setEnd(new \DateTime())
;
$entries = [$timesheet, $timesheet2, $timesheet3];
$query = new InvoiceQuery();
$query->setActivity($activity);
$model = new InvoiceModel();
$model->setCustomer($customer);
$model->setTemplate($template);
$model->setEntries($entries);
$model->setQuery($query);
$sut = new ShortInvoiceCalculator();
$sut->setModel($model);
$this->assertEquals('short', $sut->getId());
$this->assertEquals(562.28, $sut->getTotal());
$this->assertEquals(19, $sut->getVat());
$this->assertEquals('EUR', $sut->getCurrency());
$this->assertEquals(472.5, $sut->getSubtotal());
$this->assertEquals(5800, $sut->getTimeWorked());
$this->assertEquals(1, count($sut->getEntries()));
/** @var InvoiceItem $result */
$result = $sut->getEntries()[0];
$this->assertEquals('activity description', $result->getDescription());
$this->assertEquals(293.27, $result->getHourlyRate());
$this->assertNull($result->getFixedRate());
$this->assertEquals(472.5, $result->getRate());
$this->assertEquals(5800, $result->getDuration());
$this->assertEquals(3, $result->getAmount());
}
public function testWithMultipleEntriesDifferentRates()
{
$customer = new Customer();
$template = new InvoiceTemplate();
$template->setVat(19);
$project = new Project();
$project->setName('sdfsdf');
$activity = new Activity();
$activity->setName('activity description');
$activity->setProject($project);
$timesheet = new Timesheet();
$timesheet
->setDuration(3600)
->setRate(293.27)
->setHourlyRate(293.27)
->setUser(new User())
->setActivity($activity)
->setProject($project)
@@ -59,6 +142,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
$timesheet2
->setDuration(400)
->setRate(84)
->setHourlyRate(756.00)
->setUser(new User())
->setActivity($activity)
->setProject($project)
@@ -70,6 +154,7 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
$timesheet3
->setDuration(1800)
->setRate(111.11)
->setHourlyRate(222.22)
->setUser(new User())
->setActivity($activity)
->setProject($project)
@@ -99,13 +184,14 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
$this->assertEquals(5800, $sut->getTimeWorked());
$this->assertEquals(1, count($sut->getEntries()));
/** @var Timesheet $result */
/** @var InvoiceItem $result */
$result = $sut->getEntries()[0];
$this->assertEquals('activity description', $result->getDescription());
$this->assertEquals(488.38, $result->getHourlyRate());
$this->assertEquals(488.38, $result->getFixedRate());
$this->assertEquals(488.38, $result->getRate());
$this->assertEquals(5800, $result->getDuration());
$this->assertNull($result->getFixedRate());
$this->assertEquals(1, $result->getAmount());
}
public function testWithMixedRateTypes()
@@ -177,13 +263,14 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
$this->assertEquals(5400, $sut->getTimeWorked());
$this->assertEquals(1, count($sut->getEntries()));
/** @var Timesheet $result */
/** @var InvoiceItem $result */
$result = $sut->getEntries()[0];
$this->assertEquals('activity description', $result->getDescription());
$this->assertEquals(488.38, $result->getHourlyRate());
$this->assertEquals(488.38, $result->getRate());
$this->assertEquals(5800, $result->getDuration());
$this->assertEquals(488.38, $result->getFixedRate());
$this->assertEquals(1, $result->getAmount());
}
public function testDescriptionByTimesheet()

27
tests/Twig/ExtensionsTest.php
View File

@@ -50,7 +50,7 @@ class ExtensionsTest extends TestCase
public function testGetFilters()
{
$filters = ['duration', 'duration_decimal', 'money', 'currency', 'country', 'language', 'docu_link'];
$filters = ['duration', 'duration_decimal', 'money', 'currency', 'country', 'language', 'amount', 'docu_link'];
$sut = $this->getSut($this->localeDe);
$twigFilters = $sut->getFilters();
$this->assertCount(count($filters), $twigFilters);
@@ -166,6 +166,31 @@ class ExtensionsTest extends TestCase
];
}
/**
* @dataProvider getAmountData
*/
public function testAmount($result, $amount, $locale)
{
$sut = $this->getSut($this->localeEn, $locale);
$this->assertEquals($result, $sut->amount($amount));
}
public function getAmountData()
{
return [
['0', null, 'de'],
['2.345,01', 2345.01, 'de'],
['2.345', 2345, 'de'],
['2,345', 2345, 'en'],
['2,345.009', 2345.009, 'en'],
['2.345,009', 2345.009, 'de'],
['13.75', 13.75, 'en'],
['13,75', 13.75, 'de'],
['13 933,49', 13933.49, 'ru'],
['1.234.567,891', 1234567.891234567890000, 'de'],
];
}
/**
* @dataProvider getMoneyData62_1
*/