Compare commits
No commits in common. "66d263ef1467803c7f036b4c8e175580089fc9e4" and "1d8dacbaa3d9b41965b9b7a489dfa7f104b2f82b" have entirely different histories.
66d263ef14
...
1d8dacbaa3
4 changed files with 48 additions and 120 deletions
15
__init__.py
15
__init__.py
|
|
@ -55,23 +55,12 @@ def events_start():
|
|||
register_rpc,
|
||||
)
|
||||
|
||||
from .transport_rpcs import (
|
||||
handle_events_list_event_tickets,
|
||||
handle_events_ticket_register,
|
||||
)
|
||||
from .transport_rpcs import handle_events_ticket_register
|
||||
|
||||
register_rpc(
|
||||
"events_ticket_register", handle_events_ticket_register, AUTH_WALLET
|
||||
)
|
||||
register_rpc(
|
||||
"events_list_event_tickets",
|
||||
handle_events_list_event_tickets,
|
||||
AUTH_WALLET,
|
||||
)
|
||||
logger.info(
|
||||
"[EVENTS] Registered nostr-transport RPCs: "
|
||||
"events_ticket_register, events_list_event_tickets"
|
||||
)
|
||||
logger.info("[EVENTS] Registered nostr-transport RPC: events_ticket_register")
|
||||
except ImportError:
|
||||
logger.info(
|
||||
"[EVENTS] nostr_transport not available on this LNbits — "
|
||||
|
|
|
|||
9
crud.py
9
crud.py
|
|
@ -139,15 +139,6 @@ async def get_tickets(wallet_ids: str | list[str]) -> list[Ticket]:
|
|||
return [Ticket(**_parse_ticket_row(row)) for row in rows]
|
||||
|
||||
|
||||
async def get_tickets_by_event(event_id: str) -> list[Ticket]:
|
||||
"""All ticket rows for the given calendar event id."""
|
||||
rows = await db.fetchall(
|
||||
"SELECT * FROM events.ticket WHERE event = :event_id",
|
||||
{"event_id": event_id},
|
||||
)
|
||||
return [Ticket(**_parse_ticket_row(row)) for row in rows]
|
||||
|
||||
|
||||
async def get_tickets_by_user_id(user_id: str) -> list[Ticket]:
|
||||
"""All tickets owned by the given LNbits user_id."""
|
||||
rows = await db.fetchall(
|
||||
|
|
|
|||
|
|
@ -286,6 +286,51 @@
|
|||
</q-card-section>
|
||||
</q-card>
|
||||
|
||||
<q-card v-if="isAdmin && allUserEvents.length > 0">
|
||||
<q-card-section>
|
||||
<div class="row items-center no-wrap q-mb-md">
|
||||
<div class="col">
|
||||
<h5 class="text-subtitle1 q-my-none">
|
||||
All Users' Events
|
||||
<q-badge
|
||||
color="blue"
|
||||
:label="allUserEvents.length"
|
||||
class="q-ml-sm"
|
||||
></q-badge>
|
||||
</h5>
|
||||
</div>
|
||||
</div>
|
||||
<q-table
|
||||
dense
|
||||
flat
|
||||
:rows="allUserEvents"
|
||||
row-key="id"
|
||||
:columns="eventsTable.columns"
|
||||
:pagination="{rowsPerPage: 10}"
|
||||
>
|
||||
<template v-slot:header="props">
|
||||
<q-tr :props="props">
|
||||
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
||||
<span v-text="col.label"></span>
|
||||
</q-th>
|
||||
</q-tr>
|
||||
</template>
|
||||
<template v-slot:body="props">
|
||||
<q-tr :props="props">
|
||||
<q-td v-for="col in props.cols" :key="col.name" :props="props">
|
||||
<q-badge
|
||||
v-if="col.name === 'status'"
|
||||
:color="col.value === 'approved' ? 'green' : col.value === 'proposed' ? 'orange' : 'red'"
|
||||
:label="col.value"
|
||||
></q-badge>
|
||||
<span v-else v-text="col.value"></span>
|
||||
</q-td>
|
||||
</q-tr>
|
||||
</template>
|
||||
</q-table>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
|
||||
<q-card>
|
||||
<q-card-section>
|
||||
<div class="row items-center no-wrap q-mb-md">
|
||||
|
|
@ -364,51 +409,6 @@
|
|||
</q-table>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
|
||||
<q-card v-if="isAdmin && allUserEvents.length > 0">
|
||||
<q-card-section>
|
||||
<div class="row items-center no-wrap q-mb-md">
|
||||
<div class="col">
|
||||
<h5 class="text-subtitle1 q-my-none">
|
||||
All Users' Events
|
||||
<q-badge
|
||||
color="blue"
|
||||
:label="allUserEvents.length"
|
||||
class="q-ml-sm"
|
||||
></q-badge>
|
||||
</h5>
|
||||
</div>
|
||||
</div>
|
||||
<q-table
|
||||
dense
|
||||
flat
|
||||
:rows="allUserEvents"
|
||||
row-key="id"
|
||||
:columns="eventsTable.columns"
|
||||
:pagination="{rowsPerPage: 10}"
|
||||
>
|
||||
<template v-slot:header="props">
|
||||
<q-tr :props="props">
|
||||
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
||||
<span v-text="col.label"></span>
|
||||
</q-th>
|
||||
</q-tr>
|
||||
</template>
|
||||
<template v-slot:body="props">
|
||||
<q-tr :props="props">
|
||||
<q-td v-for="col in props.cols" :key="col.name" :props="props">
|
||||
<q-badge
|
||||
v-if="col.name === 'status'"
|
||||
:color="col.value === 'approved' ? 'green' : col.value === 'proposed' ? 'orange' : 'red'"
|
||||
:label="col.value"
|
||||
></q-badge>
|
||||
<span v-else v-text="col.value"></span>
|
||||
</q-td>
|
||||
</q-tr>
|
||||
</template>
|
||||
</q-table>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
</div>
|
||||
<div class="col-12 col-md-4 col-lg-5 q-gutter-y-md">
|
||||
<q-card>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ from lnbits.core.crud import get_user
|
|||
from lnbits.core.models import WalletTypeInfo
|
||||
from lnbits.core.services.nostr_transport.models import NostrRpcRequest
|
||||
|
||||
from .crud import get_event, get_ticket, get_tickets_by_event, update_ticket
|
||||
from .crud import get_event, get_ticket, update_ticket
|
||||
|
||||
|
||||
async def handle_events_ticket_register(
|
||||
|
|
@ -66,55 +66,3 @@ async def handle_events_ticket_register(
|
|||
ticket.reg_timestamp = datetime.now(timezone.utc)
|
||||
await update_ticket(ticket)
|
||||
return ticket.dict()
|
||||
|
||||
|
||||
async def handle_events_list_event_tickets(
|
||||
auth: WalletTypeInfo,
|
||||
request: NostrRpcRequest,
|
||||
) -> dict:
|
||||
"""Return paid + registered counts plus the per-ticket roster for
|
||||
one calendar event, organizer-only.
|
||||
|
||||
Backs the door scanner's counts strip and "All scanned" tab so the
|
||||
UI reads authoritative state from the backend instead of relying
|
||||
on per-device localStorage (which diverges the moment a second
|
||||
organizer scans, or the operator switches devices).
|
||||
|
||||
The roster only includes paid tickets — proposed/unpaid rows are
|
||||
irrelevant at the door.
|
||||
"""
|
||||
body = request.body or {}
|
||||
event_id = body.get("event_id")
|
||||
if not event_id:
|
||||
raise ValueError("event_id is required")
|
||||
|
||||
event = await get_event(event_id)
|
||||
if not event:
|
||||
raise ValueError("Event does not exist")
|
||||
|
||||
user = await get_user(auth.wallet.user)
|
||||
owned_wallet_ids = user.wallet_ids if user else [auth.wallet.id]
|
||||
if event.wallet not in owned_wallet_ids:
|
||||
raise PermissionError("You do not own this event")
|
||||
|
||||
tickets = await get_tickets_by_event(event_id)
|
||||
paid_tickets = [t for t in tickets if t.paid]
|
||||
registered_count = sum(1 for t in paid_tickets if t.registered)
|
||||
|
||||
return {
|
||||
"event_id": event_id,
|
||||
"sold": len(paid_tickets),
|
||||
"registered": registered_count,
|
||||
"remaining": len(paid_tickets) - registered_count,
|
||||
"tickets": [
|
||||
{
|
||||
"id": t.id,
|
||||
"name": t.name,
|
||||
"registered": t.registered,
|
||||
"registered_at": (
|
||||
t.reg_timestamp.isoformat() if t.reg_timestamp else None
|
||||
),
|
||||
}
|
||||
for t in paid_tickets
|
||||
],
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue