From 72afbe1ff990f2a9e3b9be9e86ca3fd6a3d30f1b Mon Sep 17 00:00:00 2001 From: Michail Bortnikov Date: Thu, 2 Mar 2017 16:49:27 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=87=D0=B8=D1=81=D1=82=D0=BA=D1=83=20=D1=82=D0=B5?= =?UTF-8?q?=D0=BB=D0=B5=D1=84=D0=BE=D0=BD=D0=B0.=20=D1=80=D0=B0=D0=B7?= =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=BB=D1=81=D1=8F=20=D1=81=20=D1=84?= =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D0=BE=D0=BC=20=D0=B2=20=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D1=8C=D0=BC=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- access/api.py | 6 +++--- access/models.py | 8 ++++---- courses/models.py | 3 +-- management/letters.py | 2 +- templates/mails/sent_order.html | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/access/api.py b/access/api.py index 121902a..9eb678d 100755 --- a/access/api.py +++ b/access/api.py @@ -24,7 +24,7 @@ def find_user(request, context): if request.user.is_authenticated() and request.user.in_role in ['T', 'S2', 'A']: if request.GET.get('user'): context['code'] = '1' - context['data'] = [{'str': str(user), 'ava': user.get_image_url(), 'email': user.email, 'id': user.id} for user in User.objects.filter(email__icontains=request.GET['user'])] + context['data'] = [{'str': str(user), 'ava': user.get_image_url(), 'email': user.get_email(), 'id': user.id} for user in User.objects.filter(email__icontains=request.GET['user'])] else: context['response'] = u'Параметры не переданы' context['code'] = '0' @@ -103,7 +103,7 @@ def send_settings_data(request, context): return context if request.POST.get('user_settings_email') and check_email(request.POST['user_settings_email']): - if request.POST['user_settings_email'].lower() != request.user.email: + if request.POST['user_settings_email'].lower() != request.user.get_email(): email = request.POST['user_settings_email'].lower() if not User.objects.filter(email=email).exists(): request.user.changed_email = request.POST['user_settings_email'].lower() @@ -136,7 +136,7 @@ def get_settings_data(request, context): 'name': request.user.name, 'oname': request.user.oname, 'phone': request.user.get_phone(), - 'email': request.user.email, + 'email': request.user.get_email(), 'city': request.user.city, 'bday': '' } diff --git a/access/models.py b/access/models.py index 09506a5..9735915 100755 --- a/access/models.py +++ b/access/models.py @@ -69,7 +69,7 @@ class UserManager(BaseUserManager): user = self.model(email=email) user.set_password(password) - user.token = random_string(length=10, postfix=user.email) + user.token = random_string(length=10, postfix=user.get_email()) user.save(using=self._db) insert_in_system(user, sent_letter=sent_letter) return user @@ -80,7 +80,7 @@ class UserManager(BaseUserManager): user.is_active = True user.superuser = True user.is_staff = True - user.token = random_string(length=10, postfix=user.email) + user.token = random_string(length=10, postfix=user.get_email()) user.save(using=self._db) return user @@ -345,10 +345,10 @@ class User(AbstractBaseUser): def check_phone(self, _type='actual'): # actual = self.phone, back = self.back_phone phone = self.phone if _type == 'actual' else self.back_phone - return bool(len(''.join([n for n in self.phone if n in [str(x) for x in xrange(0,10)]])) > 9) + return bool(len(''.join([n for n in phone if n in [str(x) for x in xrange(0,10)]])) > 9) def clean_phone(self, _type='actual'): - return if self.check_phone(): ''.join([n for n in self.phone if n in [str(x) for x in xrange(0,10)]]) else '' + return ''.join([n for n in self.phone if n in [str(x) for x in xrange(0,10)]]) if self.check_phone() else '' class Meta: diff --git a/courses/models.py b/courses/models.py index e6f5540..24b2e3f 100755 --- a/courses/models.py +++ b/courses/models.py @@ -163,8 +163,7 @@ class Course(models.Model): return self.description def get_description_file(self): - #TODO: must return url to file - return self.description_file + return self.description_file.url or None def get_skills(self): # Получить скилы темы diff --git a/management/letters.py b/management/letters.py index 3f9f1fc..9396cbf 100755 --- a/management/letters.py +++ b/management/letters.py @@ -248,7 +248,7 @@ def sent_new_bill(bill): 'SERVICE': bill.get_name(), 'MANAGER': bill.manager.get_full_name(), 'MANAGER_EMAIL': bill.manager.get_email(), - 'FILE': bill.service.course.description_file.url, + 'FILE': bill.service.course.get_description_file, 'DOMAIN': DOMAIN, 'NAME': NAME } diff --git a/templates/mails/sent_order.html b/templates/mails/sent_order.html index 09d6078..6772823 100644 --- a/templates/mails/sent_order.html +++ b/templates/mails/sent_order.html @@ -157,7 +157,7 @@ html, body {background-image: none !important; background-color: transparent !im

 

{{ MANAGER_EMAIL }}

 

-Программа курса +{% if FILE %} Программа курса {% endif %}

 

Чтобы выбрать способ оплаты и оплатить данный счет, воспользуйтесь ссылкой: {{ LINK }}

 

или кнопкой ниже