diff --git a/campaigntest.py b/campaigntest.py index 15709831..e0e17176 100644 --- a/campaigntest.py +++ b/campaigntest.py @@ -38,7 +38,7 @@ def drop_all_transactions(): c.save() def recipient_status(clist): - return [[[r.status for r in t.receiver_set.all()] for t in c.transaction_set.all()] for c in clist] + return [[[(r.email, r.txn_id, r.status, r.amount) for r in t.receiver_set.all()] for t in c.transaction_set.all()] for c in clist] # by the time we've executed a campaign, we should have r.status = 'COMPLETED' for primary but None for secondary # [[[r.status for r in t.receiver_set.all()] for t in c.transaction_set.all()] for c in campaigns_incomplete()] diff --git a/payment/manager.py b/payment/manager.py index 536a1a88..8656aad6 100644 --- a/payment/manager.py +++ b/payment/manager.py @@ -225,7 +225,7 @@ class PaymentManager( object ): except: traceback.print_exc() - def run_query(self, transaction_list, summary, pledged, authorized ): + def run_query(self, transaction_list, summary, pledged, authorized): ''' Generic query handler for returning summary and transaction info, see query_user, query_list and query_campaign ''' @@ -240,7 +240,7 @@ class PaymentManager( object ): authorized_list = Transaction.objects.filter(type=PAYMENT_TYPE_AUTHORIZATION, status="ACTIVE") else: - authorized_list = [] + authorized_list = [] if summary: pledged_amount = D('0.00')