finance logging

remotes/origin/feture_statistic
Andrey 8 years ago
parent e723375d7c
commit 6a2aa819db
  1. 4
      finance/views.py
  2. 4
      progress/views.py

@ -203,7 +203,8 @@ class InvoiceDetailView(APIView):
if pay_count > 1: if pay_count > 1:
invoice.create_child_pays(pay_count) invoice.create_child_pays(pay_count)
if invoice.method == 'Y' and invoice.yandex_pay is None: if invoice.method == 'Y' and invoice.status == 'P':
if invoice.yandex_pay is None:
yandex_pay = Payment( yandex_pay = Payment(
order_amount=invoice.price, order_amount=invoice.price,
shop_amount=0, shop_amount=0,
@ -216,6 +217,7 @@ class InvoiceDetailView(APIView):
yandex_pay.scid = settings.YANDEX_MONEY_REBILLING_SCID yandex_pay.scid = settings.YANDEX_MONEY_REBILLING_SCID
yandex_pay.save() yandex_pay.save()
invoice.yandex_pay = yandex_pay invoice.yandex_pay = yandex_pay
invoice.send_link() invoice.send_link()
context = { context = {

@ -68,7 +68,7 @@ class CourseProgressDynamicView(APIView):
@staticmethod @staticmethod
def get(request): def get(request):
course_token = request.GET.get('course_token', '') course_token = request.GET.get('course_token', '')
teacher_email = request.GET.get('teacher_email', '') teacher_email = request.GET.get('teacher_email', '').lower()
from_date = int(request.GET.get('from', '7')) from_date = int(request.GET.get('from', '7'))
to_date = int(request.GET.get('to', '0')) to_date = int(request.GET.get('to', '0'))
only_hw = request.GET.get('only_hw', 'yes') == 'yes' only_hw = request.GET.get('only_hw', 'yes') == 'yes'
@ -82,7 +82,7 @@ class CourseProgressDynamicView(APIView):
if not course_token is '': if not course_token is '':
progresses = progresses.filter(progress__course_token=course_token) progresses = progresses.filter(progress__course_token=course_token)
if not (teacher_email is '' or only_hw): if not teacher_email is '':
progresses = progresses.filter(checker__email=teacher_email) progresses = progresses.filter(checker__email=teacher_email)
res = {} res = {}

Loading…
Cancel
Save