fix: if sats and fiat checkout conversion currency

Author: arcbtc

migrations.py

@@ -185,3 +185,13 @@ async def m007_add_allow_fiat(db):
         ALTER TABLE events.events
         ADD COLUMN allow_fiat BOOLEAN NOT NULL DEFAULT FALSE;
         """)
+
+
+async def m008_add_fiat_currency(db):
+    """
+    Add a fiat_currency column for sat-denominated events using fiat checkout.
+    """
+    await db.execute("""
+        ALTER TABLE events.events
+        ADD COLUMN fiat_currency TEXT NOT NULL DEFAULT 'GBP';
+        """)

models.py

@@ -37,6 +37,7 @@ class CreateEvent(BaseModel):
     event_end_date: str
     currency: str = "sat"
     allow_fiat: bool = False
+    fiat_currency: str = "GBP"
     amount_tickets: int = Query(..., ge=0)
     price_per_ticket: float = Query(..., ge=0)
     banner: str | None = None
@@ -54,6 +55,7 @@ class Event(BaseModel):
     event_end_date: str
     currency: str
     allow_fiat: bool = False
+    fiat_currency: str = "GBP"
     amount_tickets: int
     price_per_ticket: float
     time: datetime
@@ -72,6 +74,7 @@ class PublicEvent(BaseModel):
     event_end_date: str
     currency: str
     allow_fiat: bool = False
+    fiat_currency: str = "GBP"
     price_per_ticket: float
     banner: str | None
     extra: EventExtra = Field(default_factory=EventExtra)

static/js/display.js

@@ -41,8 +41,16 @@ window.PageEventsDisplay = {
       return LNbits.utils.convertMarkdown(this.event?.info || '')
     },
     allowFiatCheckout() {
-      const currency = (this.event?.currency || '').toLowerCase()
-      return this.event?.allow_fiat && !['sat', 'sats'].includes(currency)
+      return Boolean(this.event?.allow_fiat)
+    },
+    fiatCheckoutLabel() {
+      if (!this.allowFiatCheckout) return 'Fiat'
+      const unit = ['sat', 'sats'].includes(
+        (this.event?.currency || '').toLowerCase()
+      )
+        ? this.event?.fiat_currency
+        : this.event?.currency
+      return `Fiat (${(unit || 'GBP').toUpperCase()})`
     },
     allowEmailNotifications() {
       return Boolean(this.event?.extra?.email_notifications)

static/js/display.vue

@@ -72,7 +72,7 @@
                   :options="[
                     {label: 'Lightning', value: 'lightning'},
                     {
-                      label: `Fiat (${event.currency.toUpperCase()})`,
+                      label: fiatCheckoutLabel,
                       value: 'fiat'
                     }
                   ]"

static/js/index.js

@@ -99,6 +99,7 @@ window.PageEvents = {
         data: {
           currency: 'sats',
           allow_fiat: false,
+          fiat_currency: 'GBP',
           extra: {
             promo_codes: []
           }
@@ -171,7 +172,9 @@ window.PageEvents = {
           }))
       }
       if (!this.isFiatCurrency(data.currency)) {
-        data.allow_fiat = false
+        if (!data.allow_fiat) {
+          data.fiat_currency = 'GBP'
+        }
       }
 
       if (data.id) {
@@ -188,6 +191,7 @@ window.PageEvents = {
         this.formDialog.data = {
           currency: 'sats',
           allow_fiat: false,
+          fiat_currency: 'GBP',
           extra: {
             conditional: false,
             min_tickets: 1,
@@ -204,6 +208,7 @@ window.PageEvents = {
       this.formDialog.data = {
         currency: 'sats',
         allow_fiat: false,
+        fiat_currency: 'GBP',
         extra: {
           email_notifications: false,
           nostr_notifications: false,

static/js/index.vue

@@ -373,16 +373,27 @@
           </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-select
+            v-if="
+              formDialog.data.allow_fiat &&
+              ['sat', 'sats'].includes(
+                (formDialog.data.currency || '').toLowerCase()
+              )
+            "
+            filled
+            dense
+            v-model="formDialog.data.fiat_currency"
+            label="Fiat checkout currency"
+            :options="
+              currencies.filter(
+                c => !['sat', 'sats'].includes((c || '').toLowerCase())
+              )
+            "
+          ></q-select>
           <q-expansion-item
             group="advanced"
             icon="settings"

views_api.py

@@ -25,6 +25,7 @@
 from lnbits.utils.exchange_rates import (
     fiat_amount_as_satoshis,
     get_fiat_rate_satoshis,
+    satoshis_amount_as_fiat,
 )
 from lnbits.utils.nostr import normalize_public_key
 
@@ -266,13 +267,18 @@ async def api_ticket_create(
             price = await fiat_amount_as_satoshis(price, event.currency)
 
     invoice_unit = event.currency
+    fiat_amount = price
     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.",
-            )
+        if _is_fiat_currency(event.currency):
+            invoice_unit = event.currency
+        else:
+            invoice_unit = event.fiat_currency
+            fiat_amount = await satoshis_amount_as_fiat(price, invoice_unit)
+            extra["fiat"] = True
+            extra["currency"] = invoice_unit
+            extra["fiatAmount"] = fiat_amount
+            extra["rate"] = await get_fiat_rate_satoshis(invoice_unit)
         wallet = await get_wallet(event.wallet)
         if not wallet:
             raise HTTPException(
@@ -293,7 +299,7 @@ async def api_ticket_create(
         wallet_id=event.wallet,
         invoice_data=CreateInvoice(
             out=False,
-            amount=price,
+            amount=fiat_amount if payment_method == "fiat" else price,
             unit=invoice_unit,
             fiat_provider=fiat_provider,
             memo=f"{event_id}",