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

improved invoice handling for fixed rates (#1058)

Browse Source
This commit is contained in:
Kevin Papst
2019-08-24 00:02:16 +02:00
committed by GitHub
parent 46e5650882
commit ceeec7b8a6
40 changed files with 581 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Invoice/Calculator/AbstractCalculatorTest.php
View File

@@ -16,7 +16,7 @@ use App\Entity\Project;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Invoice\CalculatorInterface;
use App\Model\InvoiceModel;
use App\Invoice\InvoiceModel;
use App\Repository\Query\InvoiceQuery;
use PHPUnit\Framework\TestCase;

2
tests/Invoice/Calculator/ActivityInvoiceCalculatorTest.php
View File

@@ -16,7 +16,7 @@ use App\Entity\Project;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Invoice\Calculator\ActivityInvoiceCalculator;
use App\Model\InvoiceModel;
use App\Invoice\InvoiceModel;
use App\Repository\Query\InvoiceQuery;
/**

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

@@ -16,7 +16,7 @@ use App\Entity\Project;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Invoice\Calculator\DateInvoiceCalculator;
use App\Model\InvoiceModel;
use App\Invoice\InvoiceModel;
use App\Repository\Query\InvoiceQuery;
use DateTime;

12
tests/Invoice/Calculator/DefaultCalculatorTest.php
View File

@@ -9,11 +9,13 @@
namespace App\Tests\Invoice\Calculator;
use App\Entity\Activity;
use App\Entity\Customer;
use App\Entity\InvoiceTemplate;
use App\Entity\Timesheet;
use App\Invoice\Calculator\DefaultCalculator;
use App\Model\InvoiceModel;
use App\Invoice\InvoiceModel;
use App\Repository\Query\InvoiceQuery;
/**
* @covers \App\Invoice\Calculator\DefaultCalculator
@@ -33,16 +35,22 @@ class DefaultCalculatorTest extends AbstractCalculatorTest
$template->setVat(19);
$timesheet = new Timesheet();
$timesheet->setBegin(new \DateTime());
$timesheet->setDuration(3600);
$timesheet->setRate(293.27);
$timesheet->setActivity(new Activity());
$timesheet2 = new Timesheet();
$timesheet2->setBegin(new \DateTime());
$timesheet2->setDuration(400);
$timesheet2->setRate(84);
$timesheet2->setActivity(new Activity());
$timesheet3 = new Timesheet();
$timesheet3->setBegin(new \DateTime());
$timesheet3->setDuration(1800);
$timesheet3->setRate(111.11);
$timesheet3->setActivity(new Activity());
$entries = [$timesheet, $timesheet2, $timesheet3];
@@ -50,6 +58,7 @@ class DefaultCalculatorTest extends AbstractCalculatorTest
$model->setCustomer($customer);
$model->setTemplate($template);
$model->setEntries($entries);
$model->setQuery(new InvoiceQuery());
$sut = new DefaultCalculator();
$sut->setModel($model);
@@ -60,6 +69,5 @@ class DefaultCalculatorTest extends AbstractCalculatorTest
$this->assertEquals('EUR', $sut->getCurrency());
$this->assertEquals(488.38, $sut->getSubtotal());
$this->assertEquals(5800, $sut->getTimeWorked());
$this->assertEquals($entries, $sut->getEntries());
}
}

2
tests/Invoice/Calculator/ProjectInvoiceCalculatorTest.php
View File

@@ -16,7 +16,7 @@ use App\Entity\Project;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Invoice\Calculator\ProjectInvoiceCalculator;
use App\Model\InvoiceModel;
use App\Invoice\InvoiceModel;
use App\Repository\Query\InvoiceQuery;
use DateTime;

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

@@ -16,7 +16,7 @@ use App\Entity\Project;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Invoice\Calculator\ShortInvoiceCalculator;
use App\Model\InvoiceModel;
use App\Invoice\InvoiceModel;
use App\Repository\Query\InvoiceQuery;
/**
@@ -104,8 +104,86 @@ class ShortInvoiceCalculatorTest extends AbstractCalculatorTest
$this->assertEquals('activity description', $result->getDescription());
$this->assertEquals(488.38, $result->getHourlyRate());
$this->assertEquals(488.38, $result->getRate());
$this->assertEquals(488.38, $result->getFixedRate());
$this->assertEquals(5800, $result->getDuration());
$this->assertNull($result->getFixedRate());
}
public function testWithMixedRateTypes()
{
$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)
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setEnd(new \DateTime())
;
$timesheet2 = new Timesheet();
$timesheet2
->setDuration(400)
->setFixedRate(84)
->setRate(84)
->setUser(new User())
->setActivity($activity)
->setProject($project)
->setBegin(new \DateTime())
->setEnd(new \DateTime())
;
$timesheet3 = new Timesheet();
$timesheet3
->setDuration(1800)
->setRate(111.11)
->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(581.17, $sut->getTotal());
$this->assertEquals(19, $sut->getVat());
$this->assertEquals('EUR', $sut->getCurrency());
$this->assertEquals(488.38, $sut->getSubtotal());
$this->assertEquals(5400, $sut->getTimeWorked());
$this->assertEquals(1, count($sut->getEntries()));
/** @var Timesheet $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());
}
public function testDescriptionByTimesheet()

2
tests/Invoice/Calculator/UserInvoiceCalculatorTest.php
View File

@@ -16,7 +16,7 @@ use App\Entity\Project;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Invoice\Calculator\UserInvoiceCalculator;
use App\Model\InvoiceModel;
use App\Invoice\InvoiceModel;
use App\Repository\Query\InvoiceQuery;
/**