Выгрузки

feature/fix_generate_pass
Andrey 8 years ago
parent ce9e0aede4
commit 256db130dc
  1. 4
      csv/load_bills.py
  2. 22
      finance/migrations/0014_invoice_date.py
  3. 4
      finance/views.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

@ -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,
),
]

@ -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

Loading…
Cancel
Save