|
|
|
@ -419,13 +419,24 @@ class AuthorRequestViewSet(ExtendedModelViewSet): |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class PaymentViewSet(ExtendedModelViewSet): |
|
|
|
class PaymentViewSet(ExtendedModelViewSet): |
|
|
|
queryset = Payment.objects.filter(status__isnull=False).order_by('-created_at') |
|
|
|
queryset = Payment.objects.all() |
|
|
|
serializer_class = PaymentSerializer |
|
|
|
serializer_class = PaymentSerializer |
|
|
|
permission_classes = (IsAdmin,) |
|
|
|
permission_classes = (IsAdmin,) |
|
|
|
filter_fields = ('status',) |
|
|
|
filter_fields = ('status', 'user',) |
|
|
|
ordering_fields = ( |
|
|
|
ordering_fields = ( |
|
|
|
'id', 'user__email', |
|
|
|
'id', 'user__email', |
|
|
|
'user__first_name', 'user__last_name', |
|
|
|
'user__first_name', 'user__last_name', |
|
|
|
'amount', 'created_at', |
|
|
|
'amount', 'created_at', |
|
|
|
) |
|
|
|
) |
|
|
|
search_fields = ('user__email', 'user__first_name', 'user__last_name',) |
|
|
|
search_fields = ('user__email', 'user__first_name', 'user__last_name',) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def get_queryset(self): |
|
|
|
|
|
|
|
queryset = self.queryset |
|
|
|
|
|
|
|
course = self.request.query_params.get('course') |
|
|
|
|
|
|
|
weekdays = self.request.query_params.getlist('weekdays[]') |
|
|
|
|
|
|
|
if course: |
|
|
|
|
|
|
|
queryset = CoursePayment.objects.filter(course=course) |
|
|
|
|
|
|
|
if weekdays: |
|
|
|
|
|
|
|
queryset = SchoolPayment.objects.filter(weekdays__overlap=weekdays) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return queryset.filter(status__isnull=False).order_by('-created_at') |
|
|
|
|