diff --git a/resources/views/pages/association/profile.blade.php b/resources/views/pages/association/profile.blade.php index dc8e037..df22f07 100644 --- a/resources/views/pages/association/profile.blade.php +++ b/resources/views/pages/association/profile.blade.php @@ -105,7 +105,14 @@ $searchPaymentEvent = function () { 'tags' => $event->event->tags, 'created_at' => $event->event->created_at, ]) - ->filter(fn($payment) => collect($payment['tags'])->firstWhere('0', 'e')[1] === $this->currentPleb->paymentEvents->first()->event_id) + ->filter(fn($payment) + => collect($payment['tags'])->firstWhere('0', 'p')[1] === $this->currentPubkey + && json_decode( + collect($payment['tags'])->firstWhere('0', 'description')[1], + true, + 512, + JSON_THROW_ON_ERROR, + )['content'] == date('Y')) ->values() ->toArray(); @@ -244,7 +251,7 @@ $loadEvents = function () {
+ class="flex flex-nowrap overflow-x-scroll no-scrollbar md:block md:overflow-auto px-3 py-6 border-b md:border-b-0 md:border-r border-gray-200 dark:border-gray-700/60 min-w-60 md:space-y-3">
@@ -256,7 +263,7 @@ $loadEvents = function () { href="#0"> Status + class="text-sm font-medium text-orange-500 dark:text-orange-400">Status {{--
  • @@ -315,20 +322,20 @@ $loadEvents = function () {

    + class="tw-48 sm:w-full truncate text-sm text-gray-500 dark:text-gray-400" + x-text="$store.nostr.user.nip05">
  • @if($currentPubkey)
    + class="inline-flex min-w-80 px-4 py-2 rounded-lg text-sm bg-white dark:bg-gray-800 shadow-sm border border-gray-200 dark:border-gray-700/60 text-gray-600 dark:text-gray-100">
    + d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zM7 11.4L3.6 8 5 6.6l2 2 4-4L12.4 6 7 11.4z">
    Profil in der Datenbank vorhanden. Bewerbung kann erfolgen.
    @@ -346,9 +353,9 @@ $loadEvents = function () {
    + corner="Beschreibe deine Motivation, passives Mitglied zu werden." + label="Warum möchtest du passives Mitglied werden?" + wire:model="form.reason"/>
    @@ -369,10 +376,10 @@ $loadEvents = function () {
    + corner="Woher kennen wir dich? Was möchtest du einbringen?" + description="Wir bitten dich mindestens von 3 aktiven Mitgliedern auf Nostr gefolgt zu werden." + label="Warum möchtest du aktives Mitglied werden?" + wire:model="form.reason"/>
    @@ -388,13 +395,13 @@ $loadEvents = function () {
    @if($currentPubkey && $currentPleb->application_for)
    + class="inline-flex flex-col w-full max-w-lg px-4 py-2 rounded-lg text-sm bg-white dark:bg-gray-800 shadow-sm border border-gray-200 dark:border-gray-700/60 text-gray-600 dark:text-gray-400">
    + d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm0 12c-.6 0-1-.4-1-1s.4-1 1-1 1 .4 1 1-.4 1-1 1zm1-3H7V4h2v5z">
    @@ -411,13 +418,13 @@ $loadEvents = function () {
    @if($currentPleb && $currentPleb->association_status->value > 1)
    + class="inline-flex flex-col w-full max-w-lg px-4 py-2 rounded-lg text-sm bg-white dark:bg-gray-800 shadow-sm border border-gray-200 dark:border-gray-700/60 text-gray-600 dark:text-gray-400">
    + d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm0 12c-.6 0-1-.4-1-1s.4-1 1-1 1 .4 1 1-.4 1-1 1zm1-3H7V4h2v5z">
    @@ -434,17 +441,17 @@ $loadEvents = function () {
    @if($currentPleb && $currentPleb->association_status->value > 1)
    + class="inline-flex flex-col w-full px-4 py-2 rounded-lg text-sm bg-white dark:bg-gray-800 shadow-sm border border-gray-200 dark:border-gray-700/60 text-gray-600 dark:text-gray-400">
    + d="M8 0C3.6 0 0 3.6 0 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8zm0 12c-.6 0-1-.4-1-1s.4-1 1-1 1 .4 1 1-.4 1-1 1zm1-3H7V4h2v5z">
    + class="font-medium text-gray-800 dark:text-gray-100 mb-1 space-y-2">

    Nostr Event für die Zahlung des Mitgliedsbeitrags: {{ $currentPleb->paymentEvents->first()->event_id }}

    @@ -454,8 +461,8 @@ $loadEvents = function () { @if(!$invoice && !$currentYearIsPaid)
    @else @if($currentYearIsPaid)