From 65ffdcc00fc9e4a2d092af82e83ad915b8c5fa36 Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Sat, 22 Feb 2020 05:21:33 +0000 Subject: [PATCH] Categorize PayPal membership tx, increase page size, sort tx by new --- apiserver/apiserver/api/utils_paypal.py | 1 + apiserver/apiserver/api/views.py | 2 +- apiserver/apiserver/settings.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apiserver/apiserver/api/utils_paypal.py b/apiserver/apiserver/api/utils_paypal.py index 48f20ad..47a3ca4 100644 --- a/apiserver/apiserver/api/utils_paypal.py +++ b/apiserver/apiserver/api/utils_paypal.py @@ -143,6 +143,7 @@ def create_member_dues_tx(data, member, num_months): **build_tx(data), member_id=member.id, memo=memo, + category='Membership', number_of_membership_months=num_months, user=user, ) diff --git a/apiserver/apiserver/api/views.py b/apiserver/apiserver/api/views.py index 1fc44f7..f86baaa 100644 --- a/apiserver/apiserver/api/views.py +++ b/apiserver/apiserver/api/views.py @@ -253,7 +253,7 @@ class TransactionViewSet(Base, List, Create, Retrieve, Update): queryset = queryset.filter(date__year=dt.year) queryset = queryset.filter(date__month=dt.month) queryset = queryset.exclude(category='Memberships:Fake Months') - return queryset.order_by('date', 'id') + return queryset.order_by('-date', '-id') elif self.action == 'list': queryset = queryset.exclude(report_type__isnull=True) queryset = queryset.exclude(report_type='') diff --git a/apiserver/apiserver/settings.py b/apiserver/apiserver/settings.py index 22e3747..5416d34 100644 --- a/apiserver/apiserver/settings.py +++ b/apiserver/apiserver/settings.py @@ -201,7 +201,7 @@ if DEBUG: REST_FRAMEWORK = { 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination', - 'PAGE_SIZE': 100, + 'PAGE_SIZE': 300, 'DEFAULT_RENDERER_CLASSES': DEFAULT_RENDERER_CLASSES, 'DEFAULT_AUTHENTICATION_CLASSES': DEFAULT_AUTHENTICATION_CLASSES, }