поправил чистку телефона. разобрался с файлом в письме

remotes/origin/pm_task_31703
Michail Bortnikov 9 years ago
parent 848cbe5a23
commit 72afbe1ff9
  1. 6
      access/api.py
  2. 8
      access/models.py
  3. 3
      courses/models.py
  4. 2
      management/letters.py
  5. 2
      templates/mails/sent_order.html

@ -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': ''
}

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

@ -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):
# Получить скилы темы

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

@ -157,7 +157,7 @@ html, body {background-image: none !important; background-color: transparent !im
<p style="padding: 0; margin: 0;">&nbsp;</p>
<p>{{ MANAGER_EMAIL }}</p>
<p style="padding: 0; margin: 0;">&nbsp;</p>
<a href="{{ FILE }}">Программа курса</a>
{% if FILE %} <a href="{{ FILE }}">Программа курса</a> {% endif %}
<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>

Loading…
Cancel
Save