feat: add fiat checkout and nostr + email notification (#50)
* feat: fiat and email/nostr notifications * make n bake
This commit is contained in:
parent
4afc78d44d
commit
680b035ec9
9 changed files with 379 additions and 61 deletions
|
|
@ -175,3 +175,13 @@ async def m006_add_extra_fields(db):
|
||||||
|
|
||||||
# Add 'extra' column to ticket table
|
# Add 'extra' column to ticket table
|
||||||
await db.execute("ALTER TABLE events.ticket ADD COLUMN extra TEXT;")
|
await db.execute("ALTER TABLE events.ticket ADD COLUMN extra TEXT;")
|
||||||
|
|
||||||
|
|
||||||
|
async def m007_add_allow_fiat(db):
|
||||||
|
"""
|
||||||
|
Add an allow_fiat column so event owners can explicitly enable fiat checkout.
|
||||||
|
"""
|
||||||
|
await db.execute("""
|
||||||
|
ALTER TABLE events.events
|
||||||
|
ADD COLUMN allow_fiat BOOLEAN NOT NULL DEFAULT FALSE;
|
||||||
|
""")
|
||||||
|
|
|
||||||
20
models.py
20
models.py
|
|
@ -24,6 +24,8 @@ class EventExtra(BaseModel):
|
||||||
promo_codes: list[PromoCode] = Field(default_factory=list)
|
promo_codes: list[PromoCode] = Field(default_factory=list)
|
||||||
conditional: bool = False
|
conditional: bool = False
|
||||||
min_tickets: int = 1
|
min_tickets: int = 1
|
||||||
|
email_notifications: bool = False
|
||||||
|
nostr_notifications: bool = False
|
||||||
|
|
||||||
|
|
||||||
class CreateEvent(BaseModel):
|
class CreateEvent(BaseModel):
|
||||||
|
|
@ -34,6 +36,7 @@ class CreateEvent(BaseModel):
|
||||||
event_start_date: str
|
event_start_date: str
|
||||||
event_end_date: str
|
event_end_date: str
|
||||||
currency: str = "sat"
|
currency: str = "sat"
|
||||||
|
allow_fiat: bool = False
|
||||||
amount_tickets: int = Query(..., ge=0)
|
amount_tickets: int = Query(..., ge=0)
|
||||||
price_per_ticket: float = Query(..., ge=0)
|
price_per_ticket: float = Query(..., ge=0)
|
||||||
banner: str | None = None
|
banner: str | None = None
|
||||||
|
|
@ -50,6 +53,7 @@ class Event(BaseModel):
|
||||||
event_start_date: str
|
event_start_date: str
|
||||||
event_end_date: str
|
event_end_date: str
|
||||||
currency: str
|
currency: str
|
||||||
|
allow_fiat: bool = False
|
||||||
amount_tickets: int
|
amount_tickets: int
|
||||||
price_per_ticket: float
|
price_per_ticket: float
|
||||||
time: datetime
|
time: datetime
|
||||||
|
|
@ -66,13 +70,21 @@ class PublicEvent(BaseModel):
|
||||||
canceled: bool
|
canceled: bool
|
||||||
event_start_date: str
|
event_start_date: str
|
||||||
event_end_date: str
|
event_end_date: str
|
||||||
|
currency: str
|
||||||
|
allow_fiat: bool = False
|
||||||
|
price_per_ticket: float
|
||||||
banner: str | None
|
banner: str | None
|
||||||
|
extra: EventExtra = Field(default_factory=EventExtra)
|
||||||
|
|
||||||
|
|
||||||
class TicketExtra(BaseModel):
|
class TicketExtra(BaseModel):
|
||||||
applied_promo_code: str | None = None
|
applied_promo_code: str | None = None
|
||||||
sats_paid: int | None = None
|
sats_paid: int | None = None
|
||||||
refund_address: str | None = None
|
refund_address: str | None = None
|
||||||
|
nostr_identifier: str | None = None
|
||||||
|
ticket_base_url: str | None = None
|
||||||
|
email_notification_sent: bool = False
|
||||||
|
nostr_notification_sent: bool = False
|
||||||
refunded: bool = False
|
refunded: bool = False
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -81,6 +93,9 @@ class CreateTicket(BaseModel):
|
||||||
email: EmailStr
|
email: EmailStr
|
||||||
promo_code: str | None = None
|
promo_code: str | None = None
|
||||||
refund_address: str | None = None
|
refund_address: str | None = None
|
||||||
|
nostr_identifier: str | None = None
|
||||||
|
payment_method: str | None = None
|
||||||
|
fiat_provider: str | None = None
|
||||||
|
|
||||||
|
|
||||||
class Ticket(BaseModel):
|
class Ticket(BaseModel):
|
||||||
|
|
@ -107,4 +122,7 @@ class PublicTicket(BaseModel):
|
||||||
|
|
||||||
class TicketPaymentRequest(BaseModel):
|
class TicketPaymentRequest(BaseModel):
|
||||||
payment_hash: str
|
payment_hash: str
|
||||||
payment_request: str
|
payment_request: str | None = None
|
||||||
|
fiat_payment_request: str | None = None
|
||||||
|
fiat_provider: str | None = None
|
||||||
|
is_fiat: bool = False
|
||||||
|
|
|
||||||
86
services.py
86
services.py
|
|
@ -1,3 +1,12 @@
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from asyncio.tasks import create_task
|
||||||
|
|
||||||
|
from lnbits.core.models.users import UserNotifications
|
||||||
|
from lnbits.core.services.nostr import send_nostr_dm
|
||||||
|
from lnbits.core.services.notifications import send_user_notification
|
||||||
|
from lnbits.settings import settings
|
||||||
|
from lnbits.utils.nostr import normalize_private_key, normalize_public_key
|
||||||
from lnurl import execute
|
from lnurl import execute
|
||||||
from loguru import logger
|
from loguru import logger
|
||||||
|
|
||||||
|
|
@ -10,6 +19,12 @@ from .crud import (
|
||||||
)
|
)
|
||||||
from .models import Ticket
|
from .models import Ticket
|
||||||
|
|
||||||
|
DEFAULT_NOSTR_RELAYS = [
|
||||||
|
"wss://relay.damus.io",
|
||||||
|
"wss://relay.primal.net",
|
||||||
|
"wss://relay.nostr.band",
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
async def set_ticket_paid(ticket: Ticket) -> Ticket:
|
async def set_ticket_paid(ticket: Ticket) -> Ticket:
|
||||||
if ticket.paid:
|
if ticket.paid:
|
||||||
|
|
@ -27,6 +42,77 @@ async def set_ticket_paid(ticket: Ticket) -> Ticket:
|
||||||
return ticket
|
return ticket
|
||||||
|
|
||||||
|
|
||||||
|
def send_ticket_notification_in_background(ticket: Ticket) -> None:
|
||||||
|
create_task(_send_ticket_notification(ticket))
|
||||||
|
|
||||||
|
|
||||||
|
async def _send_ticket_notification(ticket: Ticket) -> None:
|
||||||
|
event = await get_event(ticket.event)
|
||||||
|
if not event:
|
||||||
|
logger.warning(f"Event {ticket.event} not found for ticket notification.")
|
||||||
|
return
|
||||||
|
|
||||||
|
ticket_url = _ticket_url(ticket)
|
||||||
|
message = (
|
||||||
|
f"{settings.lnbits_site_title}\n"
|
||||||
|
f"Your ticket for '{event.name}' is ready.\n"
|
||||||
|
f"Open it here: {ticket_url}"
|
||||||
|
)
|
||||||
|
updated = False
|
||||||
|
|
||||||
|
if (
|
||||||
|
event.extra.email_notifications
|
||||||
|
and settings.lnbits_email_notifications_enabled
|
||||||
|
and ticket.email
|
||||||
|
):
|
||||||
|
try:
|
||||||
|
await send_user_notification(
|
||||||
|
UserNotifications(email_address=ticket.email),
|
||||||
|
message,
|
||||||
|
"text_message",
|
||||||
|
)
|
||||||
|
ticket.extra.email_notification_sent = True
|
||||||
|
updated = True
|
||||||
|
except Exception as exc:
|
||||||
|
logger.warning(f"Failed to email ticket {ticket.id}: {exc}")
|
||||||
|
|
||||||
|
if (
|
||||||
|
event.extra.nostr_notifications
|
||||||
|
and settings.is_nostr_notifications_configured()
|
||||||
|
and ticket.extra.nostr_identifier
|
||||||
|
):
|
||||||
|
try:
|
||||||
|
await _send_nostr_ticket_notification(
|
||||||
|
ticket.extra.nostr_identifier, message
|
||||||
|
)
|
||||||
|
ticket.extra.nostr_notification_sent = True
|
||||||
|
updated = True
|
||||||
|
except Exception as exc:
|
||||||
|
logger.warning(f"Failed to send nostr DM for ticket {ticket.id}: {exc}")
|
||||||
|
|
||||||
|
if updated:
|
||||||
|
await update_ticket(ticket)
|
||||||
|
|
||||||
|
|
||||||
|
async def _send_nostr_ticket_notification(identifier: str, message: str) -> None:
|
||||||
|
if "@" in identifier:
|
||||||
|
await send_user_notification(
|
||||||
|
UserNotifications(nostr_identifier=identifier),
|
||||||
|
message,
|
||||||
|
"text_message",
|
||||||
|
)
|
||||||
|
return
|
||||||
|
|
||||||
|
private_key = normalize_private_key(settings.lnbits_nostr_notifications_private_key)
|
||||||
|
public_key = normalize_public_key(identifier)
|
||||||
|
await send_nostr_dm(private_key, public_key, message, DEFAULT_NOSTR_RELAYS)
|
||||||
|
|
||||||
|
|
||||||
|
def _ticket_url(ticket: Ticket) -> str:
|
||||||
|
base_url = (ticket.extra.ticket_base_url or settings.lnbits_baseurl).rstrip("/")
|
||||||
|
return f"{base_url}/events/ticket/{ticket.id}"
|
||||||
|
|
||||||
|
|
||||||
async def refund_tickets(event_id: str):
|
async def refund_tickets(event_id: str):
|
||||||
"""
|
"""
|
||||||
Refund tickets for an event that has not met the minimum ticket requirement.
|
Refund tickets for an event that has not met the minimum ticket requirement.
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,9 @@ window.PageEventsDisplay = {
|
||||||
data: {
|
data: {
|
||||||
name: '',
|
name: '',
|
||||||
email: '',
|
email: '',
|
||||||
refund: ''
|
refund: '',
|
||||||
|
nostr_identifier: '',
|
||||||
|
payment_method: 'lightning'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
ticketLink: {
|
ticketLink: {
|
||||||
|
|
@ -23,7 +25,8 @@ window.PageEventsDisplay = {
|
||||||
receive: {
|
receive: {
|
||||||
show: false,
|
show: false,
|
||||||
status: 'pending',
|
status: 'pending',
|
||||||
paymentReq: null
|
paymentReq: null,
|
||||||
|
isFiat: false
|
||||||
},
|
},
|
||||||
paymentDismissMsg: null,
|
paymentDismissMsg: null,
|
||||||
paymentWebsocket: null
|
paymentWebsocket: null
|
||||||
|
|
@ -35,7 +38,17 @@ window.PageEventsDisplay = {
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
formatDescription() {
|
formatDescription() {
|
||||||
return LNbits.utils.convertMarkdown(this.info)
|
return LNbits.utils.convertMarkdown(this.event?.info || '')
|
||||||
|
},
|
||||||
|
allowFiatCheckout() {
|
||||||
|
const currency = (this.event?.currency || '').toLowerCase()
|
||||||
|
return this.event?.allow_fiat && !['sat', 'sats'].includes(currency)
|
||||||
|
},
|
||||||
|
allowEmailNotifications() {
|
||||||
|
return Boolean(this.event?.extra?.email_notifications)
|
||||||
|
},
|
||||||
|
allowNostrNotifications() {
|
||||||
|
return Boolean(this.event?.extra?.nostr_notifications)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|
@ -56,6 +69,8 @@ window.PageEventsDisplay = {
|
||||||
this.formDialog.data.name = ''
|
this.formDialog.data.name = ''
|
||||||
this.formDialog.data.email = ''
|
this.formDialog.data.email = ''
|
||||||
this.formDialog.data.refund = ''
|
this.formDialog.data.refund = ''
|
||||||
|
this.formDialog.data.nostr_identifier = ''
|
||||||
|
this.formDialog.data.payment_method = 'lightning'
|
||||||
},
|
},
|
||||||
|
|
||||||
closeReceiveDialog() {
|
closeReceiveDialog() {
|
||||||
|
|
@ -87,6 +102,9 @@ window.PageEventsDisplay = {
|
||||||
this.paymentReq = null
|
this.paymentReq = null
|
||||||
this.formDialog.data.name = ''
|
this.formDialog.data.name = ''
|
||||||
this.formDialog.data.email = ''
|
this.formDialog.data.email = ''
|
||||||
|
this.formDialog.data.refund = ''
|
||||||
|
this.formDialog.data.nostr_identifier = ''
|
||||||
|
this.formDialog.data.payment_method = 'lightning'
|
||||||
Quasar.Notify.create({
|
Quasar.Notify.create({
|
||||||
type: 'positive',
|
type: 'positive',
|
||||||
message: 'Sent, thank you!',
|
message: 'Sent, thank you!',
|
||||||
|
|
@ -95,7 +113,8 @@ window.PageEventsDisplay = {
|
||||||
this.receive = {
|
this.receive = {
|
||||||
show: false,
|
show: false,
|
||||||
status: 'complete',
|
status: 'complete',
|
||||||
paymentReq: null
|
paymentReq: null,
|
||||||
|
isFiat: false
|
||||||
}
|
}
|
||||||
this.ticketLink = {
|
this.ticketLink = {
|
||||||
show: true,
|
show: true,
|
||||||
|
|
@ -103,9 +122,7 @@ window.PageEventsDisplay = {
|
||||||
link: `/events/ticket/${paymentHash}`
|
link: `/events/ticket/${paymentHash}`
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
setTimeout(() => {
|
window.open(`/events/ticket/${paymentHash}`, '_blank', 'noopener')
|
||||||
window.location.href = `/events/ticket/${paymentHash}`
|
|
||||||
}, 5000)
|
|
||||||
},
|
},
|
||||||
async createInvoice() {
|
async createInvoice() {
|
||||||
try {
|
try {
|
||||||
|
|
@ -117,10 +134,15 @@ window.PageEventsDisplay = {
|
||||||
name: this.formDialog.data.name,
|
name: this.formDialog.data.name,
|
||||||
email: this.formDialog.data.email,
|
email: this.formDialog.data.email,
|
||||||
promo_code: this.formDialog.data.promo_code || null,
|
promo_code: this.formDialog.data.promo_code || null,
|
||||||
refund_address: this.formDialog.data.refund || null
|
refund_address: this.formDialog.data.refund || null,
|
||||||
|
nostr_identifier: this.formDialog.data.nostr_identifier || null,
|
||||||
|
payment_method: this.formDialog.data.payment_method
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
this.paymentReq = data.payment_request
|
const isFiat = Boolean(data.is_fiat)
|
||||||
|
this.paymentReq = isFiat
|
||||||
|
? data.fiat_payment_request || null
|
||||||
|
: data.payment_request
|
||||||
this.paymentHash = data.payment_hash
|
this.paymentHash = data.payment_hash
|
||||||
|
|
||||||
this.paymentDismissMsg = Quasar.Notify.create({
|
this.paymentDismissMsg = Quasar.Notify.create({
|
||||||
|
|
@ -130,30 +152,34 @@ window.PageEventsDisplay = {
|
||||||
this.receive = {
|
this.receive = {
|
||||||
show: true,
|
show: true,
|
||||||
status: 'pending',
|
status: 'pending',
|
||||||
paymentReq: this.paymentReq
|
paymentReq: this.paymentReq,
|
||||||
|
isFiat
|
||||||
}
|
}
|
||||||
this.websocketListener(this.paymentHash)
|
if (isFiat && this.paymentReq) {
|
||||||
|
window.open(this.paymentReq, '_blank', 'noopener')
|
||||||
|
}
|
||||||
|
this.paymentWatcher(this.paymentHash)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
LNbits.utils.notifyApiError(error)
|
LNbits.utils.notifyApiError(error)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
websocketListener(paymentHash) {
|
paymentWatcher(paymentHash) {
|
||||||
if (this.paymentWebsocket) {
|
if (this.paymentWebsocket) {
|
||||||
this.paymentWebsocket.close()
|
this.paymentWebsocket.close()
|
||||||
}
|
}
|
||||||
|
|
||||||
const url = new URL(window.location)
|
const url = new URL(window.location)
|
||||||
url.protocol = url.protocol === 'https:' ? 'wss' : 'ws'
|
url.protocol = url.protocol === 'https:' ? 'wss:' : 'ws:'
|
||||||
url.pathname = `/events/api/v1/tickets/ws/${paymentHash}`
|
url.pathname = `/api/v1/ws/${paymentHash}`
|
||||||
url.search = ''
|
url.search = ''
|
||||||
url.hash = ''
|
url.hash = ''
|
||||||
|
|
||||||
const ws = new WebSocket(url)
|
const ws = new WebSocket(url.toString())
|
||||||
this.paymentWebsocket = ws
|
this.paymentWebsocket = ws
|
||||||
|
|
||||||
ws.onmessage = event => {
|
ws.onmessage = event => {
|
||||||
const data = JSON.parse(event.data)
|
const data = JSON.parse(event.data)
|
||||||
if (data.paid) {
|
if (data.pending === false) {
|
||||||
this.paymentSuccess(paymentHash)
|
this.paymentSuccess(paymentHash)
|
||||||
ws.close()
|
ws.close()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,8 @@
|
||||||
<q-card-section class="q-pa-none">
|
<q-card-section class="q-pa-none">
|
||||||
<h5 class="q-mt-none">Buy Ticket</h5>
|
<h5 class="q-mt-none">Buy Ticket</h5>
|
||||||
<q-form @submit="createInvoice()" class="q-gutter-md">
|
<q-form @submit="createInvoice()" class="q-gutter-md">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-12">
|
||||||
<q-input
|
<q-input
|
||||||
filled
|
filled
|
||||||
dense
|
dense
|
||||||
|
|
@ -23,34 +25,68 @@
|
||||||
label="Your name "
|
label="Your name "
|
||||||
:rules="[val => nameValidation(val)]"
|
:rules="[val => nameValidation(val)]"
|
||||||
></q-input>
|
></q-input>
|
||||||
|
</div>
|
||||||
|
<div class="col-12 col-md-6 q-pr-sm">
|
||||||
<q-input
|
<q-input
|
||||||
filled
|
filled
|
||||||
dense
|
dense
|
||||||
v-model.trim="formDialog.data.email"
|
v-model.trim="formDialog.data.email"
|
||||||
type="email"
|
type="email"
|
||||||
label="Your email "
|
:label="
|
||||||
|
allowEmailNotifications
|
||||||
|
? 'Your email (ticket delivery) '
|
||||||
|
: 'Your email '
|
||||||
|
"
|
||||||
:rules="[
|
:rules="[
|
||||||
val => !!val || '* Required',
|
val => !!val || '* Required',
|
||||||
val => emailValidation(val)
|
val => emailValidation(val)
|
||||||
]"
|
]"
|
||||||
lazy-rules
|
lazy-rules
|
||||||
></q-input>
|
></q-input>
|
||||||
|
</div>
|
||||||
|
<div v-if="allowNostrNotifications" class="col-12 col-md-6">
|
||||||
<q-input
|
<q-input
|
||||||
v-if="this.extra?.conditional"
|
filled
|
||||||
|
dense
|
||||||
|
v-model.trim="formDialog.data.nostr_identifier"
|
||||||
|
label="(optional) Nostr NIP-05 or npub"
|
||||||
|
hint="If provided, we'll DM your ticket link after payment."
|
||||||
|
></q-input>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<q-input
|
||||||
|
v-if="event.extra?.conditional"
|
||||||
filled
|
filled
|
||||||
dense
|
dense
|
||||||
v-model.trim="formDialog.data.refund"
|
v-model.trim="formDialog.data.refund"
|
||||||
label="Refund lnadress or LNURL "
|
label="Refund lnadress or LNURL "
|
||||||
:rules="[val => !!val || '* Required']"
|
:rules="[val => !!val || '* Required']"
|
||||||
lazy-rules
|
lazy-rules
|
||||||
:hint="`If minimum tickets (${this.extra?.min_tickets}) are not met, refund will be sent.`"
|
:hint="`If minimum tickets (${event.extra?.min_tickets}) are not met, refund will be sent.`"
|
||||||
></q-input>
|
></q-input>
|
||||||
|
<div class="row q-col-gutter-md q-pt-lg items-center">
|
||||||
|
<div v-if="allowFiatCheckout" class="col-auto">
|
||||||
|
<q-option-group
|
||||||
|
v-model="formDialog.data.payment_method"
|
||||||
|
inline
|
||||||
|
:options="[
|
||||||
|
{label: 'Lightning', value: 'lightning'},
|
||||||
|
{
|
||||||
|
label: `Fiat (${event.currency.toUpperCase()})`,
|
||||||
|
value: 'fiat'
|
||||||
|
}
|
||||||
|
]"
|
||||||
|
></q-option-group>
|
||||||
|
</div>
|
||||||
|
<div :class="allowFiatCheckout ? 'col-12 col-md-3' : 'col-12'">
|
||||||
<q-input
|
<q-input
|
||||||
filled
|
filled
|
||||||
dense
|
dense
|
||||||
v-model.trim="formDialog.data.promo_code"
|
v-model.trim="formDialog.data.promo_code"
|
||||||
label="(optional) Promo Code "
|
label="(optional) Promo Code "
|
||||||
></q-input>
|
></q-input>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="row q-mt-lg">
|
<div class="row q-mt-lg">
|
||||||
<q-btn
|
<q-btn
|
||||||
unelevated
|
unelevated
|
||||||
|
|
@ -82,8 +118,6 @@
|
||||||
type="a"
|
type="a"
|
||||||
>Link to your ticket!</q-btn
|
>Link to your ticket!</q-btn
|
||||||
>
|
>
|
||||||
<br /><br />
|
|
||||||
<p>You'll be redirected in a few moments...</p>
|
|
||||||
</div>
|
</div>
|
||||||
</q-card>
|
</q-card>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -94,6 +128,37 @@
|
||||||
class="q-pa-lg q-pt-xl lnbits__dialog-card"
|
class="q-pa-lg q-pt-xl lnbits__dialog-card"
|
||||||
>
|
>
|
||||||
</q-card>
|
</q-card>
|
||||||
|
<q-card
|
||||||
|
v-else-if="receive.isFiat"
|
||||||
|
class="q-pa-lg q-pt-xl lnbits__dialog-card"
|
||||||
|
>
|
||||||
|
<div class="text-center q-mb-lg">
|
||||||
|
<div class="text-h6 q-mb-sm">Continue to checkout</div>
|
||||||
|
<div class="text-body2 text-grey-5 q-mb-lg">
|
||||||
|
Your fiat checkout opened in a new tab. If it did not, use the
|
||||||
|
button below.
|
||||||
|
</div>
|
||||||
|
<q-btn
|
||||||
|
unelevated
|
||||||
|
color="primary"
|
||||||
|
type="a"
|
||||||
|
:href="receive.paymentReq"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener"
|
||||||
|
>
|
||||||
|
Go to checkout
|
||||||
|
</q-btn>
|
||||||
|
</div>
|
||||||
|
<div class="row q-mt-lg">
|
||||||
|
<q-btn
|
||||||
|
outline
|
||||||
|
color="grey"
|
||||||
|
@click="utils.copyText(receive.paymentReq)"
|
||||||
|
>Copy payment link</q-btn
|
||||||
|
>
|
||||||
|
<q-btn v-close-popup flat color="grey" class="q-ml-auto">Close</q-btn>
|
||||||
|
</div>
|
||||||
|
</q-card>
|
||||||
<q-card v-else class="q-pa-lg q-pt-xl lnbits__dialog-card">
|
<q-card v-else class="q-pa-lg q-pt-xl lnbits__dialog-card">
|
||||||
<div class="text-center q-mb-lg">
|
<div class="text-center q-mb-lg">
|
||||||
<lnbits-qrcode
|
<lnbits-qrcode
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ window.PageEvents = {
|
||||||
align: 'left',
|
align: 'left',
|
||||||
label: 'Price',
|
label: 'Price',
|
||||||
field: row => {
|
field: row => {
|
||||||
if (row.currency != 'sats') {
|
if (this.isFiatCurrency(row.currency)) {
|
||||||
return LNbits.utils.formatCurrency(
|
return LNbits.utils.formatCurrency(
|
||||||
row.price_per_ticket.toFixed(2),
|
row.price_per_ticket.toFixed(2),
|
||||||
row.currency
|
row.currency
|
||||||
|
|
@ -98,6 +98,7 @@ window.PageEvents = {
|
||||||
show: false,
|
show: false,
|
||||||
data: {
|
data: {
|
||||||
currency: 'sats',
|
currency: 'sats',
|
||||||
|
allow_fiat: false,
|
||||||
extra: {
|
extra: {
|
||||||
promo_codes: []
|
promo_codes: []
|
||||||
}
|
}
|
||||||
|
|
@ -106,6 +107,9 @@ window.PageEvents = {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
isFiatCurrency(currency) {
|
||||||
|
return !['sat', 'sats'].includes((currency || '').toLowerCase())
|
||||||
|
},
|
||||||
getTickets() {
|
getTickets() {
|
||||||
LNbits.api
|
LNbits.api
|
||||||
.request(
|
.request(
|
||||||
|
|
@ -158,10 +162,16 @@ window.PageEvents = {
|
||||||
id: this.formDialog.data.wallet
|
id: this.formDialog.data.wallet
|
||||||
})
|
})
|
||||||
const data = this.formDialog.data
|
const data = this.formDialog.data
|
||||||
if (data.extra && !data.extra.promo_codes) {
|
if (data.extra?.promo_codes) {
|
||||||
data.extra.promo_codes = data.extra.promo_codes
|
data.extra.promo_codes = data.extra.promo_codes
|
||||||
.filter(code => code.trim() !== '')
|
.filter(code => code.code?.trim() !== '')
|
||||||
.map(code => code.trim().toUpperCase())
|
.map(code => ({
|
||||||
|
...code,
|
||||||
|
code: code.code.trim().toUpperCase()
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
if (!this.isFiatCurrency(data.currency)) {
|
||||||
|
data.allow_fiat = false
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data.id) {
|
if (data.id) {
|
||||||
|
|
@ -177,9 +187,12 @@ window.PageEvents = {
|
||||||
} else {
|
} else {
|
||||||
this.formDialog.data = {
|
this.formDialog.data = {
|
||||||
currency: 'sats',
|
currency: 'sats',
|
||||||
|
allow_fiat: false,
|
||||||
extra: {
|
extra: {
|
||||||
conditional: false,
|
conditional: false,
|
||||||
min_tickets: 1,
|
min_tickets: 1,
|
||||||
|
email_notifications: false,
|
||||||
|
nostr_notifications: false,
|
||||||
promo_codes: []
|
promo_codes: []
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -189,7 +202,11 @@ window.PageEvents = {
|
||||||
resetEventDialog() {
|
resetEventDialog() {
|
||||||
this.formDialog.show = false
|
this.formDialog.show = false
|
||||||
this.formDialog.data = {
|
this.formDialog.data = {
|
||||||
|
currency: 'sats',
|
||||||
|
allow_fiat: false,
|
||||||
extra: {
|
extra: {
|
||||||
|
email_notifications: false,
|
||||||
|
nostr_notifications: false,
|
||||||
promo_codes: []
|
promo_codes: []
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -371,6 +371,18 @@
|
||||||
></q-input>
|
></q-input>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<q-toggle
|
||||||
|
v-model="formDialog.data.allow_fiat"
|
||||||
|
:disable="
|
||||||
|
formDialog.data.currency == null ||
|
||||||
|
['sat', 'sats'].includes(
|
||||||
|
(formDialog.data.currency || '').toLowerCase()
|
||||||
|
)
|
||||||
|
"
|
||||||
|
label="Allow fiat checkout"
|
||||||
|
left-label
|
||||||
|
hint="Lets attendees pay through a configured fiat provider using the event currency."
|
||||||
|
></q-toggle>
|
||||||
<q-expansion-item
|
<q-expansion-item
|
||||||
group="advanced"
|
group="advanced"
|
||||||
icon="settings"
|
icon="settings"
|
||||||
|
|
@ -473,6 +485,21 @@
|
||||||
>Add Promo Code</q-btn
|
>Add Promo Code</q-btn
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
|
<q-separator class="q-my-md"></q-separator>
|
||||||
|
<div class="text-subtitle1 q-mb-md">Ticket Delivery</div>
|
||||||
|
<div class="text-caption">
|
||||||
|
Send the paid ticket link automatically by email or Nostr DM.
|
||||||
|
</div>
|
||||||
|
<q-toggle
|
||||||
|
v-model="formDialog.data.extra.email_notifications"
|
||||||
|
label="Email notifications"
|
||||||
|
left-label
|
||||||
|
></q-toggle>
|
||||||
|
<q-toggle
|
||||||
|
v-model="formDialog.data.extra.nostr_notifications"
|
||||||
|
label="Nostr notifications"
|
||||||
|
left-label
|
||||||
|
></q-toggle>
|
||||||
</q-expansion-item>
|
</q-expansion-item>
|
||||||
|
|
||||||
<div class="row q-mt-lg">
|
<div class="row q-mt-lg">
|
||||||
|
|
|
||||||
3
tasks.py
3
tasks.py
|
|
@ -6,7 +6,7 @@ from loguru import logger
|
||||||
|
|
||||||
from .crud import get_ticket
|
from .crud import get_ticket
|
||||||
from .models import Ticket
|
from .models import Ticket
|
||||||
from .services import set_ticket_paid
|
from .services import send_ticket_notification_in_background, set_ticket_paid
|
||||||
|
|
||||||
payment_listeners: dict[str, list[asyncio.Queue[Ticket]]] = {}
|
payment_listeners: dict[str, list[asyncio.Queue[Ticket]]] = {}
|
||||||
|
|
||||||
|
|
@ -43,6 +43,7 @@ async def on_invoice_paid(payment: Payment) -> None:
|
||||||
return
|
return
|
||||||
|
|
||||||
ticket = await set_ticket_paid(ticket)
|
ticket = await set_ticket_paid(ticket)
|
||||||
|
send_ticket_notification_in_background(ticket)
|
||||||
if payment_listeners.get(payment.payment_hash):
|
if payment_listeners.get(payment.payment_hash):
|
||||||
for paid_ticket_queue in payment_listeners[payment.payment_hash]:
|
for paid_ticket_queue in payment_listeners[payment.payment_hash]:
|
||||||
paid_ticket_queue.put_nowait(ticket)
|
paid_ticket_queue.put_nowait(ticket)
|
||||||
|
|
|
||||||
80
views_api.py
80
views_api.py
|
|
@ -8,20 +8,25 @@ from fastapi import (
|
||||||
Depends,
|
Depends,
|
||||||
HTTPException,
|
HTTPException,
|
||||||
Query,
|
Query,
|
||||||
|
Request,
|
||||||
WebSocket,
|
WebSocket,
|
||||||
WebSocketDisconnect,
|
WebSocketDisconnect,
|
||||||
)
|
)
|
||||||
from lnbits.core.crud import get_user
|
from lnbits.core.crud import get_user
|
||||||
|
from lnbits.core.crud.wallets import get_wallet
|
||||||
from lnbits.core.models import WalletTypeInfo
|
from lnbits.core.models import WalletTypeInfo
|
||||||
from lnbits.core.services import create_invoice
|
from lnbits.core.models.payments import CreateInvoice
|
||||||
|
from lnbits.core.services import create_payment_request
|
||||||
from lnbits.decorators import (
|
from lnbits.decorators import (
|
||||||
require_admin_key,
|
require_admin_key,
|
||||||
require_invoice_key,
|
require_invoice_key,
|
||||||
)
|
)
|
||||||
|
from lnbits.settings import settings
|
||||||
from lnbits.utils.exchange_rates import (
|
from lnbits.utils.exchange_rates import (
|
||||||
fiat_amount_as_satoshis,
|
fiat_amount_as_satoshis,
|
||||||
get_fiat_rate_satoshis,
|
get_fiat_rate_satoshis,
|
||||||
)
|
)
|
||||||
|
from lnbits.utils.nostr import normalize_public_key
|
||||||
|
|
||||||
from .crud import (
|
from .crud import (
|
||||||
create_event,
|
create_event,
|
||||||
|
|
@ -53,6 +58,10 @@ events_api_router = APIRouter(prefix="/api/v1/events")
|
||||||
tickets_api_router = APIRouter(prefix="/api/v1/tickets")
|
tickets_api_router = APIRouter(prefix="/api/v1/tickets")
|
||||||
|
|
||||||
|
|
||||||
|
def _is_fiat_currency(currency: str | None) -> bool:
|
||||||
|
return str(currency or "").lower() not in {"sat", "sats"}
|
||||||
|
|
||||||
|
|
||||||
@events_api_router.get("")
|
@events_api_router.get("")
|
||||||
async def api_events(
|
async def api_events(
|
||||||
all_wallets: bool = Query(False),
|
all_wallets: bool = Query(False),
|
||||||
|
|
@ -193,7 +202,9 @@ async def api_get_ticket(ticket_id: str) -> Ticket:
|
||||||
|
|
||||||
|
|
||||||
@tickets_api_router.post("/{event_id}")
|
@tickets_api_router.post("/{event_id}")
|
||||||
async def api_ticket_create(event_id: str, data: CreateTicket) -> TicketPaymentRequest:
|
async def api_ticket_create(
|
||||||
|
event_id: str, data: CreateTicket, request: Request
|
||||||
|
) -> TicketPaymentRequest:
|
||||||
event = await get_event(event_id)
|
event = await get_event(event_id)
|
||||||
if not event:
|
if not event:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
|
|
@ -210,6 +221,21 @@ async def api_ticket_create(event_id: str, data: CreateTicket) -> TicketPaymentR
|
||||||
email = data.email
|
email = data.email
|
||||||
promo_code = data.promo_code.upper() if data.promo_code else None
|
promo_code = data.promo_code.upper() if data.promo_code else None
|
||||||
refund_address = data.refund_address
|
refund_address = data.refund_address
|
||||||
|
nostr_identifier = data.nostr_identifier.strip() if data.nostr_identifier else None
|
||||||
|
payment_method = (data.payment_method or "lightning").lower()
|
||||||
|
if payment_method not in {"lightning", "fiat"}:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=HTTPStatus.BAD_REQUEST,
|
||||||
|
detail="Unsupported payment method.",
|
||||||
|
)
|
||||||
|
if nostr_identifier and "@" not in nostr_identifier:
|
||||||
|
try:
|
||||||
|
nostr_identifier = normalize_public_key(nostr_identifier)
|
||||||
|
except Exception as exc:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=HTTPStatus.BAD_REQUEST,
|
||||||
|
detail="Invalid Nostr identifier.",
|
||||||
|
) from exc
|
||||||
price = event.price_per_ticket
|
price = event.price_per_ticket
|
||||||
extra: dict[str, Any] = {"tag": "events", "name": name, "email": email}
|
extra: dict[str, Any] = {"tag": "events", "name": name, "email": email}
|
||||||
|
|
||||||
|
|
@ -224,19 +250,55 @@ async def api_ticket_create(event_id: str, data: CreateTicket) -> TicketPaymentR
|
||||||
extra["promo_code"] = promo.code
|
extra["promo_code"] = promo.code
|
||||||
price = event.price_per_ticket * (1 - promo.discount_percent / 100)
|
price = event.price_per_ticket * (1 - promo.discount_percent / 100)
|
||||||
|
|
||||||
if event.currency != "sats":
|
if payment_method == "fiat" and not event.allow_fiat:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=HTTPStatus.BAD_REQUEST,
|
||||||
|
detail="Fiat payments are not enabled for this event.",
|
||||||
|
)
|
||||||
|
|
||||||
|
if _is_fiat_currency(event.currency):
|
||||||
extra["fiat"] = True
|
extra["fiat"] = True
|
||||||
extra["currency"] = event.currency
|
extra["currency"] = event.currency
|
||||||
extra["fiatAmount"] = price
|
extra["fiatAmount"] = price
|
||||||
extra["rate"] = await get_fiat_rate_satoshis(event.currency)
|
extra["rate"] = await get_fiat_rate_satoshis(event.currency)
|
||||||
|
|
||||||
|
if payment_method != "fiat":
|
||||||
price = await fiat_amount_as_satoshis(price, event.currency)
|
price = await fiat_amount_as_satoshis(price, event.currency)
|
||||||
|
|
||||||
payment = await create_invoice(
|
invoice_unit = event.currency
|
||||||
|
fiat_provider = None
|
||||||
|
if payment_method == "fiat":
|
||||||
|
if not _is_fiat_currency(event.currency):
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=HTTPStatus.BAD_REQUEST,
|
||||||
|
detail="Fiat checkout requires a fiat-denominated ticket price.",
|
||||||
|
)
|
||||||
|
wallet = await get_wallet(event.wallet)
|
||||||
|
if not wallet:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=HTTPStatus.NOT_FOUND,
|
||||||
|
detail="Event wallet does not exist.",
|
||||||
|
)
|
||||||
|
providers = settings.get_fiat_providers_for_user(wallet.user)
|
||||||
|
fiat_provider = data.fiat_provider or (providers[0] if providers else None)
|
||||||
|
if not fiat_provider:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=HTTPStatus.BAD_REQUEST,
|
||||||
|
detail="No fiat payment provider configured for this event.",
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
invoice_unit = "sat"
|
||||||
|
|
||||||
|
payment = await create_payment_request(
|
||||||
wallet_id=event.wallet,
|
wallet_id=event.wallet,
|
||||||
|
invoice_data=CreateInvoice(
|
||||||
|
out=False,
|
||||||
amount=price,
|
amount=price,
|
||||||
|
unit=invoice_unit,
|
||||||
|
fiat_provider=fiat_provider,
|
||||||
memo=f"{event_id}",
|
memo=f"{event_id}",
|
||||||
extra=extra,
|
extra=extra,
|
||||||
|
),
|
||||||
)
|
)
|
||||||
await create_ticket(
|
await create_ticket(
|
||||||
payment_hash=payment.payment_hash,
|
payment_hash=payment.payment_hash,
|
||||||
|
|
@ -247,12 +309,18 @@ async def api_ticket_create(event_id: str, data: CreateTicket) -> TicketPaymentR
|
||||||
extra={
|
extra={
|
||||||
"applied_promo_code": promo_code,
|
"applied_promo_code": promo_code,
|
||||||
"refund_address": refund_address,
|
"refund_address": refund_address,
|
||||||
"sats_paid": int(price),
|
"nostr_identifier": nostr_identifier,
|
||||||
|
"ticket_base_url": str(request.base_url).rstrip("/"),
|
||||||
|
"sats_paid": payment.sat,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
return TicketPaymentRequest(
|
return TicketPaymentRequest(
|
||||||
payment_hash=payment.payment_hash, payment_request=payment.bolt11
|
payment_hash=payment.payment_hash,
|
||||||
|
payment_request=getattr(payment, "bolt11", None),
|
||||||
|
fiat_payment_request=getattr(payment, "extra", {}).get("fiat_payment_request"),
|
||||||
|
fiat_provider=getattr(payment, "fiat_provider", None) or fiat_provider,
|
||||||
|
is_fiat=bool(getattr(payment, "fiat_provider", None) or fiat_provider),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue