fixup where
This commit is contained in:
+2
-1
@@ -1037,13 +1037,14 @@ async def get_payments_history(
|
|||||||
values = {
|
values = {
|
||||||
"wallet": wallet_id,
|
"wallet": wallet_id,
|
||||||
}
|
}
|
||||||
|
where = [f"wallet = :wallet AND (status = '{PaymentState.SUCCESS}' OR amount < 0)"]
|
||||||
transactions = await db.fetchall(
|
transactions = await db.fetchall(
|
||||||
f"""
|
f"""
|
||||||
SELECT {date_trunc} date,
|
SELECT {date_trunc} date,
|
||||||
SUM(CASE WHEN amount > 0 THEN amount ELSE 0 END) income,
|
SUM(CASE WHEN amount > 0 THEN amount ELSE 0 END) income,
|
||||||
SUM(CASE WHEN amount < 0 THEN abs(amount) + abs(fee) ELSE 0 END) spending
|
SUM(CASE WHEN amount < 0 THEN abs(amount) + abs(fee) ELSE 0 END) spending
|
||||||
FROM apipayments
|
FROM apipayments
|
||||||
WHERE wallet = :wallet AND (status = '{PaymentState.SUCCESS}' OR amount < 0)
|
{filters.where(where)}
|
||||||
GROUP BY date
|
GROUP BY date
|
||||||
ORDER BY date DESC
|
ORDER BY date DESC
|
||||||
""",
|
""",
|
||||||
|
|||||||
Reference in New Issue
Block a user