Merge pull request #371 from Kotik112/master

Filtered out gift cards from pending_actions_query
makerspace · Dec 5, 2023 · 99bcd68 · 99bcd68
2 parents 1097470 + ee5d438
commit 99bcd68
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/api/src/shop/transactions.py b/api/src/shop/transactions.py
@@ -156,8 +156,11 @@ def pending_actions_query(member_id: Optional[int] = None, transaction: Optional
     if transaction:
         query = query.filter(Transaction.id == transaction.id)
 
-    if member_id:
+    if member_id is not None:
         query = query.filter(Transaction.member_id == member_id)
+    else:
+        # Exclude transactions with member_id set to None (Gift cards)
+        query = query.filter(Transaction.member_id.isnot(None))
 
     return query