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

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

@@ -12,6 +12,7 @@ namespace App\Invoice\Calculator;
use App\Entity\Timesheet;
use App\Invoice\InvoiceItem;
use App\Invoice\InvoiceItemInterface;
use App\Invoice\InvoiceItemWithAmountInterface;
abstract class AbstractMergedCalculator extends AbstractCalculator
{
@@ -32,7 +33,11 @@ abstract class AbstractMergedCalculator extends AbstractCalculator
$duration += $entry->getDuration();
}
$invoiceItem->setAmount($invoiceItem->getAmount() + 1);
$amount = 1;
if ($entry instanceof InvoiceItemWithAmountInterface) {
$amount = $entry->getAmount();
}
$invoiceItem->setAmount($invoiceItem->getAmount() + $amount);
$invoiceItem->setUser($entry->getUser());
$invoiceItem->setRate($invoiceItem->getRate() + $entry->getRate());
$invoiceItem->setDuration($duration);

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

@@ -45,8 +45,8 @@ class ShortInvoiceCalculator extends AbstractMergedCalculator implements Calcula
if (count($keys) > 1) {
$invoiceItem->setAmount(1);
$invoiceItem->setFixedRate($invoiceItem->getRate());
$invoiceItem->setHourlyRate($invoiceItem->getRate());
}
$invoiceItem->setHourlyRate($invoiceItem->getRate());
return [$invoiceItem];
}