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

added avatars, show user teams in list, new team dashboard widgets (#1150)

Browse Source
This commit is contained in:
Kevin Papst
2019-10-03 13:44:16 +02:00
committed by GitHub
parent 718ad4b398
commit e8c25d8ac5
120 changed files with 2585 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Invoice/Calculator/AbstractCalculator.php
View File

@@ -103,7 +103,7 @@ abstract class AbstractCalculator
{
$time = 0;
foreach ($this->model->getEntries() as $entry) {
if (null === $entry->getFixedRate()) {
if (null === $entry->getFixedRate() && null !== $entry->getDuration()) {
$time += $entry->getDuration();
}
}

7
src/Invoice/Calculator/AbstractMergedCalculator.php
View File

@@ -27,10 +27,15 @@ abstract class AbstractMergedCalculator extends AbstractCalculator
protected function mergeInvoiceItems(InvoiceItem $invoiceItem, InvoiceItemInterface $entry)
{
$duration = $invoiceItem->getDuration();
if (null !== $entry->getDuration()) {
$duration += $entry->getDuration();
}
$invoiceItem->setAmount($invoiceItem->getAmount() + 1);
$invoiceItem->setUser($entry->getUser());
$invoiceItem->setRate($invoiceItem->getRate() + $entry->getRate());
$invoiceItem->setDuration($invoiceItem->getDuration() + $entry->getDuration());
$invoiceItem->setDuration($duration);
if (null !== $entry->getFixedRate()) {
/*

2
src/Invoice/InvoiceItemInterface.php
View File

@@ -32,7 +32,7 @@ interface InvoiceItemInterface
public function getEnd(): ?\DateTime;
public function getDuration(): int;
public function getDuration(): ?int;
public function getDescription(): ?string;