Merge branch 'dev' into 'master'

Dev

See merge request !302

finance/migrations/0005_auto_20180329_1346.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-03-29 13:46
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('finance', '0004_bill_date'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='InstallmentPlan',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('date', models.DateTimeField(auto_now_add=True, verbose_name='Дата создания')),
+                ('invoice_amount', models.IntegerField(verbose_name='Количество платежей')),
+                ('price', models.IntegerField(verbose_name='Цена одного платежа')),
+                ('bill', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='finance.Bill', verbose_name='Связный счёт')),
+            ],
+            options={
+                'verbose_name': 'Рассрочка',
+                'verbose_name_plural': 'Рассрочки',
+            },
+        ),
+        migrations.AlterField(
+            model_name='invoice',
+            name='date',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='Дата создания'),
+        ),
+    ]

finance/models.py

@@ -58,7 +58,7 @@ class Invoice(models.Model):
                                blank=True, editable=False)
     bill = models.ForeignKey(to=Bill, verbose_name="Связный счёт")
     is_open = models.BooleanField(default=True, verbose_name="Открывает ли платёж курс")
-    date = models.DateTimeField(auto_now_add=True)
+    date = models.DateTimeField(auto_now_add=True, verbose_name="Дата создания")
 
     def get_comment(self):
         return '''Вам выставлен счёт,''' if \
@@ -72,5 +72,15 @@ class Invoice(models.Model):
         verbose_name_plural = 'Платежи'
 
 
-# class InstallmentPlan(models.Model):
+class InstallmentPlan(models.Model):
-#     bill = models.OneToOneField(to=Bill, verbose_name="Связный счёт")
+    bill = models.OneToOneField(to=Bill, verbose_name="Связный счёт")
+    date = models.DateTimeField(auto_now_add=True, verbose_name="Дата создания")
+    invoice_amount = models.IntegerField(verbose_name="Количество платежей")
+    price = models.IntegerField(verbose_name="Цена одного платежа")
+
+    def __str__(self):
+        return '%s' % self.bill.user.email
+
+    class Meta:
+        verbose_name = 'Рассрочка'
+        verbose_name_plural = 'Рассрочки'

finance/serializers.py

@@ -28,7 +28,7 @@ class BillSerializer(serializers.ModelSerializer):
 class InvoiceSerializer(serializers.ModelSerializer):
     status = serializers.SerializerMethodField()
     method = serializers.SerializerMethodField()
-    yandex_pay_id = serializers.SerializerMethodField()
+    yandex_pay = serializers.SerializerMethodField()
 
     class Meta:
         model = Invoice
@@ -39,7 +39,7 @@ class InvoiceSerializer(serializers.ModelSerializer):
         return self.get_status_display()
 
     @staticmethod
-    def get_yandex_pay_id(self):
+    def get_yandex_pay(self):
         return None if self.yandex_pay is None else self.yandex_pay.id
 
     @staticmethod