fix: update 1.0.0-rc5-3

lnbits · Oct 22, 2024 · b299508 · b299508
1 parent e3d5295
commit b299508
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 34 deletions.
diff --git a/models.py b/models.py
@@ -1,11 +1,18 @@
 from typing import Optional
 
-from fastapi import Request
+from fastapi import Query, Request
 from lnurl import Lnurl
 from lnurl import encode as lnurl_encode
 from pydantic import BaseModel, Field, validator
 
 
+class CreateTposInvoice(BaseModel):
+    amount: int = Query(..., ge=1)
+    tip_amount: int = Query(0, ge=1)
+    memo: str = Query(None)
+    details: str = Query(None)
+
+
 class CreateTposData(BaseModel):
     wallet: Optional[str]
     name: Optional[str]

diff --git a/static/js/tpos.js b/static/js/tpos.js
@@ -426,7 +426,7 @@ window.app = Vue.createApp({
         let params = {
           amount: this.sat,
           memo: this.amountFormatted,
-          tipAmount: this.tipAmountSat
+          tip_amount: this.tipAmountSat
         }
         if (this.cart.size) {
           let details = [...this.cart.values()].map(item => {
@@ -449,9 +449,7 @@ window.app = Vue.createApp({
         }
 
         axios
-          .post('/tpos/api/v1/tposs/' + this.tposId + '/invoices', null, {
-            params: {...params}
-          })
+          .post(`/tpos/api/v1/tposs/${this.tposId}/invoices`, params)
           .then(response => {
             dialog.data = response.data
             dialog.show = true
@@ -464,12 +462,7 @@ window.app = Vue.createApp({
 
             dialog.paymentChecker = setInterval(() => {
               axios
-                .get(
-                  '/tpos/api/v1/tposs/' +
-                    this.tposId +
-                    '/invoices/' +
-                    response.data.payment_hash
-                )
+                .get(`/tpos/api/v1/tposs/${this.tposId}/invoices/${response.data.payment_hash}`)
                 .then(res => {
                   if (res.data.paid) {
                     clearInterval(dialog.paymentChecker)

diff --git a/tasks.py b/tasks.py
@@ -25,7 +25,7 @@ async def on_invoice_paid(payment: Payment) -> None:
     ):
         return
 
-    tip_amount = payment.extra.get("tipAmount")
+    tip_amount = payment.extra.get("tip_amount")
 
     stripped_payment = {
         "amount": payment.amount,
@@ -35,7 +35,7 @@ async def on_invoice_paid(payment: Payment) -> None:
         "bolt11": payment.bolt11,
     }
 
-    tpos_id = payment.extra.get("tposId")
+    tpos_id = payment.extra.get("tpos_id")
     assert tpos_id
 
     tpos = await get_tpos(tpos_id)
@@ -50,17 +50,17 @@ async def on_invoice_paid(payment: Payment) -> None:
     wallet_id = tpos.tip_wallet
     assert wallet_id
 
-    payment = await create_invoice(
+    tip_payment = await create_invoice(
         wallet_id=wallet_id,
         amount=int(tip_amount),
         internal=True,
         memo="tpos tip",
     )
     logger.debug(f"tpos: tip invoice created: {payment.payment_hash}")
 
-    payment = await pay_invoice(
-        payment_request=payment.bolt11,
+    paid_payment = await pay_invoice(
+        payment_request=tip_payment.bolt11,
         wallet_id=payment.wallet_id,
         extra={**payment.extra, "tipSplitted": True},
     )
-    logger.debug(f"tpos: tip invoice paid: {payment.checking_id}")
+    logger.debug(f"tpos: tip invoice paid: {paid_payment.checking_id}")
diff --git a/templates/tpos/tpos.html b/templates/tpos/tpos.html
@@ -533,7 +533,7 @@ <h5 v-show="!denomIsSats" class="q-mt-none q-mb-sm">
   tpos.currency = '{{ tpos.currency }}'
   tpos.withdraw_premium = Number('{{ tpos.withdraw_premium }}') / 100
   withdraw_maximum = Number('{{ withdraw_maximum }}')
-  const items = '{{ items | safe }}'
+  const items = '{{ tpos.items | safe }}'
   tpos.items = items ? JSON.parse(items) : []
   const options = '{{ tpos.tip_options | safe }}'
   tpos.tip_options = options ? JSON.parse(options) : []

diff --git a/views_api.py b/views_api.py
@@ -31,6 +31,7 @@
 )
 from .models import (
     CreateTposData,
+    CreateTposInvoice,
     CreateUpdateItemData,
     LnurlCharge,
     PayLnurlWData,
@@ -101,34 +102,26 @@ async def api_tpos_delete(
 @tpos_api_router.post(
     "/api/v1/tposs/{tpos_id}/invoices", status_code=HTTPStatus.CREATED
 )
-async def api_tpos_create_invoice(
-    tpos_id: str,
-    amount: int = Query(..., ge=1),
-    memo: str = "",
-    tip_amount: int = 0,
-    details: str = Query(None),
-) -> dict:
+async def api_tpos_create_invoice(tpos_id: str, data: CreateTposInvoice) -> dict:
+
     tpos = await get_tpos(tpos_id)
 
     if not tpos:
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="TPoS does not exist."
         )
 
-    if tip_amount > 0:
-        amount += tip_amount
-
     try:
         payment = await create_invoice(
             wallet_id=tpos.wallet,
-            amount=amount,
-            memo=f"{memo} to {tpos.name}" if memo else f"{tpos.name}",
+            amount=data.amount + data.tip_amount,
+            memo=f"{data.memo} to {tpos.name}" if data.memo else f"{tpos.name}",
             extra={
                 "tag": "tpos",
-                "tipAmount": tip_amount,
-                "tposId": tpos_id,
-                "amount": amount - tip_amount if tip_amount else False,
-                "details": details if details else None,
+                "tip_amount": data.tip_amount,
+                "tpos_id": tpos_id,
+                "amount": data.amount,
+                "details": data.details if data.details else None,
             },
         )
     except Exception as exc: