Merge pull request #788 from lnbits/eventsfix

Made ticket scanning reliable

lnbits/extensions/events/crud.py

@@ -16,7 +16,7 @@ async def create_ticket(
         INSERT INTO events.ticket (id, wallet, event, name, email, registered, paid)
         VALUES (?, ?, ?, ?, ?, ?, ?)
         """,
-        (payment_hash, wallet, event, name, email, False, False),
+        (payment_hash, wallet, event, name, email, False, True),
     )
 
     ticket = await get_ticket(payment_hash)

lnbits/extensions/events/templates/events/display.html

@@ -135,14 +135,8 @@
         var self = this
         axios
 
-          .post(
+          .get(
-            '/events/api/v1/tickets/' + '{{ event_id }}/{{ event_price }}',
+            '/events/api/v1/tickets/' + '{{ event_id }}'
-            {
-              event: '{{ event_id }}',
-              event_name: '{{ event_name }}',
-              name: self.formDialog.data.name,
-              email: self.formDialog.data.email
-            }
           )
           .then(function (response) {
             self.paymentReq = response.data.payment_request
@@ -161,7 +155,13 @@
 
             paymentChecker = setInterval(function () {
               axios
-                .get('/events/api/v1/tickets/' + self.paymentCheck)
+                .post('/events/api/v1/tickets/' + '{{ event_id }}/' + self.paymentCheck,
+                {
+                  event: '{{ event_id }}',
+                  event_name: '{{ event_name }}',
+                  name: self.formDialog.data.name,
+                  email: self.formDialog.data.email
+                })
                 .then(function (res) {
                   if (res.data.paid) {
                     clearInterval(paymentChecker)

lnbits/extensions/events/templates/events/register.html

@@ -133,7 +133,7 @@
         var self = this
 
         LNbits.api
-          .request('GET', '/events/api/v1/register/ticket/' + res)
+          .request('GET', '/events/api/v1/register/ticket/' + res.split("//")[1])
           .then(function (response) {
             self.$q.notify({
               type: 'positive',

lnbits/extensions/events/templates/events/ticket.html

@@ -13,9 +13,8 @@
           <br />
 
           <qrcode
-            :value="'{{ ticket_id }}'"
+            :value="'ticket://{{ ticket_id }}'"
-            :options="{width: 340}"
+            :options="{width: 500}"
-            class="rounded-borders"
           ></qrcode>
           <br />
           <q-btn @click="printWindow" color="grey" class="q-ml-auto">

lnbits/extensions/events/views_api.py

@@ -97,8 +97,8 @@ async def api_tickets(
     return [ticket.dict() for ticket in await get_tickets(wallet_ids)]
 
 
-@events_ext.post("/api/v1/tickets/{event_id}/{sats}")
+@events_ext.get("/api/v1/tickets/{event_id}")
-async def api_ticket_make_ticket(event_id, sats, data: CreateTicket):
+async def api_ticket_make_ticket(event_id):
     event = await get_event(event_id)
     if not event:
         raise HTTPException(
@@ -107,13 +107,22 @@ async def api_ticket_make_ticket(event_id, sats, data: CreateTicket):
     try:
         payment_hash, payment_request = await create_invoice(
             wallet_id=event.wallet,
-            amount=int(sats),
+            amount=event.price_per_ticket,
             memo=f"{event_id}",
             extra={"tag": "events"},
         )
     except Exception as e:
         raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(e))
 
+    return {"payment_hash": payment_hash, "payment_request": payment_request}
+
+
+@events_ext.post("/api/v1/tickets/{event_id}/{payment_hash}")
+async def api_ticket_send_ticket(event_id, payment_hash, data: CreateTicket):
+    event = await get_event(event_id)
+    try:
+        status = await api_payment(payment_hash)
+        if status["paid"]:
             ticket = await create_ticket(
                 payment_hash=payment_hash,
                 wallet=event.wallet,
@@ -127,17 +136,6 @@ async def api_ticket_make_ticket(event_id, sats, data: CreateTicket):
                     status_code=HTTPStatus.NOT_FOUND, detail=f"Event could not be fetched."
                 )
 
-    return {"payment_hash": payment_hash, "payment_request": payment_request}
-
-
-@events_ext.get("/api/v1/tickets/{payment_hash}")
-async def api_ticket_send_ticket(payment_hash):
-    ticket = await get_ticket(payment_hash)
-
-    try:
-        status = await api_payment(payment_hash)
-        if status["paid"]:
-            await set_ticket_paid(payment_hash=payment_hash)
             return {"paid": True, "ticket_id": ticket.id}
     except Exception:
         raise HTTPException(status_code=HTTPStatus.NOT_FOUND, detail="Not paid")