[FEAT] Fiat event tickets (#10)

crud.py

@@ -9,7 +9,8 @@
 
 
 async def create_ticket(
-    payment_hash: str, wallet: str, event: str, name: str, email: str) -> Ticket:
+    payment_hash: str, wallet: str, event: str, name: str, email: str
+) -> Ticket:
     await db.execute(
         """
         INSERT INTO events.ticket (id, wallet, event, name, email, registered, paid)
@@ -22,9 +23,12 @@ async def create_ticket(
     assert ticket, "Newly created ticket couldn't be retrieved"
     return ticket
 
+
 async def set_ticket_paid(payment_hash: str) -> Ticket:
     ticket = await get_ticket(payment_hash)
     assert ticket, "Ticket couldn't be retrieved"
+    if ticket.paid:
+        return ticket
 
     await db.execute(
         """
@@ -34,11 +38,12 @@ async def set_ticket_paid(payment_hash: str) -> Ticket:
         """,
         (True, ticket.id),
     )
-    
+
     await update_event_sold(ticket.event)
 
     return ticket
 
+
 async def update_event_sold(event_id: str):
     event = await get_event(event_id)
     assert event, "Couldn't get event from ticket being paid"
@@ -54,7 +59,7 @@ async def update_event_sold(event_id: str):
     )
 
     return
-    
+
 
 async def get_ticket(payment_hash: str) -> Optional[Ticket]:
     row = await db.fetchone("SELECT * FROM events.ticket WHERE id = ?", (payment_hash,))
@@ -87,8 +92,8 @@ async def create_event(data: CreateEvent) -> Event:
     event_id = urlsafe_short_hash()
     await db.execute(
         """
-        INSERT INTO events.events (id, wallet, name, info, closing_date, event_start_date, event_end_date, amount_tickets, price_per_ticket, sold)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        INSERT INTO events.events (id, wallet, name, info, closing_date, event_start_date, event_end_date, currency, amount_tickets, price_per_ticket, sold)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         """,
         (
             event_id,
@@ -98,6 +103,7 @@ async def create_event(data: CreateEvent) -> Event:
             data.closing_date,
             data.event_start_date,
             data.event_end_date,
+            data.currency,
             data.amount_tickets,
             data.price_per_ticket,
             0,

migrations.py

@@ -88,3 +88,68 @@ async def m003_add_register_timestamp(db):
     await db.execute(
         "ALTER TABLE events.ticket ADD COLUMN reg_timestamp TIMESTAMP;"
     )  # NULL means not registered, or old ticket
+
+
+async def m004_add_currency(db):
+    """
+    Add a currency table to allow fiat denomination
+    of tickets. Make price a float.
+    """
+    await db.execute("ALTER TABLE events.events RENAME TO events_old")
+    await db.execute(
+        """
+        CREATE TABLE events.events (
+            id TEXT PRIMARY KEY,
+            wallet TEXT NOT NULL,
+            name TEXT NOT NULL,
+            info TEXT NOT NULL,
+            closing_date TEXT NOT NULL,
+            event_start_date TEXT NOT NULL,
+            event_end_date TEXT NOT NULL,
+            currency TEXT NOT NULL,
+            amount_tickets INTEGER NOT NULL,
+            price_per_ticket REAL NOT NULL,
+            sold INTEGER NOT NULL,
+            time TIMESTAMP NOT NULL DEFAULT """
+        + db.timestamp_now
+        + """
+        );
+    """
+    )
+
+    for row in [
+        list(row) for row in await db.fetchall("SELECT * FROM events.events_old")
+    ]:
+        await db.execute(
+            """
+                    INSERT INTO events.events (
+                        id,
+                        wallet,
+                        name,
+                        info,
+                        closing_date,
+                        event_start_date,
+                        event_end_date,
+                        currency,
+                        amount_tickets,
+                        price_per_ticket,
+                        sold
+                    )
+                    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                    """,
+            (
+                row[0],
+                row[1],
+                row[2],
+                row[3],
+                row[4],
+                row[5],
+                row[6],
+                "sat",
+                row[7],
+                row[8],
+                row[9],
+            ),
+        )
+
+    await db.execute("DROP TABLE events.events_old")

models.py

@@ -10,8 +10,9 @@ class CreateEvent(BaseModel):
     closing_date: str
     event_start_date: str
     event_end_date: str
+    currency: str = "sat"
     amount_tickets: int = Query(..., ge=0)
-    price_per_ticket: int = Query(..., ge=0)
+    price_per_ticket: float = Query(..., ge=0)
 
 
 class CreateTicket(BaseModel):
@@ -27,8 +28,9 @@ class Event(BaseModel):
     closing_date: str
     event_start_date: str
     event_end_date: str
+    currency: str
     amount_tickets: int
-    price_per_ticket: int
+    price_per_ticket: float
     sold: int
     time: int
 

tasks.py

@@ -24,6 +24,5 @@ async def on_invoice_paid(payment: Payment) -> None:
         and payment.extra.get("name")
         and payment.extra.get("email")
     ):
-
         await set_ticket_paid(payment.payment_hash)
     return

templates/events/display.html

@@ -5,79 +5,51 @@
       <q-card-section class="q-pa-none">
         <h3 class="q-my-none">{{ event_name }}</h3>
         <br />
-        <h5 class="q-my-none">{{ event_info }}</h5>
+        <div v-html="formatDescription"></div>
         <br />
+      </q-card-section>
+    </q-card>
+    <q-card class="q-pa-lg">
+      <q-card-section class="q-pa-none">
+        <h5 class="q-mt-none">Buy Ticket</h5>
         <q-form @submit="Invoice()" class="q-gutter-md">
-          <q-input
-            filled
-            dense
-            v-model.trim="formDialog.data.name"
-            type="name"
-            label="Your name "
-          ></q-input>
-          <q-input
-            filled
-            dense
-            v-model.trim="formDialog.data.email"
-            type="email"
-            label="Your email "
-          ></q-input>
+          <q-input filled dense v-model.trim="formDialog.data.name" type="name" label="Your name "></q-input>
+          <q-input filled dense v-model.trim="formDialog.data.email" type="email" label="Your email "></q-input>
 
           <div class="row q-mt-lg">
-            <q-btn
-              unelevated
-              color="primary"
-              :disable="formDialog.data.name == '' || formDialog.data.email == '' || paymentReq"
-              type="submit"
-              >Submit</q-btn
-            >
-            <q-btn @click="resetForm" flat color="grey" class="q-ml-auto"
-              >Cancel</q-btn
-            >
+            <q-btn unelevated color="primary"
+              :disable="formDialog.data.name == '' || formDialog.data.email == '' || Boolean(paymentReq)"
+              type="submit">Submit</q-btn>
+            <q-btn @click="resetForm" flat color="grey" class="q-ml-auto">Cancel</q-btn>
           </div>
         </q-form>
       </q-card-section>
     </q-card>
 
     <q-card v-show="ticketLink.show" class="q-pa-lg">
       <div class="text-center q-mb-lg">
-        <q-btn
-          unelevated
-          size="xl"
-          :href="ticketLink.data.link"
-          target="_blank"
-          color="primary"
-          type="a"
-          >Link to your ticket!</q-btn
-        >
+        <q-btn unelevated size="xl" :href="ticketLink.data.link" target="_blank" color="primary" type="a">Link to your
+          ticket!</q-btn>
         <br /><br />
         <p>You'll be redirected in a few moments...</p>
       </div>
     </q-card>
   </div>
 
   <q-dialog v-model="receive.show" position="top" @hide="closeReceiveDialog">
-    <q-card
-      v-if="!receive.paymentReq"
-      class="q-pa-lg q-pt-xl lnbits__dialog-card"
-    >
+    <q-card v-if="!receive.paymentReq" class="q-pa-lg q-pt-xl lnbits__dialog-card">
     </q-card>
     <q-card v-else class="q-pa-lg q-pt-xl lnbits__dialog-card">
       <div class="text-center q-mb-lg">
         <a class="text-secondary" :href="'lightning:' + receive.paymentReq">
           <q-responsive :ratio="1" class="q-mx-xl">
-            <qrcode
-              :value="'lightning:' + receive.paymentReq.toUpperCase()"
-              :options="{width: 340}"
-              class="rounded-borders"
-            ></qrcode>
+            <qrcode :value="'lightning:' + receive.paymentReq.toUpperCase()" :options="{width: 340}"
+              class="rounded-borders"></qrcode>
           </q-responsive>
         </a>
       </div>
       <div class="row q-mt-lg">
-        <q-btn outline color="grey" @click="copyText(receive.paymentReq)"
-          >Copy invoice</q-btn
-        >
+        <q-btn outline color="grey" @click="copyText(receive.paymentReq)">Copy invoice</q-btn>
         <q-btn v-close-popup flat color="grey" class="q-ml-auto">Close</q-btn>
       </div>
     </q-card>
@@ -115,7 +87,15 @@ <h5 class="q-my-none">{{ event_info }}</h5>
         }
       }
     },
-
+    created() {
+      this.info = '{{ event_info | tojson }}'
+      this.info = this.info.substring(1, this.info.length - 1)
+    },
+    computed: {
+      formatDescription() {
+        return LNbits.utils.convertMarkdown(this.info)
+      }
+    },
     methods: {
       resetForm: function (e) {
         e.preventDefault()
@@ -128,19 +108,19 @@ <h5 class="q-my-none">{{ event_info }}</h5>
         dismissMsg()
 
         clearInterval(paymentChecker)
-        setTimeout(function () {}, 10000)
+        setTimeout(function () { }, 10000)
       },
       Invoice: function () {
         var self = this
         axios
 
           .get(
             '/events/api/v1/tickets/' +
-              '{{ event_id }}' +
-              '/' +
-              self.formDialog.data.name +
-              '/' +
-              self.formDialog.data.email
+            '{{ event_id }}' +
+            '/' +
+            self.formDialog.data.name +
+            '/' +
+            self.formDialog.data.email
           )
           .then(function (response) {
             self.paymentReq = response.data.payment_request
@@ -161,8 +141,8 @@ <h5 class="q-my-none">{{ event_info }}</h5>
               axios
                 .post(
                   '/events/api/v1/tickets/' +
-                    '{{ event_id }}/' +
-                    self.paymentCheck,
+                  '{{ event_id }}/' +
+                  self.paymentCheck,
                   {
                     event: '{{ event_id }}',
                     event_name: '{{ event_name }}',
@@ -212,4 +192,4 @@ <h5 class="q-my-none">{{ event_info }}</h5>
     }
   })
 </script>
-{% endblock %}
+{% endblock %}