diff --git a/csv/load_bills.py b/csv/load_bills.py index fa8a4ca..847170c 100644 --- a/csv/load_bills.py +++ b/csv/load_bills.py @@ -49,7 +49,9 @@ if __name__ == '__main__': except ValueError: real_price = None - Invoice.objects.create(bill=bill, method=method, price=price, real_price=real_price, **row) + inv = Invoice.objects.create(bill=bill, method=method, price=price, real_price=real_price, **row) + inv.date = row['date'] + inv.save() except IntegrityError: pass diff --git a/finance/migrations/0014_invoice_date.py b/finance/migrations/0014_invoice_date.py new file mode 100644 index 0000000..d815608 --- /dev/null +++ b/finance/migrations/0014_invoice_date.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.6 on 2017-11-16 12:25 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('finance', '0013_auto_20171115_1053'), + ] + + operations = [ + migrations.AddField( + model_name='invoice', + name='date', + field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now), + preserve_default=False, + ), + ] diff --git a/finance/views.py b/finance/views.py index bd295ed..862ea45 100644 --- a/finance/views.py +++ b/finance/views.py @@ -120,14 +120,14 @@ class YandexPay(APIView): return Response('Payment not found', status=404) -def get_pay_stat(request, pk): +def get_invoices(request): if not request.user.is_authenticated and (request.user.groups.filter(name="finance") or request.user.is_superuser): return HttpResponseForbidden() date_from = request.GET.get('from', None) date_to = request.GET.get('to', None) - file_name = "teacher_%s" % pk + file_name = "invoices" file_name = file_name + "__from_%s" % date_from if date_from else file_name file_name = file_name + "__to_%s" % date_to if date_to else file_name