highperfocused/lnbits
1
0
Fork 0
mirror of https://github.com/lnbits/lnbits.git synced 2025-10-09 20:12:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Trying to fix conflict errors

Browse Source
This commit is contained in:
ben
2022-11-26 00:40:13 +00:00
committed by dni ⚡
parent 742bbc9112
commit 11b743a905
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lnbits/extensions/satspay/crud.py
View File

@@ -12,7 +12,7 @@ from . import db
from .helpers import fetch_onchain_balance from .helpers import fetch_onchain_balance
from .models import Charges, CreateCharge, SatsPayThemes from .models import Charges, CreateCharge, SatsPayThemes
from loguru import logger
###############CHARGES########################## ###############CHARGES##########################
@@ -52,8 +52,8 @@ async def create_charge(user: str, data: CreateCharge) -> Charges:
completelink, completelink,
completelinktext, completelinktext,
time, time,
custom_css,
amount, amount,
custom_css,
balance, balance,
extra, extra,
custom_css, custom_css,
@@ -79,6 +79,7 @@ async def create_charge(user: str, data: CreateCharge) -> Charges:
data.extra, data.extra,
), ),
) )
logger.debug(await get_charge(charge_id))
return await get_charge(charge_id) return await get_charge(charge_id)
@@ -93,6 +94,7 @@ async def update_charge(charge_id: str, **kwargs) -> Optional[Charges]:
async def get_charge(charge_id: str) -> Charges: async def get_charge(charge_id: str) -> Charges:
row = await db.fetchone("SELECT * FROM satspay.charges WHERE id = ?", (charge_id,)) row = await db.fetchone("SELECT * FROM satspay.charges WHERE id = ?", (charge_id,))
return Charges.from_row(row) if row else None return Charges.from_row(row) if row else None

7
lnbits/extensions/satspay/views.py
View File

@@ -15,6 +15,8 @@ from lnbits.settings import LNBITS_ADMIN_USERS
from . import satspay_ext, satspay_renderer from . import satspay_ext, satspay_renderer
from .crud import get_charge, get_theme from .crud import get_charge, get_theme
from loguru import logger
templates = Jinja2Templates(directory="templates") templates = Jinja2Templates(directory="templates")
@satspay_ext.get("/", response_class=HTMLResponse) @satspay_ext.get("/", response_class=HTMLResponse)
@@ -34,14 +36,15 @@ async def display(request: Request, charge_id: str):
raise HTTPException( raise HTTPException(
status_code=HTTPStatus.NOT_FOUND, detail="Charge link does not exist." status_code=HTTPStatus.NOT_FOUND, detail="Charge link does not exist."
) )
logger.debug(charge)
return satspay_renderer().TemplateResponse( return satspay_renderer().TemplateResponse(
"satspay/display.html", "satspay/display.html",
{ {
"request": request, "request": request,
"charge_data": public_charge(charge), "charge_data": public_charge(charge),
"mempool_endpoint": charge.config.mempool_endpoint, "mempool_endpoint": charge.extra.mempool_endpoint,
"network": charge.config.network, "network": charge.extra.network,
}, },
) )