From 1acd5a98d9d912d279e743ad2fecf1c7acf55149 Mon Sep 17 00:00:00 2001 From: Bachurin Sergey Date: Tue, 5 Aug 2014 16:09:48 +0300 Subject: [PATCH] logo, links etc --- project/customer/models.py | 7 ++++++- project/myauth/forms.py | 9 +++++++++ project/templates/base.html | 2 +- project/templates/customer/index.html | 2 ++ project/templates/docs/invoice/as_pdf.html | 15 ++++++++++++--- project/xls_templates/invoice.xls | Bin 16896 -> 16896 bytes 6 files changed, 30 insertions(+), 5 deletions(-) diff --git a/project/customer/models.py b/project/customer/models.py index 8038795..d335c07 100644 --- a/project/customer/models.py +++ b/project/customer/models.py @@ -18,6 +18,8 @@ PROFILE_IMAGES_UPLOAD_DIR = 'customer/profile/' # куда сохранять з BOSS_SIGN_IMG_SIZE = (100, 75) GLAVBUH_SIGN_IMG_SIZE = (100, 75) STAMP_IMG_SIZE = (180, 180) +LOGO_SIZE = (100, 50) + def get_profile(user): """Возвращает профиль пользователя или None.""" @@ -122,7 +124,7 @@ class UserProfile(models.Model): filename = str(orig_img.path) img = Image.open(filename).convert("RGB") img.thumbnail(size, Image.ANTIALIAS) - img.save(filename, 'bmp') + img.save(filename, 'BMP') super(UserProfile, self).save(*args, **kwargs) @@ -135,6 +137,9 @@ class UserProfile(models.Model): if self.stamp: process_img(self.stamp, size=STAMP_IMG_SIZE) + if self.logo: + process_img(self.logo, size=LOGO_SIZE) + def is_ip(self): return self.profile_type == consts.IP_PROFILE diff --git a/project/myauth/forms.py b/project/myauth/forms.py index f97ac78..a1428bb 100644 --- a/project/myauth/forms.py +++ b/project/myauth/forms.py @@ -132,6 +132,15 @@ class ChangeEmailForm(forms.Form): raise forms.ValidationError(u'Неверный пароль.') return password + def clean_email(self): + """Проверить не зарегистрирован ли email.""" + email = self.cleaned_data['email'] + try: + User.objects.get(email__iexact = email) + raise forms.ValidationError(u'Такой e-mail уже зарегистрирован.') + except User.DoesNotExist: + return email + class LoginForm(forms.Form): """Форма логина.""" diff --git a/project/templates/base.html b/project/templates/base.html index 09f03a2..5542c41 100644 --- a/project/templates/base.html +++ b/project/templates/base.html @@ -36,7 +36,7 @@ {% if user.is_authenticated %}
- Личный кабинет + {{ request.user.profile.get_company_name|default:'Новый профиль' }}  |  Выход
diff --git a/project/templates/customer/index.html b/project/templates/customer/index.html index 001515c..7e0e597 100644 --- a/project/templates/customer/index.html +++ b/project/templates/customer/index.html @@ -9,6 +9,8 @@ Расчётные счета

Контрагенты

Лицензии

+ Сменить пароль

+ Сменить e-mail

diff --git a/project/templates/docs/invoice/as_pdf.html b/project/templates/docs/invoice/as_pdf.html index 4407521..a04bcad 100644 --- a/project/templates/docs/invoice/as_pdf.html +++ b/project/templates/docs/invoice/as_pdf.html @@ -33,9 +33,18 @@
diff --git a/project/xls_templates/invoice.xls b/project/xls_templates/invoice.xls index aee4c3d57ebf9f6de28cc49d4bfe53d16501ed01..539590b1648fd59082c817481d299c43fe158bfd 100644 GIT binary patch delta 3238 zcmcImO=w(I6h3!;(=o|=Gm~U~UNUdeW-`+zna(6LW7=ucX^R$JDdIv9s*t8uVpGLk zu&;}{(1j>>D+q#uxG*>%uEOjDDM(jJgiTsa6-$Wi=j)Q zDt$;cU7wTZt&gh<_Hz(k*3V`ke`76w>%EP&8|&A~>l@cM@`VpJH}{OlM%r!Pw;oxc z%Oqm$AKhso>T)N4e|&+40yaDo)o4`UMIEsyJJVkcDF9Ru^0nh{dBYG0noty^e<%h% zL@A6BZPOb5!{CmL%5ZG~;Wmw`DK(G@(oh7TOi(~US%o|-x8|r>IiXCZa- zG^RAh;H2QwU^sJTD*hhd)mqr6r9uBlri4ba6PbH(y`izwTex`Dr0a`0OuzitBu&I!f}*_UP@kgG{I8}TMKm{!1g8CDLe1zB6Og+j3&f! zRbcCa8zg zbEW41gOf9Z)Et&rO962KyC91Bf7>}a;g1({WtOb^1a|_1A-PF`mFkR*tWJV-#Z_llrr~=R7zqSSn7ukLD&vmKy+J04U+lq3lx_080Onyb>1Y zn8H+~6+GFcgRw-bmey$9YLxL7(Ha}jsDS%78i8etWr|v`k?CxCXG&epf{g%dndU6m z2*6e>ZCJ1o$g4DO!A2mho=DzkdW4p7mXHsV+UWmC?I^QR4R(~-=rmYQr#1?->vX}Q zjn14}j;}@!X}d#2E5MzNo<5uUNZV{i2E0iNcKHj~ZMUkgs1K`i>TWfX;Q31wx6%bj zo!ZN)RExEYwS=UOJ&8RYh+q`pxDqAyZ(a9$Wr`l3k~i)>wp(%7ljTWl%IQzc|wJ$UUZJg5cKW(h{B=go7Yl4b(vp zO>`*1vkqcy!;&=?0iyzL zl1#=OYG5`u)^ewG+JsO&e3%3>u!SB(I>H2uy4cvpbpi`_j}fOascj0@CaGZqPin<~zuiu+|p1R?tmFLdc ze`NDnebwSmL{!mNEfSJ`rI_GN!@n+2LEwMWdQOO>Dt4CRIo)dodIR1P>Wh9!z25m< z4E*P}z8CHQ{oND*`x{`}8jkN+18iHv@ohF`bB^3@pbDN7BPqlN-+cfVl5V+Ewqu<0I;mUViYX z)yqujabq@Cj4G>Te0k;7xE)J+Ox^3{<-VQcB9?T;ul0Wr>W}{CpY41XjB_?v!Ti*Z ZyTwTBooBu-f8gKS{VO1<{-1l%;6K2@O1A(2