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

allow increasing invoice numbers per day (#2433)

Browse Source
This commit is contained in:
Kevin Papst
2021-03-14 13:53:36 +01:00
committed by GitHub
parent c0378b4f51
commit 9a2fd9ba91
8 changed files with 142 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Invoice/Calculator/AbstractSumInvoiceCalculator.php
View File

@@ -20,6 +20,17 @@ abstract class AbstractSumInvoiceCalculator extends AbstractMergedCalculator imp
{
abstract protected function calculateSumIdentifier(InvoiceItemInterface $invoiceItem): string;
protected function calculateIdentifier(InvoiceItemInterface $entry): string
{
$prefix = $this->calculateSumIdentifier($entry);
if (null !== $entry->getFixedRate()) {
return $prefix . '_fixed_' . (string) $entry->getFixedRate();
}
return $prefix . '_hourly_' . (string) $entry->getHourlyRate();
}
/**
* @return InvoiceItem[]
*/
@@ -34,13 +45,7 @@ abstract class AbstractSumInvoiceCalculator extends AbstractMergedCalculator imp
$invoiceItems = [];
foreach ($entries as $entry) {
$id = $this->calculateSumIdentifier($entry);
if (null !== $entry->getFixedRate()) {
$id = $id . '_fixed_' . (string) $entry->getFixedRate();
} else {
$id = $id . '_hourly_' . (string) $entry->getHourlyRate();
}
$id = $this->calculateIdentifier($entry);
if (!isset($invoiceItems[$id])) {
$invoiceItems[$id] = new InvoiceItem();