From 3c694a6059f5567c3d971643a5c95823c981ae55 Mon Sep 17 00:00:00 2001
From: Michail Bortnikov <mikhail.bortnikov@skillbox.ru>
Date: Thu, 2 Mar 2017 16:16:32 +0300
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B0=D0=B7=D1=88=D0=B8=D1=80=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=20=D0=BF=D0=B8?=
 =?UTF-8?q?=D1=81=D1=8C=D0=BC=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 access/models.py                | 3 +++
 courses/models.py               | 1 +
 management/api.py               | 3 +--
 management/letters.py           | 6 +++---
 templates/mails/sent_order.html | 4 +++-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/access/models.py b/access/models.py
index 7b7a7ed..b20e6e1 100755
--- a/access/models.py
+++ b/access/models.py
@@ -280,6 +280,9 @@ class User(AbstractBaseUser):
     def get_back_phone(self):
         return self.back_phone
 
+    def get_email(self):
+        return self.email
+        
     def get_full_name(self):
         result = u""
         # Если есть фамилия пишем: Фамилия Имя Отчество
diff --git a/courses/models.py b/courses/models.py
index b10a6c9..e6f5540 100755
--- a/courses/models.py
+++ b/courses/models.py
@@ -163,6 +163,7 @@ class Course(models.Model):
         return self.description
 
     def get_description_file(self):
+        #TODO: must return url to file
         return self.description_file
         
     def get_skills(self):
diff --git a/management/api.py b/management/api.py
index cf0ed3a..3f8b508 100755
--- a/management/api.py
+++ b/management/api.py
@@ -94,8 +94,7 @@ def new_bill(request, context):
             service = Price.objects.get(id=request.POST['new_bill_checked_service'])
             bill = Bill.objects.create(user=user,
                                        service=service,
-                                       file=service.course.get_description_file(),
-                                       manager=request.user.get_full_name(),
+                                       manager=request.user,
                                        price=request.POST['new_bill_cost'],
                                        description=request.POST.get('new_bill_comment') if request.POST.get(
                                            'new_bill_comment') else '')
diff --git a/management/letters.py b/management/letters.py
index 8dbfe50..3f9f1fc 100755
--- a/management/letters.py
+++ b/management/letters.py
@@ -246,9 +246,9 @@ def sent_new_bill(bill):
         'PRICE': bill.price,
         'USER': bill.user.email,
         'SERVICE': bill.get_name(),
-        'MANAGER': bill.manager_name,
-        'MANAGER_PHONE': bill.amanger_phone,
-        'FILE': bill.file,
+        'MANAGER': bill.manager.get_full_name(),
+        'MANAGER_EMAIL': bill.manager.get_email(),
+        'FILE': bill.service.course.description_file.url,
         'DOMAIN': DOMAIN,
         'NAME': NAME
     }
diff --git a/templates/mails/sent_order.html b/templates/mails/sent_order.html
index 3bb8173..62bf315 100644
--- a/templates/mails/sent_order.html
+++ b/templates/mails/sent_order.html
@@ -155,7 +155,9 @@ html, body {background-image: none !important; background-color: transparent !im
   <p style="padding: 0; margin: 0;">&nbsp;</p>
   <p> {{ MANAGER }} </p>
   <p style="padding: 0; margin: 0;">&nbsp;</p>
-  <p>{{ MANAGER_PHONE }}</p>
+  <p>{{ MANAGER_EMAIL }}</p>
+<p style="padding: 0; margin: 0;">&nbsp;</p>
+<a href="{{ FILE }}">Описание курса</a>
 
 <p style="padding: 0; margin: 0;">&nbsp;</p><p style="padding: 0; margin: 0;">Чтобы выбрать способ оплаты и оплатить данный счет, воспользуйтесь ссылкой: <a href="{{ LINK }}" style="color: #22a8f2 !important; text-decoration: underline !important;" target="_blank"><font style=" color:#22a8f2;">{{ LINK }}</font></a></p><p style="padding: 0; margin: 0;">&nbsp;</p><p style="padding: 0; margin: 0;">или кнопкой ниже</p><p style="padding: 0; margin: 0;">&nbsp;</p></div></td>
 </tr>