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

Teilnahmerechnungen erstellen

Browse Source
This commit is contained in:
th.guenther
2026-09-03 00:08:46 +02:00
parent a61344395a
commit 9c4c28e566
79 changed files with 4303 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Resources/EventParticipantResource.php
+3
View File
@@ -71,6 +71,9 @@ class EventParticipantResource extends JsonResource
'email_1' => $this->resource->email_1,
'amountPaid' => ['value' => $this->resource->amount_paid, 'readable' => $this->resource->amount_paid?->toString() ?? '0,00 Euro', 'short' => $this->resource->amount_paid?->getFormattedAmount() ?? '0,00'],
'amountExpected' => ['value' => $this->resource->amount, 'readable' => $this->resource->amount?->toString() ?? '0,00 Euro', 'short' => $this->resource->amount?->getFormattedAmount() ?? '0,00'],
// Numerisch, damit das Frontend rechnen bzw. auf "kostenlos" prüfen kann -- `value` oben ist
// ein Amount-Objekt und serialisiert nicht.
'amountExpectedValue' => $this->resource->amount?->getAmount() ?? 0.0,
'alcoholicsAllowed' => new Age($this->resource->birthday)->getAge() >= $event->alcoholics_age,
'localGroupPostcode' => $this->resource->localGroup()->first()?->postcode ?? '00000',
'localGroupCity' => $this->resource->localGroup()->first()?->city ?? '00000',
app/Resources/EventResource.php
+4 -4
View File
@@ -6,6 +6,7 @@ use App\Enumerations\ParticipationFeeType;
use App\Enumerations\ParticipationType;
use App\Enumerations\VatPricingMode;
use App\Models\Event;
use App\Support\DateRange;
use App\ValueObjects\Amount;
use DateTime;
use Illuminate\Http\Request;
@@ -20,7 +21,7 @@ class EventResource extends JsonResource{
public function toArray(Request $request) : array
{
$duration = $this->event->end_date->diff($this->event->start_date)->days + 1;
$duration = DateRange::inclusiveDays($this->event->start_date, $this->event->end_date);
$returnArray = [
'id' => $this->event->id,
@@ -352,8 +353,7 @@ class EventResource extends JsonResource{
$basicFee = $basicFee->multiply($this->getMultiplier());
if ($this->event->pay_per_day) {
$days = $arrival->diff($departure)->days + 1;
$basicFee = $basicFee->multiply($days);
$basicFee = $basicFee->multiply(DateRange::inclusiveDays($arrival, $departure));
}
if ($hasSibling && $this->event->sibling_reduction) {
@@ -380,7 +380,7 @@ class EventResource extends JsonResource{
*/
public function resolveAddons(array $selectedKeys, DateTime $arrival, DateTime $departure): array
{
$days = $arrival->diff($departure)->days + 1;
$days = DateRange::inclusiveDays($arrival, $departure);
$addsVat = $this->event->tax_liable && $this->event->vat_pricing_mode === VatPricingMode::AddOn->value;
$items = [];