diff --git a/resources/views/livewire/association/news.blade.php b/resources/views/livewire/association/news.blade.php
index bf39f80..cfc04df 100644
--- a/resources/views/livewire/association/news.blade.php
+++ b/resources/views/livewire/association/news.blade.php
@@ -132,7 +132,8 @@ class extends Component {
@@ -150,12 +151,11 @@ class extends Component {
@foreach(\App\Enums\NewsCategory::selectOptions() as $category)
-
+
{{ $category['label'] }}
-
+
@endforeach
diff --git a/resources/views/livewire/association/profile.blade.php b/resources/views/livewire/association/profile.blade.php
index 46ee296..1475a34 100644
--- a/resources/views/livewire/association/profile.blade.php
+++ b/resources/views/livewire/association/profile.blade.php
@@ -16,7 +16,8 @@ use swentel\nostr\Request\Request;
use swentel\nostr\Sign\Sign;
use swentel\nostr\Subscription\Subscription;
-new class extends Component {
+new class extends Component
+{
public ApplicationForm $form;
public bool $no = false;
@@ -54,12 +55,12 @@ new class extends Component {
$this->currentPubkey = NostrAuth::pubkey();
$this->currentPleb = EinundzwanzigPleb::query()
->with([
- 'paymentEvents' => fn($query) => $query->where('year', date('Y')),
+ 'paymentEvents' => fn ($query) => $query->where('year', date('Y')),
])
->where('pubkey', $this->currentPubkey)->first();
if ($this->currentPleb) {
$this->email = $this->currentPleb->email;
- $this->showEmail = !$this->no;
+ $this->showEmail = ! $this->no;
if ($this->currentPleb->association_status === AssociationStatus::ACTIVE) {
$this->amountToPay = config('app.env') === 'production' ? 21000 : 1;
}
@@ -75,7 +76,7 @@ new class extends Component {
public function updatedNo(): void
{
- $this->showEmail = !$this->no;
+ $this->showEmail = ! $this->no;
$this->currentPleb->update([
'no_email' => $this->no,
]);
@@ -182,7 +183,7 @@ new class extends Component {
public function save($type): void
{
$this->form->validate();
- if (!$this->form->check) {
+ if (! $this->form->check) {
$this->js('alert("Du musst den Statuten zustimmen.")');
return;
@@ -247,7 +248,7 @@ new class extends Component {
$this->events = collect($response[config('services.relay')])
->map(function ($event) {
- if (!isset($event->event)) {
+ if (! isset($event->event)) {
return false;
}
@@ -482,7 +483,11 @@ new class extends Component {
- Du bist derzeit ein Mitglied des Vereins.
+ @if($currentYearIsPaid)
+ Du bist derzeit ein Mitglied des Vereins. Das aktuelle Jahr ist bezahlt.
+ @else
+ Du wirst nach Zahlung des Vereinsbeitrages zum Mitglied. Das aktuelle Jahr ist noch nicht bezahlt.
+ @endif