th.guenther/mareike
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved handling for new invoices

Browse Source
This commit is contained in:
Thomas Günther
2026-04-18 23:42:39 +02:00
parent 33a9271013
commit 4878f750bd
16 changed files with 206 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Repositories/CostUnitRepository.php
View File

@@ -132,7 +132,7 @@ class CostUnitRepository {
if (strlen($costUnit->name) > 15) {
$costUnit->name = substr($costUnit->name, 8, 13) . '...';
}
$costUnit->totalAmount = $this->sumupAmounts($costUnit)->toString();
$costUnit->totalAmount = $this->sumupUnhandledAmounts($costUnit)->toString();
$returnData[] = $costUnit;
}
@@ -174,8 +174,27 @@ class CostUnitRepository {
$amount->addAmount(Amount::fromString($invoice->amount));
}
return $amount;
}
public function sumupUnhandledAmounts(CostUnit $costUnit, bool $donatedAmount = false) : Amount {
$amount = new Amount(0, '');
foreach ($costUnit->invoices()->get() as $invoice) {
if (!in_array($invoice->status,
[InvoiceStatus::INVOICE_STATUS_NEW, InvoiceStatus::INVOICE_STATUS_APPROVED])) {
continue;
}
if (
($donatedAmount && !$invoice->donation) ||
(!$donatedAmount && $invoice->donation)
) {
continue;
}
$amount->addAmount(Amount::fromString($invoice->amount));
}
return $amount;
}
public function countInvoices(CostUnit $costUnit) : array {