Merge branch 'yandex_rebiling' into 'dev'

finance email See merge request !309
8 years ago · 5bacd40631
parent 706c376114 a8657d8b5a
commit 5bacd40631
4 changed files with 25 additions and 17 deletions
--- a/finance/migrations/0006_auto_20180330_1121.py
+++ b/finance/migrations/0006_auto_20180330_1121.py
@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.6 on 2018-03-21 16:53
+# Generated by Django 1.11.6 on 2018-03-30 11:21
 from __future__ import unicode_literals

 from django.db import migrations, models
@ -8,10 +8,14 @@ from django.db import migrations, models
 class Migration(migrations.Migration):

    dependencies = [
-        ('finance', '0003_auto_20180315_1358'),
+        ('finance', '0005_auto_20180329_1346'),
    ]

    operations = [
+        migrations.RemoveField(
+            model_name='installmentplan',
+            name='bill',
+        ),
        migrations.AddField(
            model_name='invoice',
            name='rebilling',
@ -22,4 +26,12 @@ class Migration(migrations.Migration):
            name='rebilling_on',
            field=models.BooleanField(default=False, editable=False, verbose_name='Повторять платеж'),
        ),
+        migrations.AlterField(
+            model_name='invoice',
+            name='date',
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+        migrations.DeleteModel(
+            name='InstallmentPlan',
+        ),
    ]
--- a/finance/models.py
+++ b/finance/models.py
@ -67,18 +67,4 @@ class Invoice(models.Model):

    class Meta:
        verbose_name = 'Платёж'
-        verbose_name_plural = 'Платежи'
-
-
-class InstallmentPlan(models.Model):
-    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 = 'Рассрочки'
+        verbose_name_plural = 'Платежи'
--- a/template/mail/sales/back_set_bill.html
+++ b/template/mail/sales/back_set_bill.html
@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>$Title$</title>
+</head>
+<body>
+$END$
+</body>
+</html>
--- a/template/mail/sales/back_set_bill.txt
+++ b/template/mail/sales/back_set_bill.txt