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

Fixed bug in real income

Browse Source
This commit is contained in:
Thomas Günther
2026-03-25 20:55:35 +01:00
parent 33b4a249cc
commit df7c14442e
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Resources/EventResource.php
View File

@@ -225,20 +225,16 @@ class EventResource extends JsonResource{
} }
public function calculateIncomes(array $participants, Amount $supportPerPerson) : array { public function calculateIncomes(array $participants, Amount $supportPerPerson) : array {
$expectedAmount = $supportPerPerson; $expectedAmount = new Amount($supportPerPerson->getAmount(), 'Euro');
$expectedAmount->addAmount($this->event->support_flat); $expectedAmount->addAmount($this->event->support_flat);
$realAmount = $supportPerPerson; $realAmount = new Amount($supportPerPerson->getAmount(), 'Euro');
$realAmount->addAmount($this->event->support_flat); $realAmount->addAmount($this->event->support_flat);
foreach ($participants as $participationType => $participantData) { foreach ($participants as $participationType => $participantData) {
$expectedAmount->addAmount(new Amount($participantData['amount']['expected']['value'], 'Euro')); $expectedAmount->addAmount(new Amount($participantData['amount']['expected']['value'], 'Euro'));
$realAmount->addAmount(new Amount($participantData['amount']['paid']['value'], 'Euro')); $realAmount->addAmount(new Amount($participantData['amount']['paid']['value'], 'Euro'));
} }
return ['real' => [ return ['real' => [
'amount' => $realAmount, 'amount' => $realAmount,
'readable' => $realAmount->toString() 'readable' => $realAmount->toString()
@@ -252,7 +248,11 @@ class EventResource extends JsonResource{
public function getParticipants(string $participationType) : array { public function getParticipants(string $participationType) : array {
$returnData = []; $returnData = [];
$returnData['amount'] = ['expected' => new Amount(0, 'Euro'), 'paid' => new Amount(0, 'Euro')]; $returnData['amount'] = [
'expected' => new Amount(0, 'Euro'),
'paid' => new Amount(0, 'Euro')
];
$returnData['count'] = 0; $returnData['count'] = 0;
foreach ($this->event->participants()->where( foreach ($this->event->participants()->where(
@@ -288,7 +288,6 @@ class EventResource extends JsonResource{
'readable' => $returnData['amount']['paid']->toString() 'readable' => $returnData['amount']['paid']->toString()
]; ];
return $returnData; return $returnData;
} }